From 7111fcfd6fdb82be373b4970d06f2715d8ef24e6 Mon Sep 17 00:00:00 2001
From: Blacker <25556621@qq.com>
Date: Mon, 14 Mar 2022 10:06:25 +0800
Subject: [PATCH 01/47] chore: add `scss` to LoaderOptions interface (#7039)

---
 packages/@vue/cli-service/types/ProjectOptions.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/@vue/cli-service/types/ProjectOptions.d.ts b/packages/@vue/cli-service/types/ProjectOptions.d.ts
index 8dc81eaf8b..d49ab202cf 100644
--- a/packages/@vue/cli-service/types/ProjectOptions.d.ts
+++ b/packages/@vue/cli-service/types/ProjectOptions.d.ts
@@ -13,6 +13,7 @@ interface PageConfig {
 interface LoaderOptions {
   css?: object;
   sass?: object;
+  scss?: object;
   less?: object;
   stylus?: object;
   postcss?: object;

From 4c679ec525b47b22d4104a8e0152cf31e458ab24 Mon Sep 17 00:00:00 2001
From: ntnyq <ntnyq13@gmail.com>
Date: Mon, 14 Mar 2022 10:09:47 +0800
Subject: [PATCH 02/47] fix(cli-service):  devServer proxy should be optional
 (#7044)

---
 packages/@vue/cli-service/types/ProjectOptions.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vue/cli-service/types/ProjectOptions.d.ts b/packages/@vue/cli-service/types/ProjectOptions.d.ts
index d49ab202cf..bbc0b6a623 100644
--- a/packages/@vue/cli-service/types/ProjectOptions.d.ts
+++ b/packages/@vue/cli-service/types/ProjectOptions.d.ts
@@ -112,7 +112,7 @@ interface ProjectOptions {
   /**
    * [All options for `webpack-dev-server`](https://webpack.js.org/configuration/dev-server/) are supported
    */
-  devServer?: { proxy: string | object, [key: string]: any };
+  devServer?: { proxy?: string | object, [key: string]: any };
   /**
    * Default: `undefined`
    *

From 37ef809c873f33c88ba7928fca785e87bfaf2491 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 15 Mar 2022 21:05:34 +0800
Subject: [PATCH 03/47] fix: lock node-ipc version

---
 packages/@vue/cli-shared-utils/package.json |  2 +-
 packages/@vue/cli-ui/package.json           |  2 +-
 yarn.lock                                   | 29 ++++++++++++++++++---
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 61c772b597..9956a91769 100644
--- a/packages/@vue/cli-shared-utils/package.json
+++ b/packages/@vue/cli-shared-utils/package.json
@@ -26,7 +26,7 @@
     "launch-editor": "^2.2.1",
     "lru-cache": "^6.0.0",
     "node-fetch": "^2.6.7",
-    "node-ipc": "^9.1.1",
+    "node-ipc": "9.2.1",
     "open": "^8.0.2",
     "ora": "^5.3.0",
     "read-pkg": "^5.1.1",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 70f70cf5f4..9eda17b5c0 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -53,7 +53,7 @@
     "lodash.merge": "^4.6.1",
     "lowdb": "^1.0.0",
     "lru-cache": "^6.0.0",
-    "node-ipc": "^9.1.1",
+    "node-ipc": "^9.2.1",
     "node-notifier": "^10.0.0",
     "parse-git-config": "^3.0.0",
     "portfinder": "^1.0.26",
diff --git a/yarn.lock b/yarn.lock
index ed5d9427a3..9139117e0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7158,7 +7158,7 @@ colorette@^2.0.10, colorette@^2.0.16:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
   integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
 
-colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
+colors@*, colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -9412,6 +9412,11 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+event-pubsub@4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.2.3.tgz#0d3142f47ac7e0da38cdc38402d97e2510bc5ecc"
+  integrity sha1-DTFC9HrH4No4zcOEAtl+JRC8Xsw=
+
 event-pubsub@4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e"
@@ -12821,12 +12826,12 @@ js-beautify@^1.6.12:
     glob "^7.1.3"
     nopt "^5.0.0"
 
-js-message@1.0.7:
+js-message@1.0.7, js-message@>=1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz#fbddd053c7a47021871bb8b2c95397cc17c20e47"
   integrity sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==
 
-js-queue@2.0.2:
+js-queue@2.0.2, js-queue@>=2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.2.tgz#0be590338f903b36c73d33c31883a821412cd482"
   integrity sha512-pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA==
@@ -14919,7 +14924,7 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-ipc@^9.1.1:
+node-ipc@9.2.1:
   version "9.2.1"
   resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.1.tgz#b32f66115f9d6ce841dc4ec2009d6a733f98bb6b"
   integrity sha512-mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ==
@@ -14928,6 +14933,17 @@ node-ipc@^9.1.1:
     js-message "1.0.7"
     js-queue "2.0.2"
 
+node-ipc@^9.2.1:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.2.tgz#158df14dffeb4891ac048441ad175e34006e7a3f"
+  integrity sha512-e+cCHxf0zs4scDkTrFruxOFjhRsmgiGbKqMvcMrBHZnkvLUWHOBayDnKNADKndg3UkTnqHJ9nADcJbjFFaqTNQ==
+  dependencies:
+    colors "*"
+    event-pubsub "4.2.3"
+    js-message ">=1.0.5"
+    js-queue ">=2.0.0"
+    peacenotwar "^9.1.6"
+
 node-notifier@^10.0.0:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-10.0.1.tgz#0e82014a15a8456c4cfcdb25858750399ae5f1c7"
@@ -15861,6 +15877,11 @@ pause-stream@0.0.11:
   dependencies:
     through "~2.3"
 
+peacenotwar@^9.1.6:
+  version "9.1.6"
+  resolved "https://registry.yarnpkg.com/peacenotwar/-/peacenotwar-9.1.6.tgz#8c96d0841fdd2af25a44002893d716fe5aabdee9"
+  integrity sha512-pApXV74SJsXxrJ7XQohl+oqLf00U0tKNrmHUa5ct7XfYUHnvGNaQfBFo9JpTpDbkn4bpNrPekVeO50Zfd/vMAA==
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"

From a859b1fdf26bca3fcd44b535965926da333d11f8 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 15 Mar 2022 21:06:32 +0800
Subject: [PATCH 04/47] v5.0.2

---
 CHANGELOG.md                                        | 13 +++++++++++++
 lerna.json                                          |  2 +-
 packages/@vue/babel-preset-app/package.json         |  2 +-
 packages/@vue/cli-init/package.json                 |  2 +-
 packages/@vue/cli-overlay/package.json              |  2 +-
 packages/@vue/cli-plugin-babel/package.json         |  6 +++---
 packages/@vue/cli-plugin-e2e-cypress/package.json   |  4 ++--
 .../@vue/cli-plugin-e2e-nightwatch/package.json     |  4 ++--
 .../@vue/cli-plugin-e2e-webdriverio/package.json    |  4 ++--
 packages/@vue/cli-plugin-eslint/package.json        |  4 ++--
 packages/@vue/cli-plugin-pwa/package.json           |  4 ++--
 packages/@vue/cli-plugin-router/package.json        |  6 +++---
 packages/@vue/cli-plugin-typescript/package.json    |  4 ++--
 packages/@vue/cli-plugin-unit-jest/package.json     |  4 ++--
 packages/@vue/cli-plugin-unit-mocha/package.json    |  4 ++--
 packages/@vue/cli-plugin-vuex/package.json          |  4 ++--
 packages/@vue/cli-service/package.json              | 10 +++++-----
 packages/@vue/cli-shared-utils/package.json         |  2 +-
 packages/@vue/cli-test-utils/package.json           |  2 +-
 packages/@vue/cli-ui-addon-webpack/package.json     |  8 ++++----
 packages/@vue/cli-ui-addon-widgets/package.json     |  8 ++++----
 packages/@vue/cli-ui/package.json                   | 12 ++++++------
 packages/@vue/cli/package.json                      | 12 ++++++------
 packages/vue-cli-version-marker/package.json        |  4 ++--
 24 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e134b24e5..9542957d61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+
+## 5.0.2 (2022-03-15)
+
+#### :bug: Bug Fix
+* `@vue/cli-service`
+  * [#7044](https://github.com/vuejs/vue-cli/pull/7044) fix(cli-service):  devServer proxy should be optional ([@ntnyq](https://github.com/ntnyq))
+  * [#7039](https://github.com/vuejs/vue-cli/pull/7039) chore: add scss to LoaderOptions ([@hiblacker](https://github.com/hiblacker))
+
+#### Committers: 2
+- Blacker ([@hiblacker](https://github.com/hiblacker))
+- ntnyq ([@ntnyq](https://github.com/ntnyq))
+
+
 ## 5.0.1 (2022-02-17)
 
 Same as 5.0.0.
diff --git a/lerna.json b/lerna.json
index 0c6f395357..7a0f9a4793 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "5.0.1",
+  "version": "5.0.2",
   "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
index 32f3ab87a9..0a2615d61d 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "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
index 8345672a3c..4b6c92085d 100644
--- a/packages/@vue/cli-init/package.json
+++ b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "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
index 437ee1b4b2..a0abb48773 100644
--- a/packages/@vue/cli-overlay/package.json
+++ b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "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
index 3426d486d1..b184d42758 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "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.12.16",
-    "@vue/babel-preset-app": "^5.0.1",
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/babel-preset-app": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.2",
     "babel-loader": "^8.2.2",
     "thread-loader": "^3.0.0",
     "webpack": "^5.54.0"
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
index fb6e9f2759..3b460576b0 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "eslint-plugin-cypress": "^2.11.2"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
index 9b9d3fd77f..c011577afb 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "deepmerge": "^4.2.2",
     "nightwatch": "^2.0.5"
   },
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
index 9128eaff3f..39f7be07c6 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.2.1",
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "@wdio/cli": "^7.0.7",
     "@wdio/local-runner": "^7.0.7",
     "@wdio/mocha-framework": "^7.0.7",
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index fae206673b..5545f42d1e 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "eslint-webpack-plugin": "^3.1.0",
     "globby": "^11.0.2",
     "webpack": "^5.54.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index 242bbbd9ab..d9eecf3087 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "html-webpack-plugin": "^5.1.0",
     "webpack": "^5.54.0",
     "workbox-webpack-plugin": "^6.1.0"
diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
index 24179eff85..185a1baf71 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.1"
+    "@vue/cli-shared-utils": "^5.0.2"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.1"
+    "@vue/cli-test-utils": "^5.0.2"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index 71e0d324c2..daf34c1d74 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "babel-loader": "^8.2.2",
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "globby": "^11.0.2",
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
index ebfa3b8a2f..33a0420d7a 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.16",
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@types/jest": "^27.0.1",
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "babel-jest": "^27.1.0",
     "deepmerge": "^4.2.2",
     "jest": "^27.1.0",
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
index 6c508037a0..548b37da8a 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "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": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "jsdom": "^18.0.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^8.3.0",
diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
index c58429a233..1cbaa07746 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.1"
+    "@vue/cli-test-utils": "^5.0.2"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index eb2e8381bd..7a121f5cae 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -27,10 +27,10 @@
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
     "@soda/get-current-script": "^1.0.2",
     "@types/minimist": "^1.2.0",
-    "@vue/cli-overlay": "^5.0.1",
-    "@vue/cli-plugin-router": "^5.0.1",
-    "@vue/cli-plugin-vuex": "^5.0.1",
-    "@vue/cli-shared-utils": "^5.0.1",
+    "@vue/cli-overlay": "^5.0.2",
+    "@vue/cli-plugin-router": "^5.0.2",
+    "@vue/cli-plugin-vuex": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.2",
     "@vue/component-compiler-utils": "^3.3.0",
     "@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
     "@vue/web-component-wrapper": "^1.3.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 9956a91769..0a2ef8a870 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "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
index c1a7d37ac5..611fe36bda 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "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
index e293b95ed4..dabd97d70a 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.1",
-    "@vue/cli-plugin-eslint": "^5.0.1",
-    "@vue/cli-service": "^5.0.1",
+    "@vue/cli-plugin-babel": "^5.0.2",
+    "@vue/cli-plugin-eslint": "^5.0.2",
+    "@vue/cli-service": "^5.0.2",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
index b0594a066d..99a570e1cd 100644
--- 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": "5.0.1",
+  "version": "5.0.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.1",
-    "@vue/cli-plugin-eslint": "^5.0.1",
-    "@vue/cli-service": "^5.0.1",
+    "@vue/cli-plugin-babel": "^5.0.2",
+    "@vue/cli-plugin-eslint": "^5.0.2",
+    "@vue/cli-service": "^5.0.2",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 9eda17b5c0..488784471e 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "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": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
     "apollo-server-express": "^2.21.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
@@ -66,10 +66,10 @@
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@graphql-eslint/eslint-plugin": "^3.8.0",
-    "@vue/cli-plugin-babel": "^5.0.1",
-    "@vue/cli-plugin-e2e-cypress": "^5.0.1",
-    "@vue/cli-plugin-eslint": "^5.0.1",
-    "@vue/cli-service": "^5.0.1",
+    "@vue/cli-plugin-babel": "^5.0.2",
+    "@vue/cli-plugin-e2e-cypress": "^5.0.2",
+    "@vue/cli-plugin-eslint": "^5.0.2",
+    "@vue/cli-service": "^5.0.2",
     "@vue/eslint-config-standard": "^6.1.0",
     "@vue/ui": "^0.12.2",
     "ansi_up": "^5.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
index 8d8350480e..8a47fec810 100644
--- a/packages/@vue/cli/package.json
+++ b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -27,10 +27,10 @@
   "dependencies": {
     "@types/ejs": "^3.0.6",
     "@types/inquirer": "^8.1.3",
-    "@vue/cli-shared-utils": "^5.0.1",
-    "@vue/cli-ui": "^5.0.1",
-    "@vue/cli-ui-addon-webpack": "^5.0.1",
-    "@vue/cli-ui-addon-widgets": "^5.0.1",
+    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-ui": "^5.0.2",
+    "@vue/cli-ui-addon-webpack": "^5.0.2",
+    "@vue/cli-ui-addon-widgets": "^5.0.2",
     "boxen": "^5.0.0",
     "commander": "^7.1.0",
     "debug": "^4.1.0",
@@ -62,7 +62,7 @@
     "yaml-front-matter": "^4.1.0"
   },
   "devDependencies": {
-    "@vue/cli-service": "^5.0.1",
+    "@vue/cli-service": "^5.0.2",
     "cmd-shim": "^4.1.0"
   },
   "engines": {
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
index b759ec99d6..ea26031650 100644
--- a/packages/vue-cli-version-marker/package.json
+++ b/packages/vue-cli-version-marker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
   "main": "package.json",
   "devDependencies": {
-    "@vue/cli": "^5.0.1"
+    "@vue/cli": "^5.0.2"
   }
 }

From b0d931668e7e8450a285c1ddeb6d1a95b7a060d9 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 15 Mar 2022 21:10:23 +0800
Subject: [PATCH 05/47] fix(typo): should lock version

---
 packages/@vue/cli-ui/package.json |  2 +-
 yarn.lock                         | 27 +++------------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 488784471e..79a7d80130 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -53,7 +53,7 @@
     "lodash.merge": "^4.6.1",
     "lowdb": "^1.0.0",
     "lru-cache": "^6.0.0",
-    "node-ipc": "^9.2.1",
+    "node-ipc": "9.2.1",
     "node-notifier": "^10.0.0",
     "parse-git-config": "^3.0.0",
     "portfinder": "^1.0.26",
diff --git a/yarn.lock b/yarn.lock
index 9139117e0f..fb9d915cde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7158,7 +7158,7 @@ colorette@^2.0.10, colorette@^2.0.16:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
   integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
 
-colors@*, colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
+colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -9412,11 +9412,6 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
-event-pubsub@4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.2.3.tgz#0d3142f47ac7e0da38cdc38402d97e2510bc5ecc"
-  integrity sha1-DTFC9HrH4No4zcOEAtl+JRC8Xsw=
-
 event-pubsub@4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e"
@@ -12826,12 +12821,12 @@ js-beautify@^1.6.12:
     glob "^7.1.3"
     nopt "^5.0.0"
 
-js-message@1.0.7, js-message@>=1.0.5:
+js-message@1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz#fbddd053c7a47021871bb8b2c95397cc17c20e47"
   integrity sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==
 
-js-queue@2.0.2, js-queue@>=2.0.0:
+js-queue@2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.2.tgz#0be590338f903b36c73d33c31883a821412cd482"
   integrity sha512-pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA==
@@ -14933,17 +14928,6 @@ node-ipc@9.2.1:
     js-message "1.0.7"
     js-queue "2.0.2"
 
-node-ipc@^9.2.1:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.2.tgz#158df14dffeb4891ac048441ad175e34006e7a3f"
-  integrity sha512-e+cCHxf0zs4scDkTrFruxOFjhRsmgiGbKqMvcMrBHZnkvLUWHOBayDnKNADKndg3UkTnqHJ9nADcJbjFFaqTNQ==
-  dependencies:
-    colors "*"
-    event-pubsub "4.2.3"
-    js-message ">=1.0.5"
-    js-queue ">=2.0.0"
-    peacenotwar "^9.1.6"
-
 node-notifier@^10.0.0:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-10.0.1.tgz#0e82014a15a8456c4cfcdb25858750399ae5f1c7"
@@ -15877,11 +15861,6 @@ pause-stream@0.0.11:
   dependencies:
     through "~2.3"
 
-peacenotwar@^9.1.6:
-  version "9.1.6"
-  resolved "https://registry.yarnpkg.com/peacenotwar/-/peacenotwar-9.1.6.tgz#8c96d0841fdd2af25a44002893d716fe5aabdee9"
-  integrity sha512-pApXV74SJsXxrJ7XQohl+oqLf00U0tKNrmHUa5ct7XfYUHnvGNaQfBFo9JpTpDbkn4bpNrPekVeO50Zfd/vMAA==
-
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"

From dd53f26bc0c51fec7c5fb2c18f4769de984ad79c Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 15 Mar 2022 21:13:01 +0800
Subject: [PATCH 06/47] v5.0.3

---
 CHANGELOG.md                                         |  3 +++
 lerna.json                                           |  2 +-
 packages/@vue/babel-preset-app/package.json          |  2 +-
 packages/@vue/cli-init/package.json                  |  2 +-
 packages/@vue/cli-overlay/package.json               |  2 +-
 packages/@vue/cli-plugin-babel/package.json          |  6 +++---
 packages/@vue/cli-plugin-e2e-cypress/package.json    |  4 ++--
 packages/@vue/cli-plugin-e2e-nightwatch/package.json |  4 ++--
 .../@vue/cli-plugin-e2e-webdriverio/package.json     |  4 ++--
 packages/@vue/cli-plugin-eslint/package.json         |  4 ++--
 packages/@vue/cli-plugin-pwa/package.json            |  4 ++--
 packages/@vue/cli-plugin-router/package.json         |  6 +++---
 packages/@vue/cli-plugin-typescript/package.json     |  4 ++--
 packages/@vue/cli-plugin-unit-jest/package.json      |  4 ++--
 packages/@vue/cli-plugin-unit-mocha/package.json     |  4 ++--
 packages/@vue/cli-plugin-vuex/package.json           |  4 ++--
 packages/@vue/cli-service/package.json               | 10 +++++-----
 packages/@vue/cli-shared-utils/package.json          |  2 +-
 packages/@vue/cli-test-utils/package.json            |  2 +-
 packages/@vue/cli-ui-addon-webpack/package.json      |  8 ++++----
 packages/@vue/cli-ui-addon-widgets/package.json      |  8 ++++----
 packages/@vue/cli-ui/package.json                    | 12 ++++++------
 packages/@vue/cli/package.json                       | 12 ++++++------
 packages/vue-cli-version-marker/package.json         |  4 ++--
 24 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9542957d61..6d7cdf1fb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+
+
+
 ## 5.0.2 (2022-03-15)
 
 #### :bug: Bug Fix
diff --git a/lerna.json b/lerna.json
index 7a0f9a4793..10692f2483 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "5.0.2",
+  "version": "5.0.3",
   "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
index 0a2615d61d..91ecc556f5 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "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
index 4b6c92085d..fe83dcd5d4 100644
--- a/packages/@vue/cli-init/package.json
+++ b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "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
index a0abb48773..ff2c5dd7e4 100644
--- a/packages/@vue/cli-overlay/package.json
+++ b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "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
index b184d42758..251c75473e 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "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.12.16",
-    "@vue/babel-preset-app": "^5.0.2",
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/babel-preset-app": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.3",
     "babel-loader": "^8.2.2",
     "thread-loader": "^3.0.0",
     "webpack": "^5.54.0"
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
index 3b460576b0..cd04b43cdf 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "eslint-plugin-cypress": "^2.11.2"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
index c011577afb..80c890b3c0 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "deepmerge": "^4.2.2",
     "nightwatch": "^2.0.5"
   },
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
index 39f7be07c6..ad96adcb74 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.2.1",
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "@wdio/cli": "^7.0.7",
     "@wdio/local-runner": "^7.0.7",
     "@wdio/mocha-framework": "^7.0.7",
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index 5545f42d1e..1ba199e122 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "eslint-webpack-plugin": "^3.1.0",
     "globby": "^11.0.2",
     "webpack": "^5.54.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index d9eecf3087..5821505fed 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "html-webpack-plugin": "^5.1.0",
     "webpack": "^5.54.0",
     "workbox-webpack-plugin": "^6.1.0"
diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
index 185a1baf71..dba00b48e7 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.2"
+    "@vue/cli-shared-utils": "^5.0.3"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.2"
+    "@vue/cli-test-utils": "^5.0.3"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index daf34c1d74..92fc8c817e 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "babel-loader": "^8.2.2",
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "globby": "^11.0.2",
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
index 33a0420d7a..5b8075e2e9 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.16",
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@types/jest": "^27.0.1",
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "babel-jest": "^27.1.0",
     "deepmerge": "^4.2.2",
     "jest": "^27.1.0",
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
index 548b37da8a..43161d9b0e 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "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": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "jsdom": "^18.0.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^8.3.0",
diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
index 1cbaa07746..03e13c2cde 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.2"
+    "@vue/cli-test-utils": "^5.0.3"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index 7a121f5cae..dca78aef4e 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -27,10 +27,10 @@
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
     "@soda/get-current-script": "^1.0.2",
     "@types/minimist": "^1.2.0",
-    "@vue/cli-overlay": "^5.0.2",
-    "@vue/cli-plugin-router": "^5.0.2",
-    "@vue/cli-plugin-vuex": "^5.0.2",
-    "@vue/cli-shared-utils": "^5.0.2",
+    "@vue/cli-overlay": "^5.0.3",
+    "@vue/cli-plugin-router": "^5.0.3",
+    "@vue/cli-plugin-vuex": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.3",
     "@vue/component-compiler-utils": "^3.3.0",
     "@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
     "@vue/web-component-wrapper": "^1.3.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 0a2ef8a870..3a24c9061a 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "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
index 611fe36bda..94a72433eb 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "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
index dabd97d70a..617b6edea7 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.2",
-    "@vue/cli-plugin-eslint": "^5.0.2",
-    "@vue/cli-service": "^5.0.2",
+    "@vue/cli-plugin-babel": "^5.0.3",
+    "@vue/cli-plugin-eslint": "^5.0.3",
+    "@vue/cli-service": "^5.0.3",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
index 99a570e1cd..ca66b6ca76 100644
--- 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": "5.0.2",
+  "version": "5.0.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.2",
-    "@vue/cli-plugin-eslint": "^5.0.2",
-    "@vue/cli-service": "^5.0.2",
+    "@vue/cli-plugin-babel": "^5.0.3",
+    "@vue/cli-plugin-eslint": "^5.0.3",
+    "@vue/cli-service": "^5.0.3",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 79a7d80130..48e2ed9966 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "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": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
     "apollo-server-express": "^2.21.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
@@ -66,10 +66,10 @@
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@graphql-eslint/eslint-plugin": "^3.8.0",
-    "@vue/cli-plugin-babel": "^5.0.2",
-    "@vue/cli-plugin-e2e-cypress": "^5.0.2",
-    "@vue/cli-plugin-eslint": "^5.0.2",
-    "@vue/cli-service": "^5.0.2",
+    "@vue/cli-plugin-babel": "^5.0.3",
+    "@vue/cli-plugin-e2e-cypress": "^5.0.3",
+    "@vue/cli-plugin-eslint": "^5.0.3",
+    "@vue/cli-service": "^5.0.3",
     "@vue/eslint-config-standard": "^6.1.0",
     "@vue/ui": "^0.12.2",
     "ansi_up": "^5.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
index 8a47fec810..c3e162a701 100644
--- a/packages/@vue/cli/package.json
+++ b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -27,10 +27,10 @@
   "dependencies": {
     "@types/ejs": "^3.0.6",
     "@types/inquirer": "^8.1.3",
-    "@vue/cli-shared-utils": "^5.0.2",
-    "@vue/cli-ui": "^5.0.2",
-    "@vue/cli-ui-addon-webpack": "^5.0.2",
-    "@vue/cli-ui-addon-widgets": "^5.0.2",
+    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-ui": "^5.0.3",
+    "@vue/cli-ui-addon-webpack": "^5.0.3",
+    "@vue/cli-ui-addon-widgets": "^5.0.3",
     "boxen": "^5.0.0",
     "commander": "^7.1.0",
     "debug": "^4.1.0",
@@ -62,7 +62,7 @@
     "yaml-front-matter": "^4.1.0"
   },
   "devDependencies": {
-    "@vue/cli-service": "^5.0.2",
+    "@vue/cli-service": "^5.0.3",
     "cmd-shim": "^4.1.0"
   },
   "engines": {
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
index ea26031650..3e92591e09 100644
--- a/packages/vue-cli-version-marker/package.json
+++ b/packages/vue-cli-version-marker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
   "main": "package.json",
   "devDependencies": {
-    "@vue/cli": "^5.0.2"
+    "@vue/cli": "^5.0.3"
   }
 }

From 75826d6598e7c17f727a891432d1902b9f31db0e Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 22 Mar 2022 21:32:18 +0800
Subject: [PATCH 07/47] fix: replace `node-ipc` with `@achrinza/node-ipc` to
 further secure the dependency chain

---
 packages/@vue/cli-shared-utils/lib/ipc.js     |  2 +-
 packages/@vue/cli-shared-utils/package.json   |  2 +-
 .../@vue/cli-ui/apollo-server/util/ipc.js     |  2 +-
 packages/@vue/cli-ui/package.json             |  2 +-
 yarn.lock                                     | 34 +++++++++----------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/@vue/cli-shared-utils/lib/ipc.js b/packages/@vue/cli-shared-utils/lib/ipc.js
index 96b5d4afd8..1f7f88d331 100644
--- a/packages/@vue/cli-shared-utils/lib/ipc.js
+++ b/packages/@vue/cli-shared-utils/lib/ipc.js
@@ -1,4 +1,4 @@
-const ipc = require('node-ipc')
+const ipc = require('@achrinza/node-ipc')
 
 const DEFAULT_ID = process.env.VUE_CLI_IPC || 'vue-cli'
 const DEFAULT_IDLE_TIMEOUT = 3000
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 3a24c9061a..1e810e0789 100644
--- a/packages/@vue/cli-shared-utils/package.json
+++ b/packages/@vue/cli-shared-utils/package.json
@@ -26,7 +26,7 @@
     "launch-editor": "^2.2.1",
     "lru-cache": "^6.0.0",
     "node-fetch": "^2.6.7",
-    "node-ipc": "9.2.1",
+    "@achrinza/node-ipc": "9.2.2",
     "open": "^8.0.2",
     "ora": "^5.3.0",
     "read-pkg": "^5.1.1",
diff --git a/packages/@vue/cli-ui/apollo-server/util/ipc.js b/packages/@vue/cli-ui/apollo-server/util/ipc.js
index ce850afaa5..b7eb294cfd 100644
--- a/packages/@vue/cli-ui/apollo-server/util/ipc.js
+++ b/packages/@vue/cli-ui/apollo-server/util/ipc.js
@@ -1,4 +1,4 @@
-const ipc = require('node-ipc')
+const ipc = require('@achrinza/node-ipc')
 // Utils
 const { log, dumpObject } = require('../util/logger')
 
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 48e2ed9966..1a84fe2126 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -53,7 +53,7 @@
     "lodash.merge": "^4.6.1",
     "lowdb": "^1.0.0",
     "lru-cache": "^6.0.0",
-    "node-ipc": "9.2.1",
+    "@achrinza/node-ipc": "9.2.2",
     "node-notifier": "^10.0.0",
     "parse-git-config": "^3.0.0",
     "portfinder": "^1.0.26",
diff --git a/yarn.lock b/yarn.lock
index fb9d915cde..13d9a1e7b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,15 @@
 # yarn lockfile v1
 
 
+"@achrinza/node-ipc@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz#ae1b5d3d6a9362034eea60c8d946b93893c2e4ec"
+  integrity sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw==
+  dependencies:
+    "@node-ipc/js-queue" "2.0.3"
+    event-pubsub "4.3.0"
+    js-message "1.0.7"
+
 "@akryum/winattr@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@akryum/winattr/-/winattr-3.0.0.tgz#c345d49f8415583897e345729c12b3503927dd11"
@@ -2824,6 +2833,13 @@
     pathval "1.1.1"
     type-detect "4.0.5"
 
+"@node-ipc/js-queue@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz#ac7fe33d766fa53e233ef8fedaf3443a01c5a4cd"
+  integrity sha512-fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw==
+  dependencies:
+    easy-stack "1.0.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -8622,7 +8638,7 @@ duplexer@^0.1.1, duplexer@^0.1.2, duplexer@~0.1.1:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-easy-stack@^1.0.1:
+easy-stack@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066"
   integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==
@@ -12826,13 +12842,6 @@ js-message@1.0.7:
   resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz#fbddd053c7a47021871bb8b2c95397cc17c20e47"
   integrity sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==
 
-js-queue@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.2.tgz#0be590338f903b36c73d33c31883a821412cd482"
-  integrity sha512-pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA==
-  dependencies:
-    easy-stack "^1.0.1"
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -14919,15 +14928,6 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-ipc@9.2.1:
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.1.tgz#b32f66115f9d6ce841dc4ec2009d6a733f98bb6b"
-  integrity sha512-mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ==
-  dependencies:
-    event-pubsub "4.3.0"
-    js-message "1.0.7"
-    js-queue "2.0.2"
-
 node-notifier@^10.0.0:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-10.0.1.tgz#0e82014a15a8456c4cfcdb25858750399ae5f1c7"

From c5cfefbb072e21ad1251b5f913b8675aca15425c Mon Sep 17 00:00:00 2001
From: Andrei <unickpro@gmail.com>
Date: Tue, 22 Mar 2022 16:11:02 +0200
Subject: [PATCH 08/47] Better handling of `publicPath: 'auto'` (#7005)

---
 packages/@vue/cli-service/lib/commands/serve.js        | 6 ++++--
 packages/@vue/cli-service/lib/util/getBaseUrl.js       | 3 +++
 packages/@vue/cli-service/lib/util/resolveClientEnv.js | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 packages/@vue/cli-service/lib/util/getBaseUrl.js

diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
index 6ed4ee8b2c..cc66855e8b 100644
--- a/packages/@vue/cli-service/lib/commands/serve.js
+++ b/packages/@vue/cli-service/lib/commands/serve.js
@@ -5,6 +5,7 @@ const {
   hasProjectPnpm,
   IpcMessenger
 } = require('@vue/cli-shared-utils')
+const getBaseUrl = require('../util/getBaseUrl')
 
 const defaults = {
   host: '0.0.0.0',
@@ -14,6 +15,7 @@ const defaults = {
 
 /** @type {import('@vue/cli-service').ServicePlugin} */
 module.exports = (api, options) => {
+  const baseUrl = getBaseUrl(options)
   api.registerCommand('serve', {
     description: 'start development server',
     usage: 'vue-cli-service serve [options] [entry]',
@@ -116,7 +118,7 @@ module.exports = (api, options) => {
       protocol,
       host,
       port,
-      isAbsoluteUrl(options.publicPath) ? '/' : options.publicPath
+      isAbsoluteUrl(baseUrl) ? '/' : baseUrl
     )
     const localUrlForBrowser = publicUrl || urls.localUrlForBrowser
 
@@ -187,7 +189,7 @@ module.exports = (api, options) => {
           'text/html',
           'application/xhtml+xml'
         ],
-        rewrites: genHistoryApiFallbackRewrites(options.publicPath, options.pages)
+        rewrites: genHistoryApiFallbackRewrites(baseUrl, options.pages)
       },
       hot: !isProduction
     }, projectDevServerOptions, {
diff --git a/packages/@vue/cli-service/lib/util/getBaseUrl.js b/packages/@vue/cli-service/lib/util/getBaseUrl.js
new file mode 100644
index 0000000000..e8b4497229
--- /dev/null
+++ b/packages/@vue/cli-service/lib/util/getBaseUrl.js
@@ -0,0 +1,3 @@
+module.exports = function getBaseUrl (options) {
+  return options.publicPath === 'auto' ? '' : options.publicPath
+}
diff --git a/packages/@vue/cli-service/lib/util/resolveClientEnv.js b/packages/@vue/cli-service/lib/util/resolveClientEnv.js
index 2aa83f1554..dd4a7e2d56 100644
--- a/packages/@vue/cli-service/lib/util/resolveClientEnv.js
+++ b/packages/@vue/cli-service/lib/util/resolveClientEnv.js
@@ -1,3 +1,4 @@
+const getBaseUrl = require('./getBaseUrl')
 const prefixRE = /^VUE_APP_/
 
 module.exports = function resolveClientEnv (options, raw) {
@@ -7,7 +8,7 @@ module.exports = function resolveClientEnv (options, raw) {
       env[key] = process.env[key]
     }
   })
-  env.BASE_URL = options.publicPath
+  env.BASE_URL = getBaseUrl(options)
 
   if (raw) {
     return env

From ca97fc2920a3fc9b0288d5fabef1a97356b8da23 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 22 Mar 2022 22:23:34 +0800
Subject: [PATCH 09/47] v5.0.4

---
 CHANGELOG.md                                       | 11 +++++++++++
 lerna.json                                         |  2 +-
 packages/@vue/babel-preset-app/package.json        |  2 +-
 packages/@vue/cli-init/package.json                |  2 +-
 packages/@vue/cli-overlay/package.json             |  2 +-
 packages/@vue/cli-plugin-babel/package.json        |  6 +++---
 packages/@vue/cli-plugin-e2e-cypress/package.json  |  4 ++--
 .../@vue/cli-plugin-e2e-nightwatch/package.json    |  4 ++--
 .../@vue/cli-plugin-e2e-webdriverio/package.json   |  4 ++--
 packages/@vue/cli-plugin-eslint/package.json       |  4 ++--
 packages/@vue/cli-plugin-pwa/package.json          |  4 ++--
 packages/@vue/cli-plugin-router/package.json       |  6 +++---
 packages/@vue/cli-plugin-typescript/package.json   |  4 ++--
 packages/@vue/cli-plugin-unit-jest/package.json    |  4 ++--
 packages/@vue/cli-plugin-unit-mocha/package.json   |  4 ++--
 packages/@vue/cli-plugin-vuex/package.json         |  4 ++--
 packages/@vue/cli-service/package.json             | 10 +++++-----
 packages/@vue/cli-shared-utils/package.json        |  4 ++--
 packages/@vue/cli-test-utils/package.json          |  2 +-
 packages/@vue/cli-ui-addon-webpack/package.json    |  8 ++++----
 packages/@vue/cli-ui-addon-widgets/package.json    |  8 ++++----
 packages/@vue/cli-ui/package.json                  | 14 +++++++-------
 packages/@vue/cli/package.json                     | 12 ++++++------
 packages/vue-cli-version-marker/package.json       |  4 ++--
 24 files changed, 70 insertions(+), 59 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d7cdf1fb1..0bb860c59c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,15 @@
 
+## 5.0.4 (2022-03-22)
+
+#### :bug: Bug Fix
+* `@vue/cli-service`
+  * [#7005](https://github.com/vuejs/vue-cli/pull/7005) Better handling of `publicPath: 'auto'` ([@AndreiSoroka](https://github.com/AndreiSoroka))
+
+#### Committers: 1
+- Andrei ([@AndreiSoroka](https://github.com/AndreiSoroka))
+
+
+
 
 
 
diff --git a/lerna.json b/lerna.json
index 10692f2483..42365b9e23 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "5.0.3",
+  "version": "5.0.4",
   "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
index 91ecc556f5..3aea7920ce 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "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
index fe83dcd5d4..93c9b3693e 100644
--- a/packages/@vue/cli-init/package.json
+++ b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "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
index ff2c5dd7e4..0ad6c5ad2c 100644
--- a/packages/@vue/cli-overlay/package.json
+++ b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "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
index 251c75473e..2609ab0bf2 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "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.12.16",
-    "@vue/babel-preset-app": "^5.0.3",
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/babel-preset-app": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.4",
     "babel-loader": "^8.2.2",
     "thread-loader": "^3.0.0",
     "webpack": "^5.54.0"
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
index cd04b43cdf..e5b56101bb 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "eslint-plugin-cypress": "^2.11.2"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
index 80c890b3c0..7f9206436a 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "deepmerge": "^4.2.2",
     "nightwatch": "^2.0.5"
   },
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
index ad96adcb74..4c4fe57c00 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.2.1",
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "@wdio/cli": "^7.0.7",
     "@wdio/local-runner": "^7.0.7",
     "@wdio/mocha-framework": "^7.0.7",
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index 1ba199e122..d582bc9f53 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "eslint-webpack-plugin": "^3.1.0",
     "globby": "^11.0.2",
     "webpack": "^5.54.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index 5821505fed..b522390ef0 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "html-webpack-plugin": "^5.1.0",
     "webpack": "^5.54.0",
     "workbox-webpack-plugin": "^6.1.0"
diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
index dba00b48e7..85198d9af8 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.3"
+    "@vue/cli-shared-utils": "^5.0.4"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.3"
+    "@vue/cli-test-utils": "^5.0.4"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index 92fc8c817e..fa281eca11 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "babel-loader": "^8.2.2",
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "globby": "^11.0.2",
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
index 5b8075e2e9..cf6932048e 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.16",
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@types/jest": "^27.0.1",
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "babel-jest": "^27.1.0",
     "deepmerge": "^4.2.2",
     "jest": "^27.1.0",
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
index 43161d9b0e..a1a94dec55 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "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": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "jsdom": "^18.0.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^8.3.0",
diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
index 03e13c2cde..74742b5968 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.3"
+    "@vue/cli-test-utils": "^5.0.4"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index dca78aef4e..25a1abc184 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -27,10 +27,10 @@
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
     "@soda/get-current-script": "^1.0.2",
     "@types/minimist": "^1.2.0",
-    "@vue/cli-overlay": "^5.0.3",
-    "@vue/cli-plugin-router": "^5.0.3",
-    "@vue/cli-plugin-vuex": "^5.0.3",
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-overlay": "^5.0.4",
+    "@vue/cli-plugin-router": "^5.0.4",
+    "@vue/cli-plugin-vuex": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.4",
     "@vue/component-compiler-utils": "^3.3.0",
     "@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
     "@vue/web-component-wrapper": "^1.3.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 1e810e0789..ec14e6417e 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "description": "shared utilities for vue-cli packages",
   "main": "index.js",
   "repository": {
@@ -20,13 +20,13 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-shared-utils#readme",
   "dependencies": {
+    "@achrinza/node-ipc": "9.2.2",
     "chalk": "^4.1.2",
     "execa": "^1.0.0",
     "joi": "^17.4.0",
     "launch-editor": "^2.2.1",
     "lru-cache": "^6.0.0",
     "node-fetch": "^2.6.7",
-    "@achrinza/node-ipc": "9.2.2",
     "open": "^8.0.2",
     "ora": "^5.3.0",
     "read-pkg": "^5.1.1",
diff --git a/packages/@vue/cli-test-utils/package.json b/packages/@vue/cli-test-utils/package.json
index 94a72433eb..5648b05384 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "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
index 617b6edea7..eef2258123 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.3",
-    "@vue/cli-plugin-eslint": "^5.0.3",
-    "@vue/cli-service": "^5.0.3",
+    "@vue/cli-plugin-babel": "^5.0.4",
+    "@vue/cli-plugin-eslint": "^5.0.4",
+    "@vue/cli-service": "^5.0.4",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
index ca66b6ca76..930a64e86e 100644
--- 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": "5.0.3",
+  "version": "5.0.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.3",
-    "@vue/cli-plugin-eslint": "^5.0.3",
-    "@vue/cli-service": "^5.0.3",
+    "@vue/cli-plugin-babel": "^5.0.4",
+    "@vue/cli-plugin-eslint": "^5.0.4",
+    "@vue/cli-service": "^5.0.4",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 1a84fe2126..e44cf6834e 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -34,8 +34,9 @@
     "graphql-server.js"
   ],
   "dependencies": {
+    "@achrinza/node-ipc": "9.2.2",
     "@akryum/winattr": "^3.0.0",
-    "@vue/cli-shared-utils": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
     "apollo-server-express": "^2.21.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
@@ -53,7 +54,6 @@
     "lodash.merge": "^4.6.1",
     "lowdb": "^1.0.0",
     "lru-cache": "^6.0.0",
-    "@achrinza/node-ipc": "9.2.2",
     "node-notifier": "^10.0.0",
     "parse-git-config": "^3.0.0",
     "portfinder": "^1.0.26",
@@ -66,10 +66,10 @@
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@graphql-eslint/eslint-plugin": "^3.8.0",
-    "@vue/cli-plugin-babel": "^5.0.3",
-    "@vue/cli-plugin-e2e-cypress": "^5.0.3",
-    "@vue/cli-plugin-eslint": "^5.0.3",
-    "@vue/cli-service": "^5.0.3",
+    "@vue/cli-plugin-babel": "^5.0.4",
+    "@vue/cli-plugin-e2e-cypress": "^5.0.4",
+    "@vue/cli-plugin-eslint": "^5.0.4",
+    "@vue/cli-service": "^5.0.4",
     "@vue/eslint-config-standard": "^6.1.0",
     "@vue/ui": "^0.12.2",
     "ansi_up": "^5.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
index c3e162a701..b41ec9d1d6 100644
--- a/packages/@vue/cli/package.json
+++ b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -27,10 +27,10 @@
   "dependencies": {
     "@types/ejs": "^3.0.6",
     "@types/inquirer": "^8.1.3",
-    "@vue/cli-shared-utils": "^5.0.3",
-    "@vue/cli-ui": "^5.0.3",
-    "@vue/cli-ui-addon-webpack": "^5.0.3",
-    "@vue/cli-ui-addon-widgets": "^5.0.3",
+    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-ui": "^5.0.4",
+    "@vue/cli-ui-addon-webpack": "^5.0.4",
+    "@vue/cli-ui-addon-widgets": "^5.0.4",
     "boxen": "^5.0.0",
     "commander": "^7.1.0",
     "debug": "^4.1.0",
@@ -62,7 +62,7 @@
     "yaml-front-matter": "^4.1.0"
   },
   "devDependencies": {
-    "@vue/cli-service": "^5.0.3",
+    "@vue/cli-service": "^5.0.4",
     "cmd-shim": "^4.1.0"
   },
   "engines": {
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
index 3e92591e09..8633924ec1 100644
--- a/packages/vue-cli-version-marker/package.json
+++ b/packages/vue-cli-version-marker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
   "main": "package.json",
   "devDependencies": {
-    "@vue/cli": "^5.0.3"
+    "@vue/cli": "^5.0.4"
   }
 }

From 9c74b30afe2d9e368218936d4561cabe14f926e7 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 22 Mar 2022 22:34:28 +0800
Subject: [PATCH 10/47] docs: update changelog

---
 CHANGELOG.md | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bb860c59c..ee53aa42c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,18 @@
 #### :bug: Bug Fix
 * `@vue/cli-service`
   * [#7005](https://github.com/vuejs/vue-cli/pull/7005) Better handling of `publicPath: 'auto'` ([@AndreiSoroka](https://github.com/AndreiSoroka))
+* `@vue/cli-shared-utils`, `@vue/cli-ui`
+  * [75826d6](https://github.com/vuejs/vue-cli/commit/75826d6) fix: replace `node-ipc` with `@achrinza/node-ipc` to further secure the dependency chain
 
 #### Committers: 1
 - Andrei ([@AndreiSoroka](https://github.com/AndreiSoroka))
+- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
 
+## 5.0.3 (2022-03-15)
 
-
-
-
+#### :bug: Bug Fix
+* `@vue/cli-shared-utils`, `@vue/cli-ui`
+  * Lock `node-ipc` to v9.2.1
 
 ## 5.0.2 (2022-03-15)
 
@@ -813,6 +817,24 @@ Ngo Wei Lin ([@Creastery](https://twitter.com/creastery)) of STAR Labs ([@starla
 - Yazhe Wang ([@jeneser](https://github.com/jeneser))
 
 
+## 4.5.16 (2022-03-15)
+
+#### :bug: Bug Fix
+* `@vue/cli-service`
+  * Fix demo-lib.html and demo-wc.html for Vue 2
+* `@vue/cli-shared-utils`, `@vue/cli-ui`
+  * Lock `node-ipc` to v9.2.1
+
+
+## 4.5.15 (2021-10-28)
+
+#### Bug Fixes
+
+* fix: set `.mjs` file type to `javascript/auto` [[15b1e1b]](https://github.com/vuejs/vue-cli/commit/15b1e1b6bfa40fe0b69db304a2439c66ff9ba65f)
+
+This change allows an `.mjs` file to import named exports from `.cjs` and plain `.js` files.
+Fixes compatibility with `pinia`.
+
 
 ## 4.5.14 (2021-10-14)
 

From a3ccc3d3aee0e61d1c08a959c0e7ac386bf4b81f Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 23 Mar 2022 14:00:52 +0800
Subject: [PATCH 11/47] docs: add 4.5.17 changelog

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee53aa42c2..401f4548e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -817,6 +817,16 @@ Ngo Wei Lin ([@Creastery](https://twitter.com/creastery)) of STAR Labs ([@starla
 - Yazhe Wang ([@jeneser](https://github.com/jeneser))
 
 
+## 4.5.17 (2022-03-23)
+
+#### :bug: Bug Fix
+* `@vue/cli-shared-utils`, `@vue/cli-ui`
+  * [d7a9881](https://github.com/vuejs/vue-cli/commit/d7a9881) fix: replace `node-ipc` with `@achrinza/node-ipc` to further secure the dependency chain
+
+#### Committers: 1
+- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
+
+
 ## 4.5.16 (2022-03-15)
 
 #### :bug: Bug Fix

From dded73a9f48aa5bfdcd75385d85b8e86258bb7ee Mon Sep 17 00:00:00 2001
From: ZHAO Jinxiang <xiaoxiangmoe@gmail.com>
Date: Thu, 31 Mar 2022 16:52:41 +0800
Subject: [PATCH 12/47] fix: windows vue.config.mjs support (#7023)

---
 packages/@vue/cli-service/lib/util/loadFileConfig.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vue/cli-service/lib/util/loadFileConfig.js b/packages/@vue/cli-service/lib/util/loadFileConfig.js
index ab01117d94..4452cc2b6e 100644
--- a/packages/@vue/cli-service/lib/util/loadFileConfig.js
+++ b/packages/@vue/cli-service/lib/util/loadFileConfig.js
@@ -1,6 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-
+const { pathToFileURL } = require('url')
 const isFileEsm = require('is-file-esm')
 const { loadModule } = require('@vue/cli-shared-utils')
 
@@ -25,7 +25,7 @@ module.exports = function loadFileConfig (context) {
     const { esm } = isFileEsm.sync(fileConfigPath)
 
     if (esm) {
-      fileConfig = import(fileConfigPath)
+      fileConfig = import(pathToFileURL(fileConfigPath))
     } else {
       fileConfig = loadModule(fileConfigPath, context)
     }

From 60356294218fca3f5919ad7e90e706b57e86cafb Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 6 Apr 2022 16:28:53 +0800
Subject: [PATCH 13/47] chore: remove redundant yorkie dependency in typescript
 plugin

It was introduced for tslint support, which has already been removed.
---
 packages/@vue/cli-plugin-typescript/package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index fa281eca11..b16040ba54 100644
--- a/packages/@vue/cli-plugin-typescript/package.json
+++ b/packages/@vue/cli-plugin-typescript/package.json
@@ -31,8 +31,7 @@
     "globby": "^11.0.2",
     "thread-loader": "^3.0.0",
     "ts-loader": "^9.2.5",
-    "webpack": "^5.54.0",
-    "yorkie": "^2.0.0"
+    "webpack": "^5.54.0"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0",

From 940e4363a55f76013d0509de7c1433b03619585e Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 6 Apr 2022 16:42:43 +0800
Subject: [PATCH 14/47] fix: update `@achrinza/node-ipc` to support non-LTS
 Node.js versions

---
 packages/@vue/cli-shared-utils/package.json | 2 +-
 packages/@vue/cli-ui/package.json           | 2 +-
 yarn.lock                                   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index ec14e6417e..02c56a9794 100644
--- a/packages/@vue/cli-shared-utils/package.json
+++ b/packages/@vue/cli-shared-utils/package.json
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-shared-utils#readme",
   "dependencies": {
-    "@achrinza/node-ipc": "9.2.2",
+    "@achrinza/node-ipc": "9.2.3",
     "chalk": "^4.1.2",
     "execa": "^1.0.0",
     "joi": "^17.4.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index e44cf6834e..77218d96d2 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -34,7 +34,7 @@
     "graphql-server.js"
   ],
   "dependencies": {
-    "@achrinza/node-ipc": "9.2.2",
+    "@achrinza/node-ipc": "9.2.3",
     "@akryum/winattr": "^3.0.0",
     "@vue/cli-shared-utils": "^5.0.4",
     "apollo-server-express": "^2.21.0",
diff --git a/yarn.lock b/yarn.lock
index 13d9a1e7b1..d5a26426b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@achrinza/node-ipc@9.2.2":
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz#ae1b5d3d6a9362034eea60c8d946b93893c2e4ec"
-  integrity sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw==
+"@achrinza/node-ipc@9.2.3":
+  version "9.2.3"
+  resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.3.tgz#a425249566e318e4aca1f01a754f4e70486708bb"
+  integrity sha512-RHKuRKICo0PrUGXpPkqtD5a/3/LU2MwWI6pynZ3WYq+0iCMwWv3wGFM/yFxtaaa1zKkP3bGz4tVyHtqbIRxL8g==
   dependencies:
     "@node-ipc/js-queue" "2.0.3"
     event-pubsub "4.3.0"

From ce97e62304e884c4277aaa1b605f735253e4205b Mon Sep 17 00:00:00 2001
From: Martijn Jacobs <maerteijn@gmail.com>
Date: Wed, 13 Apr 2022 10:47:45 +0200
Subject: [PATCH 15/47] fix: add XMLSerializer to the global scope (#7101)

---
 packages/@vue/cli-plugin-unit-mocha/setup.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/@vue/cli-plugin-unit-mocha/setup.js b/packages/@vue/cli-plugin-unit-mocha/setup.js
index df81b0b514..accf1e4405 100644
--- a/packages/@vue/cli-plugin-unit-mocha/setup.js
+++ b/packages/@vue/cli-plugin-unit-mocha/setup.js
@@ -6,3 +6,6 @@ window.Date = Date
 global.ShadowRoot = window.ShadowRoot
 
 global.SVGElement = window.SVGElement
+
+// https://github.com/vuejs/test-utils/issues/1253
+global.XMLSerializer = window.XMLSerializer

From 00fd2b6f9f3486db88d0960b57ceba6474998f7a Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 14 Jun 2022 16:07:55 +0800
Subject: [PATCH 16/47] chore: update the @achrinza/node-ipc to support Node.js
 18

---
 packages/@vue/cli-shared-utils/package.json | 2 +-
 packages/@vue/cli-ui/package.json           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 02c56a9794..863491205b 100644
--- a/packages/@vue/cli-shared-utils/package.json
+++ b/packages/@vue/cli-shared-utils/package.json
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-shared-utils#readme",
   "dependencies": {
-    "@achrinza/node-ipc": "9.2.3",
+    "@achrinza/node-ipc": "^9.2.5",
     "chalk": "^4.1.2",
     "execa": "^1.0.0",
     "joi": "^17.4.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 77218d96d2..d32d019dd0 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -34,7 +34,7 @@
     "graphql-server.js"
   ],
   "dependencies": {
-    "@achrinza/node-ipc": "9.2.3",
+    "@achrinza/node-ipc": "^9.2.5",
     "@akryum/winattr": "^3.0.0",
     "@vue/cli-shared-utils": "^5.0.4",
     "apollo-server-express": "^2.21.0",

From 1452cd3fbf0f2e15cb33e5480744ddcbe6f48aa9 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 14 Jun 2022 16:09:30 +0800
Subject: [PATCH 17/47] feat: update cypress to 9.x

We are going to update to 10.x soon after.
---
 packages/@vue/cli-plugin-e2e-cypress/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
index e5b56101bb..abcb615972 100644
--- a/packages/@vue/cli-plugin-e2e-cypress/package.json
+++ b/packages/@vue/cli-plugin-e2e-cypress/package.json
@@ -27,7 +27,7 @@
     "eslint-plugin-cypress": "^2.11.2"
   },
   "devDependencies": {
-    "cypress": "^8.3.0"
+    "cypress": "^9.7.0"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0",

From d5bb3580f9411c76982e32e0ab6a77f30a40d980 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 14 Jun 2022 16:10:26 +0800
Subject: [PATCH 18/47] chore: update lockfile

---
 yarn.lock | 85 +++++++++++++++++++++++--------------------------------
 1 file changed, 36 insertions(+), 49 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d5a26426b3..c9afe15d04 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@achrinza/node-ipc@9.2.3":
-  version "9.2.3"
-  resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.3.tgz#a425249566e318e4aca1f01a754f4e70486708bb"
-  integrity sha512-RHKuRKICo0PrUGXpPkqtD5a/3/LU2MwWI6pynZ3WYq+0iCMwWv3wGFM/yFxtaaa1zKkP3bGz4tVyHtqbIRxL8g==
+"@achrinza/node-ipc@^9.2.5":
+  version "9.2.5"
+  resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28"
+  integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ==
   dependencies:
     "@node-ipc/js-queue" "2.0.3"
     event-pubsub "4.3.0"
@@ -1352,7 +1352,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cypress/request@^2.88.6":
+"@colors/colors@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+
+"@cypress/request@^2.88.10":
   version "2.88.10"
   resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
   integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
@@ -3949,10 +3954,10 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
-"@types/sinonjs__fake-timers@^6.0.2":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d"
-  integrity sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==
+"@types/sinonjs__fake-timers@8.1.1":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
+  integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
 
 "@types/sizzle@^2.3.2":
   version "2.3.3"
@@ -6310,7 +6315,7 @@ buffer-json@^2.0.0:
   resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23"
   integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==
 
-buffer@^5.2.1, buffer@^5.5.0, buffer@^5.7.0:
+buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0, buffer@^5.7.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -6879,14 +6884,14 @@ cli-spinners@^2.1.0, cli-spinners@^2.5.0:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
   integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
 
-cli-table3@~0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
-  integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
+cli-table3@~0.6.1:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
+  integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
   dependencies:
     string-width "^4.2.0"
   optionalDependencies:
-    colors "1.4.0"
+    "@colors/colors" "1.5.0"
 
 cli-truncate@2.1.0, cli-truncate@^2.1.0:
   version "2.1.0"
@@ -7174,7 +7179,7 @@ colorette@^2.0.10, colorette@^2.0.16:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
   integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
 
-colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
+colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -7884,24 +7889,25 @@ csstype@^2.6.8:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.19.tgz#feeb5aae89020bb389e1f63669a5ed490e391caa"
   integrity sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==
 
-cypress@^8.3.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.7.0.tgz#2ee371f383d8f233d3425b6cc26ddeec2668b6da"
-  integrity sha512-b1bMC3VQydC6sXzBMFnSqcvwc9dTZMgcaOzT0vpSD+Gq1yFc+72JDWi55sfUK5eIeNLAtWOGy1NNb6UlhMvB+Q==
+cypress@^9.7.0:
+  version "9.7.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744"
+  integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q==
   dependencies:
-    "@cypress/request" "^2.88.6"
+    "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
     "@types/node" "^14.14.31"
-    "@types/sinonjs__fake-timers" "^6.0.2"
+    "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
     blob-util "^2.0.2"
     bluebird "^3.7.2"
+    buffer "^5.6.0"
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
     cli-cursor "^3.1.0"
-    cli-table3 "~0.6.0"
+    cli-table3 "~0.6.1"
     commander "^5.1.0"
     common-tags "^1.8.0"
     dayjs "^1.10.4"
@@ -7920,16 +7926,15 @@ cypress@^8.3.0:
     listr2 "^3.8.3"
     lodash "^4.17.21"
     log-symbols "^4.0.0"
-    minimist "^1.2.5"
+    minimist "^1.2.6"
     ospath "^1.2.2"
     pretty-bytes "^5.6.0"
     proxy-from-env "1.0.0"
-    ramda "~0.27.1"
     request-progress "^3.0.0"
+    semver "^7.3.2"
     supports-color "^8.1.1"
     tmp "~0.2.1"
     untildify "^4.0.0"
-    url "^0.11.0"
     yauzl "^2.10.0"
 
 d@1, d@^1.0.1:
@@ -14441,6 +14446,11 @@ minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -16530,11 +16540,6 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
 punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -16635,11 +16640,6 @@ querystring-es3@^0.2.1:
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
   integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -16660,11 +16660,6 @@ quick-lru@^5.1.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
-ramda@~0.27.1:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.2.tgz#84463226f7f36dc33592f6f4ed6374c48306c3f1"
-  integrity sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==
-
 randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -19655,14 +19650,6 @@ url-to-options@^1.0.1:
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
   integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
 
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"

From b2b07a569375fe6057f346ea3f09343dcf2a1045 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 15 Jun 2022 16:17:09 +0800
Subject: [PATCH 19/47] chore: run yarn-audit-fix

---
 yarn.lock | 63 +++++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c9afe15d04..5a33d80605 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5102,9 +5102,9 @@ ansi-regex@^2.0.0:
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^4.1.0:
   version "4.1.0"
@@ -5825,23 +5825,23 @@ async-retry@^1.2.1:
   dependencies:
     retry "0.13.1"
 
-async@0.9.x:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
-
 async@3.2.3, async@^3.2.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
   integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
 
 async@^2.4.0, async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity "sha1-cGt/9ghGZM1+rnE/b5ZUM7VQQiE= sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="
   dependencies:
     lodash "^4.17.14"
 
+async@^3.2.3:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+  integrity "sha1-LSLgD4zd61/eXdM1IrVtHPVpqBw= sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -6639,7 +6639,7 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -8706,11 +8706,11 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 ejs@^3.0.1, ejs@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
-  integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
+  integrity "sha1-dY0ykQx4BHWFx+8fkvnuBBwcGQs= sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="
   dependencies:
-    jake "^10.6.1"
+    jake "^10.8.5"
 
 electron-to-chromium@^1.4.17:
   version "1.4.65"
@@ -12359,13 +12359,13 @@ iterall@^1.1.3, iterall@^1.2.1, iterall@^1.3.0:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
   integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
 
-jake@^10.6.1:
-  version "10.8.2"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
-  integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+jake@^10.8.5:
+  version "10.8.5"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
+  integrity "sha1-8hg9LFk4LLJ0ImA0VDucA7gWTEY= sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="
   dependencies:
-    async "0.9.x"
-    chalk "^2.4.2"
+    async "^3.2.3"
+    chalk "^4.0.2"
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
@@ -14441,12 +14441,7 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minimist@^1.2.6:
+minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
@@ -14896,9 +14891,9 @@ node-fetch@2.6.7, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7:
     whatwg-url "^5.0.0"
 
 node-forge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
-  integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
+  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
 node-gyp@^5.0.2:
   version "5.1.1"
@@ -16378,9 +16373,9 @@ printj@~1.3.1:
   integrity sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==
 
 prismjs@^1.23.0, prismjs@^1.25.0:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.26.0.tgz#16881b594828bb6b45296083a8cbab46b0accd47"
-  integrity sha512-HUoH9C5Z3jKkl3UunCyiD5jwk0+Hz0fIgQ2nbwU2Oo/ceuTAQAg+pPVnfdt2TJWRVLcxKh9iuoYDUSc8clb5UQ==
+  version "1.28.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6"
+  integrity "sha1-DY9WH6D3z268qQF0eCixSRRwRLY= sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw=="
 
 private@~0.1.5:
   version "0.1.8"

From 697bb44ef0e78d870ed582adc71464dd2336a68a Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 15 Jun 2022 20:26:23 +0800
Subject: [PATCH 20/47] fix: should correctly resolve cypress bin path for
 Cypress 10

Fixes #7194
---
 packages/@vue/cli-plugin-e2e-cypress/index.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/@vue/cli-plugin-e2e-cypress/index.js b/packages/@vue/cli-plugin-e2e-cypress/index.js
index 6b81b68de9..4594c891ec 100644
--- a/packages/@vue/cli-plugin-e2e-cypress/index.js
+++ b/packages/@vue/cli-plugin-e2e-cypress/index.js
@@ -1,3 +1,5 @@
+const path = require('path')
+
 module.exports = (api, options) => {
   const { info, chalk, execa, resolveModule } = require('@vue/cli-shared-utils')
 
@@ -32,8 +34,16 @@ module.exports = (api, options) => {
     ]
 
     // Use loadModule to allow users to customize their Cypress dependency version.
-    const cypressBinPath = resolveModule('cypress/bin/cypress', api.getCwd()) ||
-      resolveModule('cypress/bin/cypress', __dirname)
+    const cypressPackageJsonPath =
+      resolveModule('cypress/package.json', api.getCwd()) ||
+      resolveModule('cypress/package.json', __dirname)
+    const cypressPkg = require(cypressPackageJsonPath)
+    const cypressBinPath = path.resolve(
+      cypressPackageJsonPath,
+      '../',
+      cypressPkg.bin.cypress
+    )
+
     const runner = execa(cypressBinPath, cyArgs, { stdio: 'inherit' })
     if (server) {
       runner.on('exit', () => server.close())

From 619965bd7c7c6526903ad36a7f09d7ac14e98e55 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 15 Jun 2022 20:35:36 +0800
Subject: [PATCH 21/47] docs: fix 404 links

---
 packages/@vue/cli-plugin-pwa/ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vue/cli-plugin-pwa/ui.js b/packages/@vue/cli-plugin-pwa/ui.js
index b4d9730eb0..cc2592c220 100644
--- a/packages/@vue/cli-plugin-pwa/ui.js
+++ b/packages/@vue/cli-plugin-pwa/ui.js
@@ -29,7 +29,7 @@ module.exports = api => {
             type: 'list',
             message: 'org.vue.pwa.config.pwa.workboxPluginMode.message',
             description: 'org.vue.pwa.config.pwa.workboxPluginMode.description',
-            link: 'https://developers.google.com/web/tools/workbox/modules/workbox-webpack-plugin#which_plugin_to_use',
+            link: 'https://developer.chrome.com/docs/workbox/modules/workbox-webpack-plugin/#which-plugin-to-use',
             default: 'GenerateSW',
             value: data.vue && data.vue.pwa && data.vue.pwa.workboxPluginMode,
             choices: [

From 27dba1ac6ddb9822b82734b726088e61463a5023 Mon Sep 17 00:00:00 2001
From: blzsaa <balazs.veres@yahoo.com>
Date: Thu, 16 Jun 2022 07:46:53 +0200
Subject: [PATCH 22/47] fix: eliminate calling deprecated function in
 cli-plugin-e2e-cypress and cli-plugin-e2e-nightwatch (#7158)

Co-authored-by: blzsaa <blzsaa@users.noreply.github.com>
---
 packages/@vue/cli-plugin-e2e-cypress/index.js    | 4 ++--
 packages/@vue/cli-plugin-e2e-nightwatch/index.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@vue/cli-plugin-e2e-cypress/index.js b/packages/@vue/cli-plugin-e2e-cypress/index.js
index 4594c891ec..8679121c44 100644
--- a/packages/@vue/cli-plugin-e2e-cypress/index.js
+++ b/packages/@vue/cli-plugin-e2e-cypress/index.js
@@ -46,8 +46,8 @@ module.exports = (api, options) => {
 
     const runner = execa(cypressBinPath, cyArgs, { stdio: 'inherit' })
     if (server) {
-      runner.on('exit', () => server.close())
-      runner.on('error', () => server.close())
+      runner.on('exit', () => server.stop())
+      runner.on('error', () => server.stop())
     }
 
     if (process.env.VUE_CLI_TEST) {
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/index.js b/packages/@vue/cli-plugin-e2e-nightwatch/index.js
index 9175fee366..cfeacda32b 100644
--- a/packages/@vue/cli-plugin-e2e-nightwatch/index.js
+++ b/packages/@vue/cli-plugin-e2e-nightwatch/index.js
@@ -80,8 +80,8 @@ module.exports = (api, options) => {
       const nightWatchBinPath = require.resolve('nightwatch/bin/nightwatch')
       const runner = execa(nightWatchBinPath, rawArgs, { stdio: 'inherit' })
       if (server) {
-        runner.on('exit', () => server.close())
-        runner.on('error', () => server.close())
+        runner.on('exit', () => server.stop())
+        runner.on('error', () => server.stop())
       }
 
       if (process.env.VUE_CLI_TEST) {

From 64446e035dde101c7953669fd45634741e3ef4d8 Mon Sep 17 00:00:00 2001
From: blzsaa <balazs.veres@yahoo.com>
Date: Thu, 16 Jun 2022 07:49:31 +0200
Subject: [PATCH 23/47] feat(upgrade): prevent changing the structure of
 package.json file during upgrade (#7167)

Co-authored-by: blzsaa <blzsaa@users.noreply.github.com>
---
 packages/@vue/cli/lib/Generator.js | 7 +++++--
 packages/@vue/cli/lib/migrate.js   | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/@vue/cli/lib/Generator.js b/packages/@vue/cli/lib/Generator.js
index 5b26ee78cc..9766a82295 100644
--- a/packages/@vue/cli/lib/Generator.js
+++ b/packages/@vue/cli/lib/Generator.js
@@ -192,7 +192,8 @@ module.exports = class Generator {
 
   async generate ({
     extractConfigFiles = false,
-    checkExisting = false
+    checkExisting = false,
+    sortPackageJson = true
   } = {}) {
     await this.initPlugins()
 
@@ -203,7 +204,9 @@ module.exports = class Generator {
     // wait for file resolve
     await this.resolveFiles()
     // set package.json
-    this.sortPkg()
+    if (sortPackageJson) {
+      this.sortPkg()
+    }
     this.files['package.json'] = JSON.stringify(this.pkg, null, 2) + '\n'
     // write/update file tree to disk
     await writeFileTree(this.context, this.files, initialFiles, this.filesModifyRecord)
diff --git a/packages/@vue/cli/lib/migrate.js b/packages/@vue/cli/lib/migrate.js
index a362105cfb..d3739390a7 100644
--- a/packages/@vue/cli/lib/migrate.js
+++ b/packages/@vue/cli/lib/migrate.js
@@ -31,7 +31,8 @@ async function runMigrator (context, plugin, pkg = getPkg(context)) {
   log(`🚀  Running migrator of ${plugin.id}`)
   await migrator.generate({
     extractConfigFiles: true,
-    checkExisting: true
+    checkExisting: true,
+    sortPackageJson: false
   })
 
   const newDeps = migrator.pkg.dependencies

From 98c66c93ae45d3347f62c56838caab86561ad4f7 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 16 Jun 2022 14:06:17 +0800
Subject: [PATCH 24/47] v5.0.5

---
 CHANGELOG.md                                      | 15 +++++++++++++++
 lerna.json                                        |  2 +-
 packages/@vue/babel-preset-app/package.json       |  2 +-
 packages/@vue/cli-init/package.json               |  2 +-
 packages/@vue/cli-overlay/package.json            |  2 +-
 packages/@vue/cli-plugin-babel/package.json       |  6 +++---
 packages/@vue/cli-plugin-e2e-cypress/package.json |  4 ++--
 .../@vue/cli-plugin-e2e-nightwatch/package.json   |  4 ++--
 .../@vue/cli-plugin-e2e-webdriverio/package.json  |  4 ++--
 packages/@vue/cli-plugin-eslint/package.json      |  4 ++--
 packages/@vue/cli-plugin-pwa/package.json         |  4 ++--
 packages/@vue/cli-plugin-router/package.json      |  6 +++---
 packages/@vue/cli-plugin-typescript/package.json  |  4 ++--
 packages/@vue/cli-plugin-unit-jest/package.json   |  4 ++--
 packages/@vue/cli-plugin-unit-mocha/package.json  |  4 ++--
 packages/@vue/cli-plugin-vuex/package.json        |  4 ++--
 packages/@vue/cli-service/package.json            | 10 +++++-----
 packages/@vue/cli-shared-utils/package.json       |  2 +-
 packages/@vue/cli-test-utils/package.json         |  2 +-
 packages/@vue/cli-ui-addon-webpack/package.json   |  8 ++++----
 packages/@vue/cli-ui-addon-widgets/package.json   |  8 ++++----
 packages/@vue/cli-ui/package.json                 | 12 ++++++------
 packages/@vue/cli/package.json                    | 12 ++++++------
 packages/vue-cli-version-marker/package.json      |  4 ++--
 24 files changed, 72 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 401f4548e9..8146b5e04d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,19 @@
 
+## 5.0.5 (2022-06-16)
+
+#### :bug: Bug Fix
+* `@vue/cli`
+  * [#7167](https://github.com/vuejs/vue-cli/pull/7167) feat(upgrade): prevent changing the structure of package.json file during upgrade ([@blzsaa](https://github.com/blzsaa))
+* `@vue/cli-service`
+  * [#7023](https://github.com/vuejs/vue-cli/pull/7023) fix: windows vue.config.mjs support ([@xiaoxiangmoe](https://github.com/xiaoxiangmoe))
+
+#### Committers: 3
+- Martijn Jacobs ([@maerteijn](https://github.com/maerteijn))
+- ZHAO Jinxiang ([@xiaoxiangmoe](https://github.com/xiaoxiangmoe))
+- [@blzsaa](https://github.com/blzsaa)
+
+
+
 ## 5.0.4 (2022-03-22)
 
 #### :bug: Bug Fix
diff --git a/lerna.json b/lerna.json
index 42365b9e23..c721043a50 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "5.0.4",
+  "version": "5.0.5",
   "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
index 3aea7920ce..4231ea08fe 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "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
index 93c9b3693e..aab58ba200 100644
--- a/packages/@vue/cli-init/package.json
+++ b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "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
index 0ad6c5ad2c..5bfc22c6a9 100644
--- a/packages/@vue/cli-overlay/package.json
+++ b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "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
index 2609ab0bf2..2bda8cc548 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "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.12.16",
-    "@vue/babel-preset-app": "^5.0.4",
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/babel-preset-app": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.5",
     "babel-loader": "^8.2.2",
     "thread-loader": "^3.0.0",
     "webpack": "^5.54.0"
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
index abcb615972..3288240799 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "eslint-plugin-cypress": "^2.11.2"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
index 7f9206436a..a9f791767f 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "deepmerge": "^4.2.2",
     "nightwatch": "^2.0.5"
   },
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
index 4c4fe57c00..039278136d 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.2.1",
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "@wdio/cli": "^7.0.7",
     "@wdio/local-runner": "^7.0.7",
     "@wdio/mocha-framework": "^7.0.7",
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index d582bc9f53..14d45f0d10 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "eslint-webpack-plugin": "^3.1.0",
     "globby": "^11.0.2",
     "webpack": "^5.54.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index b522390ef0..59b039df90 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "html-webpack-plugin": "^5.1.0",
     "webpack": "^5.54.0",
     "workbox-webpack-plugin": "^6.1.0"
diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
index 85198d9af8..d4ee3117b3 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.4"
+    "@vue/cli-shared-utils": "^5.0.5"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.4"
+    "@vue/cli-test-utils": "^5.0.5"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index b16040ba54..33bd6e5516 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "babel-loader": "^8.2.2",
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "globby": "^11.0.2",
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
index cf6932048e..c99198cc85 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.16",
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@types/jest": "^27.0.1",
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "babel-jest": "^27.1.0",
     "deepmerge": "^4.2.2",
     "jest": "^27.1.0",
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
index a1a94dec55..2cd4ede882 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "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": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "jsdom": "^18.0.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^8.3.0",
diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
index 74742b5968..61bc5c5896 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.4"
+    "@vue/cli-test-utils": "^5.0.5"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index 25a1abc184..1636f7007d 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -27,10 +27,10 @@
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
     "@soda/get-current-script": "^1.0.2",
     "@types/minimist": "^1.2.0",
-    "@vue/cli-overlay": "^5.0.4",
-    "@vue/cli-plugin-router": "^5.0.4",
-    "@vue/cli-plugin-vuex": "^5.0.4",
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-overlay": "^5.0.5",
+    "@vue/cli-plugin-router": "^5.0.5",
+    "@vue/cli-plugin-vuex": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.5",
     "@vue/component-compiler-utils": "^3.3.0",
     "@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
     "@vue/web-component-wrapper": "^1.3.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 863491205b..7f8df527ae 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "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
index 5648b05384..56554c1a33 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "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
index eef2258123..e925bc2c0b 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.4",
-    "@vue/cli-plugin-eslint": "^5.0.4",
-    "@vue/cli-service": "^5.0.4",
+    "@vue/cli-plugin-babel": "^5.0.5",
+    "@vue/cli-plugin-eslint": "^5.0.5",
+    "@vue/cli-service": "^5.0.5",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
index 930a64e86e..036c4bc887 100644
--- 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": "5.0.4",
+  "version": "5.0.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.4",
-    "@vue/cli-plugin-eslint": "^5.0.4",
-    "@vue/cli-service": "^5.0.4",
+    "@vue/cli-plugin-babel": "^5.0.5",
+    "@vue/cli-plugin-eslint": "^5.0.5",
+    "@vue/cli-service": "^5.0.5",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index d32d019dd0..8f2395bcd7 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@achrinza/node-ipc": "^9.2.5",
     "@akryum/winattr": "^3.0.0",
-    "@vue/cli-shared-utils": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
     "apollo-server-express": "^2.21.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
@@ -66,10 +66,10 @@
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@graphql-eslint/eslint-plugin": "^3.8.0",
-    "@vue/cli-plugin-babel": "^5.0.4",
-    "@vue/cli-plugin-e2e-cypress": "^5.0.4",
-    "@vue/cli-plugin-eslint": "^5.0.4",
-    "@vue/cli-service": "^5.0.4",
+    "@vue/cli-plugin-babel": "^5.0.5",
+    "@vue/cli-plugin-e2e-cypress": "^5.0.5",
+    "@vue/cli-plugin-eslint": "^5.0.5",
+    "@vue/cli-service": "^5.0.5",
     "@vue/eslint-config-standard": "^6.1.0",
     "@vue/ui": "^0.12.2",
     "ansi_up": "^5.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
index b41ec9d1d6..90ef11eb1a 100644
--- a/packages/@vue/cli/package.json
+++ b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -27,10 +27,10 @@
   "dependencies": {
     "@types/ejs": "^3.0.6",
     "@types/inquirer": "^8.1.3",
-    "@vue/cli-shared-utils": "^5.0.4",
-    "@vue/cli-ui": "^5.0.4",
-    "@vue/cli-ui-addon-webpack": "^5.0.4",
-    "@vue/cli-ui-addon-widgets": "^5.0.4",
+    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-ui": "^5.0.5",
+    "@vue/cli-ui-addon-webpack": "^5.0.5",
+    "@vue/cli-ui-addon-widgets": "^5.0.5",
     "boxen": "^5.0.0",
     "commander": "^7.1.0",
     "debug": "^4.1.0",
@@ -62,7 +62,7 @@
     "yaml-front-matter": "^4.1.0"
   },
   "devDependencies": {
-    "@vue/cli-service": "^5.0.4",
+    "@vue/cli-service": "^5.0.5",
     "cmd-shim": "^4.1.0"
   },
   "engines": {
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
index 8633924ec1..51394d70e6 100644
--- a/packages/vue-cli-version-marker/package.json
+++ b/packages/vue-cli-version-marker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
   "main": "package.json",
   "devDependencies": {
-    "@vue/cli": "^5.0.4"
+    "@vue/cli": "^5.0.5"
   }
 }

From a648958b00758bd267743090a894c510ecaa8b40 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 16 Jun 2022 19:24:48 +0800
Subject: [PATCH 25/47] fix: compatibility with Vue 2.7

---
 packages/@vue/cli-plugin-typescript/index.js | 11 ++++++++++-
 packages/@vue/cli-service/lib/config/base.js |  7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js
index 54af685a4c..608c108769 100644
--- a/packages/@vue/cli-plugin-typescript/index.js
+++ b/packages/@vue/cli-plugin-typescript/index.js
@@ -82,6 +82,15 @@ module.exports = (api, projectOptions) => {
     // this plugin does not play well with jest + cypress setup (tsPluginE2e.spec.js) somehow
     // so temporarily disabled for vue-cli tests
     if (!process.env.VUE_CLI_TEST) {
+      let vueCompilerPath
+      try {
+        // Vue 2.7+
+        vueCompilerPath = require.resolve('vue/compiler-sfc')
+      } catch (e) {
+        // Vue 2.6 and lower versions
+        vueCompilerPath = require.resolve('vue-template-compiler')
+      }
+
       config
         .plugin('fork-ts-checker')
         .use(require('fork-ts-checker-webpack-plugin'), [{
@@ -89,7 +98,7 @@ module.exports = (api, projectOptions) => {
             extensions: {
               vue: {
                 enabled: true,
-                compiler: isVue3 ? require.resolve('vue/compiler-sfc') : require.resolve('vue-template-compiler')
+                compiler: vueCompilerPath
               }
             },
             diagnosticOptions: {
diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js
index 3c8ff627bf..84bbfeddaa 100644
--- a/packages/@vue/cli-service/lib/config/base.js
+++ b/packages/@vue/cli-service/lib/config/base.js
@@ -64,9 +64,14 @@ module.exports = (api, options) => {
       const vueLoaderCacheConfig = api.genCacheConfig('vue-loader', {
         'vue-loader': require('@vue/vue-loader-v15/package.json').version,
         '@vue/component-compiler-utils': require('@vue/component-compiler-utils/package.json').version,
-        'vue-template-compiler': require('vue-template-compiler/package.json').version
       })
 
+      try {
+        vueLoaderCacheConfig['vue-template-compiler'] = require('vue-template-compiler/package.json').version
+      } catch (e) {
+        // For Vue 2.7 projects, `vue-template-compiler` is not required
+      }
+
       webpackConfig.resolve
         .alias
           .set(

From fcf27e350e743a2fbc99d4c021dcd49e43cac929 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 16 Jun 2022 20:22:32 +0800
Subject: [PATCH 26/47] fixup! fix: compatibility with Vue 2.7

---
 packages/@vue/cli-service/lib/config/base.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js
index 84bbfeddaa..5326590e8a 100644
--- a/packages/@vue/cli-service/lib/config/base.js
+++ b/packages/@vue/cli-service/lib/config/base.js
@@ -61,17 +61,19 @@ module.exports = (api, options) => {
 
     if (vueMajor === 2) {
       // for Vue 2 projects
-      const vueLoaderCacheConfig = api.genCacheConfig('vue-loader', {
+      const partialIdentifier = {
         'vue-loader': require('@vue/vue-loader-v15/package.json').version,
-        '@vue/component-compiler-utils': require('@vue/component-compiler-utils/package.json').version,
-      })
+        '@vue/component-compiler-utils': require('@vue/component-compiler-utils/package.json').version
+      }
 
       try {
-        vueLoaderCacheConfig['vue-template-compiler'] = require('vue-template-compiler/package.json').version
+        partialIdentifier['vue-template-compiler'] = require('vue-template-compiler/package.json').version
       } catch (e) {
         // For Vue 2.7 projects, `vue-template-compiler` is not required
       }
 
+      const vueLoaderCacheConfig = api.genCacheConfig('vue-loader', partialIdentifier)
+
       webpackConfig.resolve
         .alias
           .set(

From 6b163f28fc3428284a06957f157f7825cd8fd74c Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 16 Jun 2022 21:38:49 +0800
Subject: [PATCH 27/47] chore: fix lint errors

---
 packages/@vue/cli-plugin-typescript/index.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js
index 608c108769..dd9d1224cb 100644
--- a/packages/@vue/cli-plugin-typescript/index.js
+++ b/packages/@vue/cli-plugin-typescript/index.js
@@ -3,10 +3,6 @@ const path = require('path')
 module.exports = (api, projectOptions) => {
   const useThreads = process.env.NODE_ENV === 'production' && !!projectOptions.parallel
 
-  const { semver, loadModule } = require('@vue/cli-shared-utils')
-  const vue = loadModule('vue', api.service.context)
-  const isVue3 = (vue && semver.major(vue.version) === 3)
-
   api.chainWebpack(config => {
     config.resolveLoader.modules.prepend(path.join(__dirname, 'node_modules'))
 

From ef08a08c41b028a2484f262414a8c91d151febc7 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 16 Jun 2022 22:41:05 +0800
Subject: [PATCH 28/47] v5.0.6

---
 CHANGELOG.md                                         |  3 +++
 lerna.json                                           |  2 +-
 packages/@vue/babel-preset-app/package.json          |  2 +-
 packages/@vue/cli-init/package.json                  |  2 +-
 packages/@vue/cli-overlay/package.json               |  2 +-
 packages/@vue/cli-plugin-babel/package.json          |  6 +++---
 packages/@vue/cli-plugin-e2e-cypress/package.json    |  4 ++--
 packages/@vue/cli-plugin-e2e-nightwatch/package.json |  4 ++--
 .../@vue/cli-plugin-e2e-webdriverio/package.json     |  4 ++--
 packages/@vue/cli-plugin-eslint/package.json         |  4 ++--
 packages/@vue/cli-plugin-pwa/package.json            |  4 ++--
 packages/@vue/cli-plugin-router/package.json         |  6 +++---
 packages/@vue/cli-plugin-typescript/package.json     |  4 ++--
 packages/@vue/cli-plugin-unit-jest/package.json      |  4 ++--
 packages/@vue/cli-plugin-unit-mocha/package.json     |  4 ++--
 packages/@vue/cli-plugin-vuex/package.json           |  4 ++--
 packages/@vue/cli-service/package.json               | 10 +++++-----
 packages/@vue/cli-shared-utils/package.json          |  2 +-
 packages/@vue/cli-test-utils/package.json            |  2 +-
 packages/@vue/cli-ui-addon-webpack/package.json      |  8 ++++----
 packages/@vue/cli-ui-addon-widgets/package.json      |  8 ++++----
 packages/@vue/cli-ui/package.json                    | 12 ++++++------
 packages/@vue/cli/package.json                       | 12 ++++++------
 packages/vue-cli-version-marker/package.json         |  4 ++--
 24 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8146b5e04d..04566008a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+
+
+
 ## 5.0.5 (2022-06-16)
 
 #### :bug: Bug Fix
diff --git a/lerna.json b/lerna.json
index c721043a50..5511716a1e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "5.0.5",
+  "version": "5.0.6",
   "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
index 4231ea08fe..dc13f6c598 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "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
index aab58ba200..0425ac34ec 100644
--- a/packages/@vue/cli-init/package.json
+++ b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "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
index 5bfc22c6a9..116e73e1c3 100644
--- a/packages/@vue/cli-overlay/package.json
+++ b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "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
index 2bda8cc548..1fa4927683 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "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.12.16",
-    "@vue/babel-preset-app": "^5.0.5",
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/babel-preset-app": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.6",
     "babel-loader": "^8.2.2",
     "thread-loader": "^3.0.0",
     "webpack": "^5.54.0"
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
index 3288240799..a2f1f1ab96 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "eslint-plugin-cypress": "^2.11.2"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
index a9f791767f..65f1ab0bbb 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "deepmerge": "^4.2.2",
     "nightwatch": "^2.0.5"
   },
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
index 039278136d..20dc05e484 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.2.1",
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "@wdio/cli": "^7.0.7",
     "@wdio/local-runner": "^7.0.7",
     "@wdio/mocha-framework": "^7.0.7",
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index 14d45f0d10..7b411f789c 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "eslint-webpack-plugin": "^3.1.0",
     "globby": "^11.0.2",
     "webpack": "^5.54.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index 59b039df90..39679ca166 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "html-webpack-plugin": "^5.1.0",
     "webpack": "^5.54.0",
     "workbox-webpack-plugin": "^6.1.0"
diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
index d4ee3117b3..d6b68fc31e 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.5"
+    "@vue/cli-shared-utils": "^5.0.6"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.5"
+    "@vue/cli-test-utils": "^5.0.6"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index 33bd6e5516..19ba31a0cf 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "babel-loader": "^8.2.2",
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "globby": "^11.0.2",
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
index c99198cc85..d0041a14e4 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.16",
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@types/jest": "^27.0.1",
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "babel-jest": "^27.1.0",
     "deepmerge": "^4.2.2",
     "jest": "^27.1.0",
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
index 2cd4ede882..41acf28963 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "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": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "jsdom": "^18.0.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^8.3.0",
diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
index 61bc5c5896..5c19d56e61 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.5"
+    "@vue/cli-test-utils": "^5.0.6"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index 1636f7007d..4b9c48e9a6 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -27,10 +27,10 @@
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
     "@soda/get-current-script": "^1.0.2",
     "@types/minimist": "^1.2.0",
-    "@vue/cli-overlay": "^5.0.5",
-    "@vue/cli-plugin-router": "^5.0.5",
-    "@vue/cli-plugin-vuex": "^5.0.5",
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-overlay": "^5.0.6",
+    "@vue/cli-plugin-router": "^5.0.6",
+    "@vue/cli-plugin-vuex": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.6",
     "@vue/component-compiler-utils": "^3.3.0",
     "@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
     "@vue/web-component-wrapper": "^1.3.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 7f8df527ae..59b0acc2dd 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "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
index 56554c1a33..adc204ae46 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "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
index e925bc2c0b..cd0982d6fa 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.5",
-    "@vue/cli-plugin-eslint": "^5.0.5",
-    "@vue/cli-service": "^5.0.5",
+    "@vue/cli-plugin-babel": "^5.0.6",
+    "@vue/cli-plugin-eslint": "^5.0.6",
+    "@vue/cli-service": "^5.0.6",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
index 036c4bc887..188f72e9ad 100644
--- 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": "5.0.5",
+  "version": "5.0.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.5",
-    "@vue/cli-plugin-eslint": "^5.0.5",
-    "@vue/cli-service": "^5.0.5",
+    "@vue/cli-plugin-babel": "^5.0.6",
+    "@vue/cli-plugin-eslint": "^5.0.6",
+    "@vue/cli-service": "^5.0.6",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 8f2395bcd7..d9879d9a08 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@achrinza/node-ipc": "^9.2.5",
     "@akryum/winattr": "^3.0.0",
-    "@vue/cli-shared-utils": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
     "apollo-server-express": "^2.21.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
@@ -66,10 +66,10 @@
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@graphql-eslint/eslint-plugin": "^3.8.0",
-    "@vue/cli-plugin-babel": "^5.0.5",
-    "@vue/cli-plugin-e2e-cypress": "^5.0.5",
-    "@vue/cli-plugin-eslint": "^5.0.5",
-    "@vue/cli-service": "^5.0.5",
+    "@vue/cli-plugin-babel": "^5.0.6",
+    "@vue/cli-plugin-e2e-cypress": "^5.0.6",
+    "@vue/cli-plugin-eslint": "^5.0.6",
+    "@vue/cli-service": "^5.0.6",
     "@vue/eslint-config-standard": "^6.1.0",
     "@vue/ui": "^0.12.2",
     "ansi_up": "^5.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
index 90ef11eb1a..e7dae45230 100644
--- a/packages/@vue/cli/package.json
+++ b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -27,10 +27,10 @@
   "dependencies": {
     "@types/ejs": "^3.0.6",
     "@types/inquirer": "^8.1.3",
-    "@vue/cli-shared-utils": "^5.0.5",
-    "@vue/cli-ui": "^5.0.5",
-    "@vue/cli-ui-addon-webpack": "^5.0.5",
-    "@vue/cli-ui-addon-widgets": "^5.0.5",
+    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-ui": "^5.0.6",
+    "@vue/cli-ui-addon-webpack": "^5.0.6",
+    "@vue/cli-ui-addon-widgets": "^5.0.6",
     "boxen": "^5.0.0",
     "commander": "^7.1.0",
     "debug": "^4.1.0",
@@ -62,7 +62,7 @@
     "yaml-front-matter": "^4.1.0"
   },
   "devDependencies": {
-    "@vue/cli-service": "^5.0.5",
+    "@vue/cli-service": "^5.0.6",
     "cmd-shim": "^4.1.0"
   },
   "engines": {
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
index 51394d70e6..d2b001f31b 100644
--- a/packages/vue-cli-version-marker/package.json
+++ b/packages/vue-cli-version-marker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
   "main": "package.json",
   "devDependencies": {
-    "@vue/cli": "^5.0.5"
+    "@vue/cli": "^5.0.6"
   }
 }

From bddd64d5b7eba65e1b0f0ec36fd8af2e7d5e3ce6 Mon Sep 17 00:00:00 2001
From: BackRunner <dev@backrunner.top>
Date: Mon, 4 Jul 2022 20:53:02 +0800
Subject: [PATCH 29/47] fix: optimize the judgment on whether HTTPS has been
 set in options (#7202)

---
 packages/@vue/cli-service/lib/commands/serve.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
index cc66855e8b..c4fad51798 100644
--- a/packages/@vue/cli-service/lib/commands/serve.js
+++ b/packages/@vue/cli-service/lib/commands/serve.js
@@ -101,7 +101,11 @@ module.exports = (api, options) => {
     }
 
     // resolve server options
-    const useHttps = args.https || projectDevServerOptions.https || defaults.https
+    const modesUseHttps = ['https', 'http2']
+    const serversUseHttps = ['https', 'spdy']
+    const optionsUseHttps = modesUseHttps.some(modeName => !!projectDevServerOptions[modeName]) ||
+      (typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server))
+    const useHttps = args.https || optionsUseHttps || defaults.https
     const protocol = useHttps ? 'https' : 'http'
     const host = args.host || process.env.HOST || projectDevServerOptions.host || defaults.host
     portfinder.basePort = args.port || process.env.PORT || projectDevServerOptions.port || defaults.port

From 558dea2af693893ca75e372f286d92152bc8d960 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Mon, 4 Jul 2022 21:02:14 +0800
Subject: [PATCH 30/47] fix: support `devServer.server` option, avoid
 deprecation warning

Closes #7024
Fixes #7118

I choose to not merge the PR because I don't want add additional ways
to configure https for dev server (`--http2` command line argument,
`process.env.HTTPS`, etc.)

In the current implementation, `spdy` can only be configured by setting
`{ devServer: server: { type: 'spdy' } }`.
This is a deliberate choice, because SPDY support in Node.js 15+ is
broken anyway. I don't want bother refactoring the old code to
accommodate this broken feature.
---
 packages/@vue/cli-service/lib/commands/serve.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
index c4fad51798..87e6b95cd4 100644
--- a/packages/@vue/cli-service/lib/commands/serve.js
+++ b/packages/@vue/cli-service/lib/commands/serve.js
@@ -199,7 +199,14 @@ module.exports = (api, options) => {
     }, projectDevServerOptions, {
       host,
       port,
-      https: useHttps,
+
+      server: {
+        type: protocol,
+        ...(typeof projectDevServerOptions.server === 'object'
+          ? projectDevServerOptions.server
+          : {})
+      },
+
       proxy: proxySettings,
 
       static: {

From beffe8a50515c48b9ad5085e79d3c2b16ae76825 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Mon, 4 Jul 2022 21:11:32 +0800
Subject: [PATCH 31/47] fix: allow disabling progress plugin via
 `devServer.client.progress`

---
 packages/@vue/cli-service/lib/commands/serve.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
index 87e6b95cd4..b0063cb6cc 100644
--- a/packages/@vue/cli-service/lib/commands/serve.js
+++ b/packages/@vue/cli-service/lib/commands/serve.js
@@ -62,7 +62,11 @@ module.exports = (api, options) => {
           .output
             .globalObject(`(typeof self !== 'undefined' ? self : this)`)
 
-        if (!process.env.VUE_CLI_TEST && options.devServer.progress !== false) {
+        if (
+          !process.env.VUE_CLI_TEST &&
+          (!options.devServer.client ||
+            options.devServer.client.progress !== false)
+        ) {
           // the default progress plugin won't show progress due to infrastructreLogging.level
           webpackConfig
             .plugin('progress')

From 23fa20f2ded3a99042819a9af9e39a0cd474d0a3 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 5 Jul 2022 14:46:52 +0800
Subject: [PATCH 32/47] chore: upgrade to apollo-server-express 3.x (#7210)

---
 packages/@vue/cli-ui/graphql-server.js |   3 +-
 packages/@vue/cli-ui/package.json      |   2 +-
 packages/@vue/cli/lib/ui.js            |   2 +-
 yarn.lock                              | 222 ++++++++++++++++++++++++-
 4 files changed, 221 insertions(+), 8 deletions(-)

diff --git a/packages/@vue/cli-ui/graphql-server.js b/packages/@vue/cli-ui/graphql-server.js
index 1215994fde..38cc173f52 100644
--- a/packages/@vue/cli-ui/graphql-server.js
+++ b/packages/@vue/cli-ui/graphql-server.js
@@ -19,7 +19,7 @@ function autoCall (fn, ...context) {
   return fn
 }
 
-module.exports = (options, cb = null) => {
+module.exports = async (options, cb = null) => {
   // Default options
   options = merge({
     integratedEngine: false
@@ -146,6 +146,7 @@ module.exports = (options, cb = null) => {
 
   // Apollo Server
   const server = new ApolloServer(apolloServerOptions)
+  await server.start()
 
   // Express middleware
   server.applyMiddleware({
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index d9879d9a08..26ad2c8f22 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -37,7 +37,7 @@
     "@achrinza/node-ipc": "^9.2.5",
     "@akryum/winattr": "^3.0.0",
     "@vue/cli-shared-utils": "^5.0.6",
-    "apollo-server-express": "^2.21.0",
+    "apollo-server-express": "^3.9.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
     "express": "^4.17.1",
diff --git a/packages/@vue/cli/lib/ui.js b/packages/@vue/cli/lib/ui.js
index 28c0e5898c..eff69a1f4a 100644
--- a/packages/@vue/cli/lib/ui.js
+++ b/packages/@vue/cli/lib/ui.js
@@ -68,7 +68,7 @@ async function ui (options = {}, context = process.cwd()) {
     }
   }
 
-  const { httpServer } = server(opts, () => {
+  const { httpServer } = await server(opts, () => {
     // Reset for yarn/npm to work correctly
     if (typeof nodeEnv === 'undefined') {
       delete process.env.NODE_ENV
diff --git a/yarn.lock b/yarn.lock
index 5a33d80605..848525ab7e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -202,11 +202,68 @@
     "@types/node" "^10.1.0"
     long "^4.0.0"
 
+"@apollo/utils.dropunuseddefinitions@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929"
+  integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg==
+
+"@apollo/utils.keyvaluecache@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.1.tgz#46f310f859067efe9fa126156c6954f8381080d2"
+  integrity sha512-nLgYLomqjVimEzQ4cdvVQkcryi970NDvcRVPfd0OPeXhBfda38WjBq+WhQFk+czSHrmrSp34YHBxpat0EtiowA==
+  dependencies:
+    "@apollo/utils.logger" "^1.0.0"
+    lru-cache "^7.10.1"
+
+"@apollo/utils.logger@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.0.tgz#6e3460a2250c2ef7c2c3b0be6b5e148a1596f12b"
+  integrity sha512-dx9XrjyisD2pOa+KsB5RcDbWIAdgC91gJfeyLCgy0ctJMjQe7yZK5kdWaWlaOoCeX0z6YI9iYlg7vMPyMpQF3Q==
+
+"@apollo/utils.printwithreducedwhitespace@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz#c466299a4766eef8577a2a64c8f27712e8bd7e30"
+  integrity sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q==
+
+"@apollo/utils.removealiases@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz#75f6d83098af1fcae2d3beb4f515ad4a8452a8c1"
+  integrity sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A==
+
+"@apollo/utils.sortast@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz#93218c7008daf3e2a0725196085a33f5aab5ad07"
+  integrity sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA==
+  dependencies:
+    lodash.sortby "^4.7.0"
+
+"@apollo/utils.stripsensitiveliterals@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz#4920651f36beee8e260e12031a0c5863ad0c7b28"
+  integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w==
+
+"@apollo/utils.usagereporting@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.0.tgz#b81df180f4ca78b91a22cb49105174a7f070db1e"
+  integrity sha512-5PL7hJMkTPmdo3oxPtigRrIyPxDk/ddrUryHPDaezL1lSFExpNzsDd2f1j0XJoHOg350GRd3LyD64caLA2PU1w==
+  dependencies:
+    "@apollo/utils.dropunuseddefinitions" "^1.1.0"
+    "@apollo/utils.printwithreducedwhitespace" "^1.1.0"
+    "@apollo/utils.removealiases" "1.0.0"
+    "@apollo/utils.sortast" "^1.1.0"
+    "@apollo/utils.stripsensitiveliterals" "^1.2.0"
+    apollo-reporting-protobuf "^3.3.1"
+
 "@apollographql/apollo-tools@^0.5.0", "@apollographql/apollo-tools@^0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.2.tgz#01750a655731a198c3634ee819c463254a7c7767"
   integrity sha512-KxZiw0Us3k1d0YkJDhOpVH5rJ+mBfjXcgoRoCcslbgirjgLotKMzOcx4PZ7YTEvvEROmvG7X3Aon41GvMmyGsw==
 
+"@apollographql/apollo-tools@^0.5.3":
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz#cb3998c6cf12e494b90c733f44dd9935e2d8196c"
+  integrity sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw==
+
 "@apollographql/graphql-language-service-interface@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-language-service-interface/-/graphql-language-service-interface-2.0.2.tgz#0e793636eca3d2ee0f818602d52fb5dab9edc0e3"
@@ -242,6 +299,13 @@
   dependencies:
     xss "^1.0.8"
 
+"@apollographql/graphql-playground-html@1.6.29":
+  version "1.6.29"
+  resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453"
+  integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA==
+  dependencies:
+    xss "^1.0.8"
+
 "@apollographql/graphql-upload-8-fork@^8.1.3":
   version "8.1.3"
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz#a0d4e0d5cec8e126d78bd915c264d6b90f5784bc"
@@ -1687,6 +1751,14 @@
     p-limit "3.1.0"
     tslib "~2.3.0"
 
+"@graphql-tools/merge@8.2.14":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.14.tgz#44811e5453f5515d9537bd1b64f0f0cfe6313a45"
+  integrity sha512-od6lTF732nwPX91G79eiJf+dyRBHxCaKe7QL4IYeH4d1k+NYqx/ihYpFJNjDaqxmpHH92Hr+TxsP9SYRK3/QKg==
+  dependencies:
+    "@graphql-tools/utils" "8.6.13"
+    tslib "^2.4.0"
+
 "@graphql-tools/merge@^6.2.12", "@graphql-tools/merge@^6.2.4":
   version "6.2.17"
   resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-6.2.17.tgz#4dedf87d8435a5e1091d7cc8d4f371ed1e029f1f"
@@ -1713,6 +1785,16 @@
     "@graphql-tools/utils" "^6.2.4"
     tslib "~2.0.1"
 
+"@graphql-tools/mock@^8.1.2":
+  version "8.6.12"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.6.12.tgz#b3a336c887b4fcf111d97d1a3c72625c6355272a"
+  integrity sha512-o4plehiIgwqIB3TJDlEx7s6CHucTnrYsv4LqBXfyiXN10E9x0Ab44UxXjePbAd9yJFYEUYp0thqb7WjI3/3cmQ==
+  dependencies:
+    "@graphql-tools/schema" "8.3.14"
+    "@graphql-tools/utils" "8.6.13"
+    fast-json-stable-stringify "^2.1.0"
+    tslib "^2.4.0"
+
 "@graphql-tools/module-loader@^6.2.4":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@graphql-tools/module-loader/-/module-loader-6.2.7.tgz#66ab9468775fac8079ca46ea9896ceea76e4ef69"
@@ -1750,6 +1832,16 @@
     tslib "~2.3.0"
     value-or-promise "1.0.11"
 
+"@graphql-tools/schema@8.3.14", "@graphql-tools/schema@^8.0.0":
+  version "8.3.14"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.14.tgz#0aeab46daab70fb7505c950dc7e83a3da0eeb7ce"
+  integrity sha512-ntA4pKwyyPHFFKcIw17FfqGZAiTNZl0tHieQpPIkN5fPc4oHcXOfaj1vBjtIC/Qn6H7XBBu3l2kMA8FpobdxTQ==
+  dependencies:
+    "@graphql-tools/merge" "8.2.14"
+    "@graphql-tools/utils" "8.6.13"
+    tslib "^2.4.0"
+    value-or-promise "1.0.11"
+
 "@graphql-tools/schema@^6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-6.2.4.tgz#cc4e9f5cab0f4ec48500e666719d99fc5042481d"
@@ -1845,6 +1937,13 @@
   dependencies:
     tslib "~2.3.0"
 
+"@graphql-tools/utils@8.6.13":
+  version "8.6.13"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.6.13.tgz#2b4fb7f9f8a29b25eecd44551fb95974de32f969"
+  integrity sha512-FiVqrQzj4cgz0HcZ3CxUs8NtBGPZFpmsVyIgwmL6YCwIhjJQnT72h8G3/vk5zVfjfesht85YGp0inWWuoCKWzg==
+  dependencies:
+    tslib "^2.4.0"
+
 "@graphql-tools/utils@^6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-6.2.4.tgz#38a2314d2e5e229ad4f78cca44e1199e18d55856"
@@ -3502,7 +3601,7 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/body-parser@*":
+"@types/body-parser@*", "@types/body-parser@1.19.2":
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
   integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
@@ -3575,6 +3674,11 @@
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4"
   integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==
 
+"@types/cors@2.8.12":
+  version "2.8.12"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
+  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
+
 "@types/diff@^5.0.0":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.2.tgz#dd565e0086ccf8bc6522c6ebafd8a3125c91c12b"
@@ -3645,7 +3749,16 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@*", "@types/express@^4.17.11", "@types/express@^4.17.12", "@types/express@^4.17.13":
+"@types/express-serve-static-core@4.17.29":
+  version "4.17.29"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz#2a1795ea8e9e9c91b4a4bbe475034b20c1ec711c"
+  integrity sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@*", "@types/express@4.17.13", "@types/express@^4.17.11", "@types/express@^4.17.12", "@types/express@^4.17.13":
   version "4.17.13"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
   integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
@@ -5285,6 +5398,14 @@ apollo-datasource@^0.9.0:
     apollo-server-caching "^0.7.0"
     apollo-server-env "^3.1.0"
 
+apollo-datasource@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.2.tgz#5711f8b38d4b7b53fb788cb4dbd4a6a526ea74c8"
+  integrity sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg==
+  dependencies:
+    "@apollo/utils.keyvaluecache" "^1.0.1"
+    apollo-server-env "^4.2.1"
+
 apollo-env@^0.10.1:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.10.1.tgz#6476929b924ca4edf2116e5129b90f35bed5753b"
@@ -5411,6 +5532,13 @@ apollo-reporting-protobuf@^0.8.0:
   dependencies:
     "@apollo/protobufjs" "1.2.2"
 
+apollo-reporting-protobuf@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.1.tgz#8c8761f9ac4375fd8490262d6144057cec6ce0b3"
+  integrity sha512-tyvj3Vj71TCh6c8PtdHOLgHHBSJ05DF/A/Po3q8yfHTBkOPcOJZE/GGN/PT/pwKg7HHxKcAeHDw7+xciVvGx0w==
+  dependencies:
+    "@apollo/protobufjs" "1.2.2"
+
 apollo-server-caching@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz#e6d1e68e3bb571cba63a61f60b434fb771c6ff39"
@@ -5449,6 +5577,34 @@ apollo-server-core@^2.25.3:
     subscriptions-transport-ws "^0.9.19"
     uuid "^8.0.0"
 
+apollo-server-core@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.9.0.tgz#44b39e378314cfc0596be7003d3f1f1397c88eea"
+  integrity sha512-WS54C33cTriDaBIcj7ijWv/fgeJICcrQKlP1Cn6pnZp/eumpMraezLeJ3gFWAXprOuR2E3fZe64lNlup0fMu8w==
+  dependencies:
+    "@apollo/utils.keyvaluecache" "^1.0.1"
+    "@apollo/utils.logger" "^1.0.0"
+    "@apollo/utils.usagereporting" "^1.0.0"
+    "@apollographql/apollo-tools" "^0.5.3"
+    "@apollographql/graphql-playground-html" "1.6.29"
+    "@graphql-tools/mock" "^8.1.2"
+    "@graphql-tools/schema" "^8.0.0"
+    "@josephg/resolvable" "^1.0.0"
+    apollo-datasource "^3.3.2"
+    apollo-reporting-protobuf "^3.3.1"
+    apollo-server-env "^4.2.1"
+    apollo-server-errors "^3.3.1"
+    apollo-server-plugin-base "^3.6.1"
+    apollo-server-types "^3.6.1"
+    async-retry "^1.2.1"
+    fast-json-stable-stringify "^2.1.0"
+    graphql-tag "^2.11.0"
+    loglevel "^1.6.8"
+    lru-cache "^6.0.0"
+    sha.js "^2.4.11"
+    uuid "^8.0.0"
+    whatwg-mimetype "^3.0.0"
+
 apollo-server-env@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.1.0.tgz#0733c2ef50aea596cc90cf40a53f6ea2ad402cd0"
@@ -5457,12 +5613,24 @@ apollo-server-env@^3.1.0:
     node-fetch "^2.6.1"
     util.promisify "^1.0.0"
 
+apollo-server-env@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.2.1.tgz#ea5b1944accdbdba311f179e4dfaeca482c20185"
+  integrity sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==
+  dependencies:
+    node-fetch "^2.6.7"
+
 apollo-server-errors@^2.0.2, apollo-server-errors@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz#5d1024117c7496a2979e3e34908b5685fe112b68"
   integrity sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA==
 
-apollo-server-express@^2.14.2, apollo-server-express@^2.21.0:
+apollo-server-errors@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655"
+  integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==
+
+apollo-server-express@^2.14.2:
   version "2.25.3"
   resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.25.3.tgz#33fe0dae27fa71c8710e714efd93451bf2eb105f"
   integrity sha512-tTFYn0oKH2qqLwVj7Ez2+MiKleXACODiGh5IxsB7VuYCPMAi9Yl8iUSlwTjQUvgCWfReZjnf0vFL2k5YhDlrtQ==
@@ -5485,6 +5653,23 @@ apollo-server-express@^2.14.2, apollo-server-express@^2.21.0:
     subscriptions-transport-ws "^0.9.19"
     type-is "^1.6.16"
 
+apollo-server-express@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.9.0.tgz#1ff3b53fe76e4e8be04b8477ea8a3d9586313af1"
+  integrity sha512-scSeHy9iB7W3OiF3uLQEzad9Jm9tEfDF8ACsJb2P+xX69uqg6zizsrQvj3qRhazCO7FKMcMu9zQFR0hy7zKbUA==
+  dependencies:
+    "@types/accepts" "^1.3.5"
+    "@types/body-parser" "1.19.2"
+    "@types/cors" "2.8.12"
+    "@types/express" "4.17.13"
+    "@types/express-serve-static-core" "4.17.29"
+    accepts "^1.3.5"
+    apollo-server-core "^3.9.0"
+    apollo-server-types "^3.6.1"
+    body-parser "^1.19.0"
+    cors "^2.8.5"
+    parseurl "^1.3.3"
+
 apollo-server-plugin-base@^0.13.0:
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.13.0.tgz#3f85751a420d3c4625355b6cb3fbdd2acbe71f13"
@@ -5492,6 +5677,13 @@ apollo-server-plugin-base@^0.13.0:
   dependencies:
     apollo-server-types "^0.9.0"
 
+apollo-server-plugin-base@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.6.1.tgz#33e9f26433d5a8b8ed5d27e9fa88de9ef0c2c704"
+  integrity sha512-bFpxzWO0LTTtSAkGVBeaAtnQXJ5ZCi8eaLN/eMSju8RByifmF3Kr6gAqcOZhOH/geQEt3Y6G8n3bR0eHTGxljQ==
+  dependencies:
+    apollo-server-types "^3.6.1"
+
 apollo-server-types@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.9.0.tgz#ccf550b33b07c48c72f104fbe2876232b404848b"
@@ -5501,6 +5693,16 @@ apollo-server-types@^0.9.0:
     apollo-server-caching "^0.7.0"
     apollo-server-env "^3.1.0"
 
+apollo-server-types@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.6.1.tgz#704e5309bd947306030df01f982e36d1d4753eaa"
+  integrity sha512-XOPlBlRdwP00PrG03OffGGWuzyei+J9t1rAnvyHsSdP0JCgQWigHJfvL1N9Bhgi4UTjl9JadKOJh1znLNlqIFQ==
+  dependencies:
+    "@apollo/utils.keyvaluecache" "^1.0.1"
+    "@apollo/utils.logger" "^1.0.0"
+    apollo-reporting-protobuf "^3.3.1"
+    apollo-server-env "^4.2.1"
+
 apollo-tracing@^0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.15.0.tgz#237fbbbf669aee4370b7e9081b685eabaa8ce84a"
@@ -13954,7 +14156,7 @@ loglevel-plugin-prefix@^0.8.4:
   resolved "https://registry.yarnpkg.com/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz#2fe0e05f1a820317d98d8c123e634c1bd84ff644"
   integrity sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==
 
-loglevel@^1.6.0, loglevel@^1.6.7:
+loglevel@^1.6.0, loglevel@^1.6.7, loglevel@^1.6.8:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114"
   integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==
@@ -14034,6 +14236,11 @@ lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^7.10.1:
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.10.1.tgz#db577f42a94c168f676b638d15da8fb073448cab"
+  integrity sha512-BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A==
+
 lru-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -15740,7 +15947,7 @@ parse5@^5.1.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
   integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
-parseurl@^1.3.2, parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@^1.3.2, parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@@ -19231,6 +19438,11 @@ tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0,
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
+tslib@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
 tslib@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"

From 6f9b6ec47337460714994e7af5102a90313c1590 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 5 Jul 2022 15:54:10 +0800
Subject: [PATCH 33/47] chore: update fallback chromedriver version

It is only served as a fallback version number when local Chrome version
detection failed. Updating the version to the latest may reduce
user frustrations when such rare scenarios are encountered.

Closes #7203
---
 package.json                                  |  2 +-
 .../cli-plugin-e2e-nightwatch/package.json    |  2 +-
 .../cli-plugin-e2e-webdriverio/package.json   |  2 +-
 yarn.lock                                     | 28 +++++++++++--------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 4124c180fd..f74d819dc0 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@vue/eslint-config-typescript": "^9.1.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^27.0.6",
-    "chromedriver": "^98.0.1",
+    "chromedriver": "^103.0.0",
     "debug": "^4.1.0",
     "docsearch.js": "^2.6.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
index 65f1ab0bbb..5629e6c3a4 100644
--- a/packages/@vue/cli-plugin-e2e-nightwatch/package.json
+++ b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
@@ -28,7 +28,7 @@
     "nightwatch": "^2.0.5"
   },
   "devDependencies": {
-    "chromedriver": "^98.0.1",
+    "chromedriver": "^103.0.0",
     "geckodriver": "^3.0.1",
     "selenium-server": "^3.141.59"
   },
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
index 20dc05e484..7b439d549c 100644
--- a/packages/@vue/cli-plugin-e2e-webdriverio/package.json
+++ b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
@@ -56,7 +56,7 @@
     }
   },
   "devDependencies": {
-    "chromedriver": "^98.0.1",
+    "chromedriver": "^103.0.0",
     "geckodriver": "^3.0.1",
     "ts-node": "^9.1.1",
     "wdio-chromedriver-service": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 848525ab7e..df981adf62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6105,12 +6105,13 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
-  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
+axios@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
   dependencies:
-    follow-redirects "^1.14.4"
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
 
 babel-core@7.0.0-bridge.0, babel-core@^7.0.0-bridge.0:
   version "7.0.0-bridge.0"
@@ -6971,13 +6972,13 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-chromedriver@^98.0.1:
-  version "98.0.1"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-98.0.1.tgz#ccb1e36a003b4c6af0b184caa00fca8370d88f2a"
-  integrity sha512-/04KkHHE/K/lfwdPTQr5fxi1dWvM83p8T/IkYbyGK2PBlH7K49Dd71A9jrS+aWgXlZYkuHhbwiy2PA2QqZ5qQw==
+chromedriver@^103.0.0:
+  version "103.0.0"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-103.0.0.tgz#2ef086d62076e3ff6df6cfb84895d11d2c18d9cf"
+  integrity sha512-7BHf6HWt0PeOHCzWO8qlnD13sARzr5AKTtG8Csn+czsuAsajwPxdLNtry5GPh8HYFyl+i0M+yg3bT43AGfgU9w==
   dependencies:
     "@testim/chrome-version" "^1.1.2"
-    axios "^0.24.0"
+    axios "^0.27.2"
     del "^6.0.0"
     extract-zip "^2.0.1"
     https-proxy-agent "^5.0.0"
@@ -10315,11 +10316,16 @@ focus-visible@^5.2.0:
   resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.2.0.tgz#3a9e41fccf587bd25dcc2ef045508284f0a4d6b3"
   integrity sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.4:
+follow-redirects@^1.0.0, follow-redirects@^1.14.0:
   version "1.14.8"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
   integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
+follow-redirects@^1.14.9:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
+  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+
 for-each@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"

From 4a0655f7ac09b64d2b47506e7f21e7923d43262b Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 5 Jul 2022 16:53:09 +0800
Subject: [PATCH 34/47] v5.0.7

---
 CHANGELOG.md                                         | 12 ++++++++++++
 lerna.json                                           |  2 +-
 packages/@vue/babel-preset-app/package.json          |  2 +-
 packages/@vue/cli-init/package.json                  |  2 +-
 packages/@vue/cli-overlay/package.json               |  2 +-
 packages/@vue/cli-plugin-babel/package.json          |  6 +++---
 packages/@vue/cli-plugin-e2e-cypress/package.json    |  4 ++--
 packages/@vue/cli-plugin-e2e-nightwatch/package.json |  4 ++--
 .../@vue/cli-plugin-e2e-webdriverio/package.json     |  4 ++--
 packages/@vue/cli-plugin-eslint/package.json         |  4 ++--
 packages/@vue/cli-plugin-pwa/package.json            |  4 ++--
 packages/@vue/cli-plugin-router/package.json         |  6 +++---
 packages/@vue/cli-plugin-typescript/package.json     |  4 ++--
 packages/@vue/cli-plugin-unit-jest/package.json      |  4 ++--
 packages/@vue/cli-plugin-unit-mocha/package.json     |  4 ++--
 packages/@vue/cli-plugin-vuex/package.json           |  4 ++--
 packages/@vue/cli-service/package.json               | 10 +++++-----
 packages/@vue/cli-shared-utils/package.json          |  2 +-
 packages/@vue/cli-test-utils/package.json            |  2 +-
 packages/@vue/cli-ui-addon-webpack/package.json      |  8 ++++----
 packages/@vue/cli-ui-addon-widgets/package.json      |  8 ++++----
 packages/@vue/cli-ui/package.json                    | 12 ++++++------
 packages/@vue/cli/package.json                       | 12 ++++++------
 packages/vue-cli-version-marker/package.json         |  4 ++--
 24 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04566008a7..2823a4ba9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,16 @@
 
+## 5.0.7 (2022-07-05)
+
+#### :bug: Bug Fix
+* `@vue/cli-service`
+  * [#7202](https://github.com/vuejs/vue-cli/pull/7202) fix: optimize the judgment on whether HTTPS has been set in options ([@backrunner](https://github.com/backrunner))
+
+#### Committers: 2
+- BackRunner ([@backrunner](https://github.com/backrunner))
+- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
+
+
+
 
 
 
diff --git a/lerna.json b/lerna.json
index 5511716a1e..f38c615913 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "5.0.6",
+  "version": "5.0.7",
   "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
index dc13f6c598..24932fe200 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "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
index 0425ac34ec..e12c888865 100644
--- a/packages/@vue/cli-init/package.json
+++ b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "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
index 116e73e1c3..1a8ff5e0e8 100644
--- a/packages/@vue/cli-overlay/package.json
+++ b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "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
index 1fa4927683..94c0e489a2 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "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.12.16",
-    "@vue/babel-preset-app": "^5.0.6",
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/babel-preset-app": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.7",
     "babel-loader": "^8.2.2",
     "thread-loader": "^3.0.0",
     "webpack": "^5.54.0"
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
index a2f1f1ab96..564ba2649a 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "eslint-plugin-cypress": "^2.11.2"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
index 5629e6c3a4..fa7c54a674 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "deepmerge": "^4.2.2",
     "nightwatch": "^2.0.5"
   },
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
index 7b439d549c..53665e27eb 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.2.1",
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "@wdio/cli": "^7.0.7",
     "@wdio/local-runner": "^7.0.7",
     "@wdio/mocha-framework": "^7.0.7",
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index 7b411f789c..b43599eedb 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "eslint-webpack-plugin": "^3.1.0",
     "globby": "^11.0.2",
     "webpack": "^5.54.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index 39679ca166..91363bd98d 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "html-webpack-plugin": "^5.1.0",
     "webpack": "^5.54.0",
     "workbox-webpack-plugin": "^6.1.0"
diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
index d6b68fc31e..d98e77a3fd 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.6"
+    "@vue/cli-shared-utils": "^5.0.7"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.6"
+    "@vue/cli-test-utils": "^5.0.7"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index 19ba31a0cf..eaa78bcf82 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "babel-loader": "^8.2.2",
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "globby": "^11.0.2",
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
index d0041a14e4..f18c6266f7 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.16",
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@types/jest": "^27.0.1",
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "babel-jest": "^27.1.0",
     "deepmerge": "^4.2.2",
     "jest": "^27.1.0",
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
index 41acf28963..31097dc0da 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "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": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "jsdom": "^18.0.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^8.3.0",
diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
index 5c19d56e61..7736f594fc 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.6"
+    "@vue/cli-test-utils": "^5.0.7"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index 4b9c48e9a6..51d35a517e 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -27,10 +27,10 @@
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
     "@soda/get-current-script": "^1.0.2",
     "@types/minimist": "^1.2.0",
-    "@vue/cli-overlay": "^5.0.6",
-    "@vue/cli-plugin-router": "^5.0.6",
-    "@vue/cli-plugin-vuex": "^5.0.6",
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-overlay": "^5.0.7",
+    "@vue/cli-plugin-router": "^5.0.7",
+    "@vue/cli-plugin-vuex": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.7",
     "@vue/component-compiler-utils": "^3.3.0",
     "@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
     "@vue/web-component-wrapper": "^1.3.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index 59b0acc2dd..e0a3965108 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "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
index adc204ae46..7db6ceb244 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "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
index cd0982d6fa..50e5fc63b0 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.6",
-    "@vue/cli-plugin-eslint": "^5.0.6",
-    "@vue/cli-service": "^5.0.6",
+    "@vue/cli-plugin-babel": "^5.0.7",
+    "@vue/cli-plugin-eslint": "^5.0.7",
+    "@vue/cli-service": "^5.0.7",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
index 188f72e9ad..441178b02c 100644
--- 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": "5.0.6",
+  "version": "5.0.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.6",
-    "@vue/cli-plugin-eslint": "^5.0.6",
-    "@vue/cli-service": "^5.0.6",
+    "@vue/cli-plugin-babel": "^5.0.7",
+    "@vue/cli-plugin-eslint": "^5.0.7",
+    "@vue/cli-service": "^5.0.7",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 26ad2c8f22..901b7a5b28 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@achrinza/node-ipc": "^9.2.5",
     "@akryum/winattr": "^3.0.0",
-    "@vue/cli-shared-utils": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
     "apollo-server-express": "^3.9.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
@@ -66,10 +66,10 @@
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@graphql-eslint/eslint-plugin": "^3.8.0",
-    "@vue/cli-plugin-babel": "^5.0.6",
-    "@vue/cli-plugin-e2e-cypress": "^5.0.6",
-    "@vue/cli-plugin-eslint": "^5.0.6",
-    "@vue/cli-service": "^5.0.6",
+    "@vue/cli-plugin-babel": "^5.0.7",
+    "@vue/cli-plugin-e2e-cypress": "^5.0.7",
+    "@vue/cli-plugin-eslint": "^5.0.7",
+    "@vue/cli-service": "^5.0.7",
     "@vue/eslint-config-standard": "^6.1.0",
     "@vue/ui": "^0.12.2",
     "ansi_up": "^5.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
index e7dae45230..6a8bac8710 100644
--- a/packages/@vue/cli/package.json
+++ b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -27,10 +27,10 @@
   "dependencies": {
     "@types/ejs": "^3.0.6",
     "@types/inquirer": "^8.1.3",
-    "@vue/cli-shared-utils": "^5.0.6",
-    "@vue/cli-ui": "^5.0.6",
-    "@vue/cli-ui-addon-webpack": "^5.0.6",
-    "@vue/cli-ui-addon-widgets": "^5.0.6",
+    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-ui": "^5.0.7",
+    "@vue/cli-ui-addon-webpack": "^5.0.7",
+    "@vue/cli-ui-addon-widgets": "^5.0.7",
     "boxen": "^5.0.0",
     "commander": "^7.1.0",
     "debug": "^4.1.0",
@@ -62,7 +62,7 @@
     "yaml-front-matter": "^4.1.0"
   },
   "devDependencies": {
-    "@vue/cli-service": "^5.0.6",
+    "@vue/cli-service": "^5.0.7",
     "cmd-shim": "^4.1.0"
   },
   "engines": {
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
index d2b001f31b..793cd92ba0 100644
--- a/packages/vue-cli-version-marker/package.json
+++ b/packages/vue-cli-version-marker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
   "main": "package.json",
   "devDependencies": {
-    "@vue/cli": "^5.0.6"
+    "@vue/cli": "^5.0.7"
   }
 }

From a5a893e16618acb4801da9c5498ae9597e28d753 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 5 Jul 2022 17:01:42 +0800
Subject: [PATCH 35/47] chore: update changelog

---
 CHANGELOG.md | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2823a4ba9e..2c93aa2e71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,11 @@
 
 ## 5.0.7 (2022-07-05)
 
-#### :bug: Bug Fix
 * `@vue/cli-service`
-  * [#7202](https://github.com/vuejs/vue-cli/pull/7202) fix: optimize the judgment on whether HTTPS has been set in options ([@backrunner](https://github.com/backrunner))
+  * [#7202](https://github.com/vuejs/vue-cli/pull/7202), [[558dea2](https://github.com/vuejs/vue-cli/commit/558dea2)] fix: support `devServer.server` option, avoid deprecation warnings ([@backrunner](https://github.com/backrunner), [@sodatea](https://github.com/sodatea))
+  * [[beffe8a](https://github.com/vuejs/vue-cli/commit/beffe8a)] fix: allow disabling progress plugin via `devServer.client.progress`
+* `@vue/cli-ui`
+  * [#7210](https://github.com/vuejs/vue-cli/pull/7210) chore: upgrade to apollo-server-express 3.x
 
 #### Committers: 2
 - BackRunner ([@backrunner](https://github.com/backrunner))
@@ -11,6 +13,11 @@
 
 
 
+## 5.0.6 (2022-06-16)
+
+Fix compatibility with the upcoming Vue 2.7 (currently in alpha) and Vue Loader 15.10 (currently in beta).
+
+In Vue 2.7, `vue-template-compiler` is no longer a required peer dependency. Rather, there's a new export under the main package as `vue/compiler-sfc`.
 
 
 
@@ -847,6 +854,26 @@ Ngo Wei Lin ([@Creastery](https://twitter.com/creastery)) of STAR Labs ([@starla
 - Yazhe Wang ([@jeneser](https://github.com/jeneser))
 
 
+## 4.5.19 (2022-06-28)
+
+IMPORTANT NOTE: [IE 11 has reached End-of-Life](https://docs.microsoft.com/en-us/lifecycle/faq/internet-explorer-microsoft-edge#what-is-the-lifecycle-policy-for-internet-explorer-). The default `browserslist` query no longer includes IE 11 as a target.
+If your project still has to support IE 11, you **MUST** manually add `IE 11` to the last line of the `.browserslistrc` file in the project (or `browserslist` field in `package.json`)
+
+#### :bug: Bug Fix
+
+* `@vue/babel-preset-app`
+  * [[c7fa1cf](https://github.com/vuejs/vue-cli/commit/c7fa1cf)] fix: always transpile syntaxes introduced in ES2020 or later, so that optional chaining and nullish coalescing syntaxes won't cause errors in webpack 4 and ESLint 6.
+* `@vue/cli-plugin-typescript`
+  * [[5b57792](https://github.com/vuejs/vue-cli/commit/5b57792)] fix: typechecking with Vue 2.7, fixes #7213
+
+
+## 4.5.18 (2022-06-16)
+
+Fix compatibility with the upcoming Vue 2.7 (currently in alpha) and Vue Loader 15.10 (currently in beta).
+
+In Vue 2.7, `vue-template-compiler` is no longer a required peer dependency. Rather, there's a new export under the main package as `vue/compiler-sfc`.
+
+
 ## 4.5.17 (2022-03-23)
 
 #### :bug: Bug Fix

From 07052c4f160c98ea16497b08878119b230f3fe44 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 7 Jul 2022 16:30:18 +0800
Subject: [PATCH 36/47] fix: Vue CLI UI graphql subscription server error

Fixes #7221

`subscriptions-transport-ws` is also deprecated, we need to move to
`graphql-ws` one day.
But better deprecatedthan broken.
---
 packages/@vue/cli-ui/graphql-server.js |  63 +++-
 packages/@vue/cli-ui/package.json      |   3 +-
 yarn.lock                              | 446 ++++++++++++++-----------
 3 files changed, 297 insertions(+), 215 deletions(-)

diff --git a/packages/@vue/cli-ui/graphql-server.js b/packages/@vue/cli-ui/graphql-server.js
index 38cc173f52..0be64b422a 100644
--- a/packages/@vue/cli-ui/graphql-server.js
+++ b/packages/@vue/cli-ui/graphql-server.js
@@ -8,6 +8,10 @@ const { ApolloServer, gql } = require('apollo-server-express')
 const { PubSub } = require('graphql-subscriptions')
 const merge = require('deepmerge')
 
+const { SubscriptionServer } = require('subscriptions-transport-ws')
+const { makeExecutableSchema } = require('@graphql-tools/schema')
+const { execute, subscribe } = require('graphql')
+
 function defaultValue (provided, value) {
   return provided == null ? value : provided
 }
@@ -27,6 +31,7 @@ module.exports = async (options, cb = null) => {
 
   // Express app
   const app = express()
+  const httpServer = http.createServer(app)
 
   // Customize those files
   let typeDefs = load(options.paths.typeDefs)
@@ -64,12 +69,16 @@ module.exports = async (options, cb = null) => {
 
   typeDefs = processSchema(typeDefs)
 
+  // eslint-disable-next-line prefer-const
+  let subscriptionServer
+
   let apolloServerOptions = {
     typeDefs,
     resolvers,
     schemaDirectives,
     dataSources,
     tracing: true,
+    cache: 'bounded',
     cacheControl: true,
     engine: !options.integratedEngine,
     // Resolvers context from POST
@@ -89,23 +98,15 @@ module.exports = async (options, cb = null) => {
       return contextData
     },
     // Resolvers context from WebSocket
-    subscriptions: {
-      path: options.subscriptionsPath,
-      onConnect: async (connection, websocket) => {
-        let contextData = {}
-        try {
-          contextData = await autoCall(context, {
-            connection,
-            websocket
-          })
-          contextData = Object.assign({}, contextData, { pubsub })
-        } catch (e) {
-          console.error(e)
-          throw e
+    plugins: [{
+      async serverWillStart () {
+        return {
+          async drainServer () {
+            subscriptionServer.close()
+          }
         }
-        return contextData
       }
-    }
+    }]
   }
 
   // Automatic mocking
@@ -146,6 +147,36 @@ module.exports = async (options, cb = null) => {
 
   // Apollo Server
   const server = new ApolloServer(apolloServerOptions)
+
+  const schema = makeExecutableSchema({
+    typeDefs: apolloServerOptions.typeDefs,
+    resolvers: apolloServerOptions.resolvers,
+    schemaDirectives: apolloServerOptions.schemaDirectives
+  })
+
+  subscriptionServer = SubscriptionServer.create({
+    schema,
+    execute,
+    subscribe,
+    onConnect: async (connection, websocket) => {
+      let contextData = {}
+      try {
+        contextData = await autoCall(context, {
+          connection,
+          websocket
+        })
+        contextData = Object.assign({}, contextData, { pubsub })
+      } catch (e) {
+        console.error(e)
+        throw e
+      }
+      return contextData
+    }
+  }, {
+    server: httpServer,
+    path: options.subscriptionsPath
+  })
+
   await server.start()
 
   // Express middleware
@@ -160,9 +191,7 @@ module.exports = async (options, cb = null) => {
   })
 
   // Start server
-  const httpServer = http.createServer(app)
   httpServer.setTimeout(options.timeout)
-  server.installSubscriptionHandlers(httpServer)
 
   httpServer.listen({
     host: options.host || 'localhost',
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 901b7a5b28..8c0497c86e 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -36,6 +36,7 @@
   "dependencies": {
     "@achrinza/node-ipc": "^9.2.5",
     "@akryum/winattr": "^3.0.0",
+    "@graphql-tools/schema": "^8.5.0",
     "@vue/cli-shared-utils": "^5.0.7",
     "apollo-server-express": "^3.9.0",
     "clone": "^2.1.1",
@@ -60,6 +61,7 @@
     "prismjs": "^1.23.0",
     "rss-parser": "^3.11.0",
     "shortid": "^2.2.15",
+    "subscriptions-transport-ws": "^0.11.0",
     "typescript": "~4.5.5"
   },
   "devDependencies": {
@@ -91,7 +93,6 @@
     "start-server-and-test": "^1.12.0",
     "stylus": "^0.55.0",
     "stylus-loader": "^6.1.0",
-    "subscriptions-transport-ws": "^0.9.18",
     "validate-npm-package-name": "^3.0.0",
     "vue": "^2.6.14",
     "vue-apollo": "^3.0.7",
diff --git a/yarn.lock b/yarn.lock
index df981adf62..9b2a3da701 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -333,7 +333,7 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@7.16.7", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
@@ -1517,18 +1517,20 @@
   integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
 
 "@graphql-eslint/eslint-plugin@^3.8.0":
-  version "3.8.0"
-  resolved "https://registry.npmmirror.com/@graphql-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz#ff33a056a5a21292d9f5904f8d8588f3f11a82c8"
-  integrity sha512-ZEoH+bkNkx76tMP6fTaXQU3T3ChQH85bghZOou+4D0ID7RpSj9069bhFY+rc49TCp3zZHBuW/FvG1ZDKQUx8yw==
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/@graphql-eslint/eslint-plugin/-/eslint-plugin-3.10.4.tgz#fcc3b54ef1d6d38e89daf848d93be2d5359fef98"
+  integrity sha512-+Vmi1E5uSWOgtylosHS3HYWHF+x0GMgaMOHmSfOflTE51VXnLM2tvGKMd3lpyngCEZG1wjvqdlB5rn2iwhhzqA==
   dependencies:
-    "@babel/code-frame" "7.16.7"
-    "@graphql-tools/code-file-loader" "7.2.3"
-    "@graphql-tools/graphql-tag-pluck" "7.1.5"
-    "@graphql-tools/utils" "8.6.1"
-    chalk "4.1.2"
-    graphql-config "4.1.0"
-    graphql-depth-limit "1.1.0"
-    lodash.lowercase "4.3.0"
+    "@babel/code-frame" "^7.16.7"
+    "@graphql-tools/code-file-loader" "^7.2.14"
+    "@graphql-tools/graphql-tag-pluck" "^7.2.6"
+    "@graphql-tools/utils" "^8.6.9"
+    chalk "^4.1.2"
+    debug "^4.3.4"
+    fast-glob "^3.2.11"
+    graphql-config "^4.3.0"
+    graphql-depth-limit "^1.1.0"
+    lodash.lowercase "^4.3.0"
 
 "@graphql-tools/batch-delegate@^6.2.4", "@graphql-tools/batch-delegate@^6.2.6":
   version "6.2.6"
@@ -1539,6 +1541,16 @@
     dataloader "2.0.0"
     tslib "~2.0.1"
 
+"@graphql-tools/batch-execute@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.0.tgz#2767a9abf4e2712871a69360a27ef13ada1c019e"
+  integrity sha512-S9/76X4uYIbVlJyRzXhCBbTJvVD0VvaWNqGiKgkITxlq4aBsTOHVuE84OSi3E1QKP3PTiJYrgMIn220iFOkyQw==
+  dependencies:
+    "@graphql-tools/utils" "8.8.0"
+    dataloader "2.1.0"
+    tslib "^2.4.0"
+    value-or-promise "1.0.11"
+
 "@graphql-tools/batch-execute@^7.1.2":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-7.1.2.tgz#35ba09a1e0f80f34f1ce111d23c40f039d4403a0"
@@ -1549,27 +1561,6 @@
     tslib "~2.2.0"
     value-or-promise "1.0.6"
 
-"@graphql-tools/batch-execute@^8.3.1":
-  version "8.3.1"
-  resolved "https://registry.npmmirror.com/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz#0b74c54db5ac1c5b9a273baefc034c2343ebbb74"
-  integrity sha512-63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA==
-  dependencies:
-    "@graphql-tools/utils" "^8.5.1"
-    dataloader "2.0.0"
-    tslib "~2.3.0"
-    value-or-promise "1.0.11"
-
-"@graphql-tools/code-file-loader@7.2.3":
-  version "7.2.3"
-  resolved "https://registry.npmmirror.com/@graphql-tools/code-file-loader/-/code-file-loader-7.2.3.tgz#b53e8809528da07911423c3a511e5fccf9121a12"
-  integrity sha512-aNVG3/VG5cUpS389rpCum+z7RY98qvPwOzd+J4LVr+f5hWQbDREnSFM+5RVTDfULujrsi7edKaGxGKp68pGmAA==
-  dependencies:
-    "@graphql-tools/graphql-tag-pluck" "^7.1.3"
-    "@graphql-tools/utils" "^8.5.1"
-    globby "^11.0.3"
-    tslib "~2.3.0"
-    unixify "^1.0.0"
-
 "@graphql-tools/code-file-loader@^6.2.4":
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-6.3.1.tgz#42dfd4db5b968acdb453382f172ec684fa0c34ed"
@@ -1579,6 +1570,29 @@
     "@graphql-tools/utils" "^7.0.0"
     tslib "~2.1.0"
 
+"@graphql-tools/code-file-loader@^7.2.14":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-7.3.0.tgz#4a9cc213bb726ab049aad806a51707689bd7340a"
+  integrity sha512-mzevVv5JYyyRIbE6R0mxIniCAZWUGdoNYX97HdVgqChLOl2XRf9I8MarVPewHLmjLTZuWrdQx4ta4sPTLk4tUQ==
+  dependencies:
+    "@graphql-tools/graphql-tag-pluck" "7.3.0"
+    "@graphql-tools/utils" "8.8.0"
+    globby "^11.0.3"
+    tslib "^2.4.0"
+    unixify "^1.0.0"
+
+"@graphql-tools/delegate@8.8.0":
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.8.0.tgz#acd3e48e4ca82aace92cc3d920b5c727c35eaf7b"
+  integrity sha512-dbhfOI8rQXPcowXrbwHLOBY9oGi7qxtlrXF4RuRXmjqGTs2AgogdOE3Ep1+6wFD7qYTuFmHXZ8Cl0PmhoZUgrg==
+  dependencies:
+    "@graphql-tools/batch-execute" "8.5.0"
+    "@graphql-tools/schema" "8.5.0"
+    "@graphql-tools/utils" "8.8.0"
+    dataloader "2.1.0"
+    tslib "~2.4.0"
+    value-or-promise "1.0.11"
+
 "@graphql-tools/delegate@^6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-6.2.4.tgz#db553b63eb9512d5eb5bbfdfcd8cb1e2b534699c"
@@ -1604,18 +1618,6 @@
     tslib "~2.2.0"
     value-or-promise "1.0.6"
 
-"@graphql-tools/delegate@^8.4.1", "@graphql-tools/delegate@^8.4.2":
-  version "8.4.3"
-  resolved "https://registry.npmmirror.com/@graphql-tools/delegate/-/delegate-8.4.3.tgz#ad73ed7cc3b4cad9242c6d4835a5ae0b640f7164"
-  integrity sha512-hKTJdJXJnKL0+2vpU+Kt7OHQTIXZ9mBmNBwHsYiG5WNArz/vNI7910r6TC2XMf/e7zhyyK+mXxMDBmDQkkJagA==
-  dependencies:
-    "@graphql-tools/batch-execute" "^8.3.1"
-    "@graphql-tools/schema" "^8.3.1"
-    "@graphql-tools/utils" "^8.5.4"
-    dataloader "2.0.0"
-    tslib "~2.3.0"
-    value-or-promise "1.0.11"
-
 "@graphql-tools/git-loader@^6.2.4":
   version "6.2.6"
   resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-6.2.6.tgz#c2226f4b8f51f1c05c9ab2649ba32d49c68cd077"
@@ -1644,27 +1646,27 @@
     "@graphql-tools/utils" "^7.0.0"
     tslib "~2.1.0"
 
-"@graphql-tools/graphql-file-loader@^7.3.2":
-  version "7.3.3"
-  resolved "https://registry.npmmirror.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.3.tgz#7cee2f84f08dc13fa756820b510248b857583d36"
-  integrity sha512-6kUJZiNpYKVhum9E5wfl5PyLLupEDYdH7c8l6oMrk6c7EPEVs6iSUyB7yQoWrtJccJLULBW2CRQ5IHp5JYK0mA==
+"@graphql-tools/graphql-file-loader@^7.3.7":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.4.0.tgz#c06e36248dd6a2025de65a1cfce03222ad0e74c2"
+  integrity sha512-r1lslE5GlWO/nbDX82enHjvva7qQiZEIPm+LC9JSgKaYuVoYHuIuIAVYkpBHeaRK1Kbh/86pEhL7PuBZ/cIWSA==
   dependencies:
-    "@graphql-tools/import" "^6.5.7"
-    "@graphql-tools/utils" "^8.5.1"
+    "@graphql-tools/import" "6.7.0"
+    "@graphql-tools/utils" "8.8.0"
     globby "^11.0.3"
-    tslib "~2.3.0"
+    tslib "^2.4.0"
     unixify "^1.0.0"
 
-"@graphql-tools/graphql-tag-pluck@7.1.5", "@graphql-tools/graphql-tag-pluck@^7.1.3":
-  version "7.1.5"
-  resolved "https://registry.npmmirror.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.1.5.tgz#229ed40f38430cdea750f112cbfad89fbc29129c"
-  integrity sha512-NKbFcjlg7cbK+scLXc6eVxXIhX4k8QL6lZ/y5Ju7yrpIN18k2vA78dI6W3Qb5qdftxbDNuC+kDmScZfzzxVPjQ==
+"@graphql-tools/graphql-tag-pluck@7.3.0", "@graphql-tools/graphql-tag-pluck@^7.2.6":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.3.0.tgz#e83b568151b2cd0f8678489bb927e2bf9cf24af9"
+  integrity sha512-GxtgGTSOiQuFc/yNWXsPJ5QEgGlH+4qBf1paqUJtjFpm89dZA+VkdjoIDiFg8fyXGivjZ37+XAUbuu6UlsT+6Q==
   dependencies:
     "@babel/parser" "^7.16.8"
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
-    "@graphql-tools/utils" "^8.5.1"
-    tslib "~2.3.0"
+    "@graphql-tools/utils" "8.8.0"
+    tslib "^2.4.0"
 
 "@graphql-tools/graphql-tag-pluck@^6.2.4", "@graphql-tools/graphql-tag-pluck@^6.2.6", "@graphql-tools/graphql-tag-pluck@^6.5.1":
   version "6.5.1"
@@ -1677,7 +1679,16 @@
     "@graphql-tools/utils" "^7.0.0"
     tslib "~2.1.0"
 
-"@graphql-tools/import@^6.2.4", "@graphql-tools/import@^6.2.6", "@graphql-tools/import@^6.5.7":
+"@graphql-tools/import@6.7.0":
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-6.7.0.tgz#5174c46b73f5931e68b9715fec9178bc924d2bba"
+  integrity sha512-u9JL4fClKKyBTQpgb4QFacYUwgBCs4lW1NaHX0hD2zBdahIYidokBY0QkOqOCEAnWeFqpEmAjB62ulLiAJWc2g==
+  dependencies:
+    "@graphql-tools/utils" "8.8.0"
+    resolve-from "5.0.0"
+    tslib "^2.4.0"
+
+"@graphql-tools/import@^6.2.4", "@graphql-tools/import@^6.2.6":
   version "6.6.5"
   resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-6.6.5.tgz#e1ec593960288ceda7d5c56c0073c702b1bdcfa0"
   integrity sha512-w0/cYuhrr2apn+iGoTToCqt65x2NN2iHQyqRNk/Zw1NJ+e8/C3eKVw0jmW4pYQvSocuPxL4UCSI56SdKO7m3+Q==
@@ -1694,14 +1705,14 @@
     "@graphql-tools/utils" "^7.0.0"
     tslib "~2.0.1"
 
-"@graphql-tools/json-file-loader@^7.3.2":
-  version "7.3.3"
-  resolved "https://registry.npmmirror.com/@graphql-tools/json-file-loader/-/json-file-loader-7.3.3.tgz#45cfde77b9dc4ab6c21575305ae537d2814d237f"
-  integrity sha512-CN2Qk9rt+Gepa3rb3X/mpxYA5MIYLwZBPj2Njw6lbZ6AaxG+O1ArDCL5ACoiWiBimn1FCOM778uhRM9znd0b3Q==
+"@graphql-tools/json-file-loader@^7.3.7":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-7.4.0.tgz#c25059ebce34db6190a11580e2bc7c66df68a7b9"
+  integrity sha512-6oR7Ulc5iZc5SM3g1Yj91DqSu3TNbfGK/0baE8KyUlvq6KiIuWFWDy13RGnNesftt4RSWvZqGzu/kzXcBHtt+A==
   dependencies:
-    "@graphql-tools/utils" "^8.5.1"
+    "@graphql-tools/utils" "8.8.0"
     globby "^11.0.3"
-    tslib "~2.3.0"
+    tslib "^2.4.0"
     unixify "^1.0.0"
 
 "@graphql-tools/links@^6.2.4":
@@ -1741,15 +1752,15 @@
     unixify "1.0.0"
     valid-url "1.0.9"
 
-"@graphql-tools/load@^7.4.1":
-  version "7.5.1"
-  resolved "https://registry.npmmirror.com/@graphql-tools/load/-/load-7.5.1.tgz#8c7f846d2185ddc1d44fdfbf1ed9cb678f69e40b"
-  integrity sha512-j9XcLYZPZdl/TzzqA83qveJmwcCxgGizt5L1+C1/Z68brTEmQHLdQCOR3Ma3ewESJt6DU05kSTu2raKaunkjRg==
+"@graphql-tools/load@^7.5.5":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.7.0.tgz#668f70f09bc1c34b87c3267853cf73451897a22e"
+  integrity sha512-6KX7Z8BtlFScDr0pIac92QZWlPGbHcpNMesX/6Y3Vsp3FeFnAYfzZldXZQcJoW7Yl+gHdFwYVq683wSH64kNrw==
   dependencies:
-    "@graphql-tools/schema" "8.3.1"
-    "@graphql-tools/utils" "^8.6.0"
+    "@graphql-tools/schema" "8.5.0"
+    "@graphql-tools/utils" "8.8.0"
     p-limit "3.1.0"
-    tslib "~2.3.0"
+    tslib "^2.4.0"
 
 "@graphql-tools/merge@8.2.14":
   version "8.2.14"
@@ -1759,6 +1770,14 @@
     "@graphql-tools/utils" "8.6.13"
     tslib "^2.4.0"
 
+"@graphql-tools/merge@8.3.0", "@graphql-tools/merge@^8.2.6":
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.0.tgz#d3a8ba10942f8598788c3e03f97cc1d0c0b055f8"
+  integrity sha512-xRa7RAQok/0DD2YnjuqikMrr7dUAxTpdGtZ7BkvUUGhYs3B3p7reCAfvOVr1DJAqVToP7hdlMk+S5+Ylk+AaqA==
+  dependencies:
+    "@graphql-tools/utils" "8.8.0"
+    tslib "^2.4.0"
+
 "@graphql-tools/merge@^6.2.12", "@graphql-tools/merge@^6.2.4":
   version "6.2.17"
   resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-6.2.17.tgz#4dedf87d8435a5e1091d7cc8d4f371ed1e029f1f"
@@ -1822,16 +1841,6 @@
     micromatch "^4.0.4"
     tslib "~2.3.0"
 
-"@graphql-tools/schema@8.3.1", "@graphql-tools/schema@^8.0.2", "@graphql-tools/schema@^8.3.1":
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.1.tgz#1ee9da494d2da457643b3c93502b94c3c4b68c74"
-  integrity sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ==
-  dependencies:
-    "@graphql-tools/merge" "^8.2.1"
-    "@graphql-tools/utils" "^8.5.1"
-    tslib "~2.3.0"
-    value-or-promise "1.0.11"
-
 "@graphql-tools/schema@8.3.14", "@graphql-tools/schema@^8.0.0":
   version "8.3.14"
   resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.14.tgz#0aeab46daab70fb7505c950dc7e83a3da0eeb7ce"
@@ -1842,6 +1851,16 @@
     tslib "^2.4.0"
     value-or-promise "1.0.11"
 
+"@graphql-tools/schema@8.5.0", "@graphql-tools/schema@^8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.5.0.tgz#0332b3a2e674d16e9bf8a58dfd47432449ce2368"
+  integrity sha512-VeFtKjM3SA9/hCJJfr95aEdC3G0xIKM9z0Qdz4i+eC1g2fdZYnfWFt2ucW4IME+2TDd0enHlKzaV0qk2SLVUww==
+  dependencies:
+    "@graphql-tools/merge" "8.3.0"
+    "@graphql-tools/utils" "8.8.0"
+    tslib "^2.4.0"
+    value-or-promise "1.0.11"
+
 "@graphql-tools/schema@^6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-6.2.4.tgz#cc4e9f5cab0f4ec48500e666719d99fc5042481d"
@@ -1859,6 +1878,16 @@
     tslib "~2.2.0"
     value-or-promise "1.0.6"
 
+"@graphql-tools/schema@^8.0.2":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.1.tgz#1ee9da494d2da457643b3c93502b94c3c4b68c74"
+  integrity sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ==
+  dependencies:
+    "@graphql-tools/merge" "^8.2.1"
+    "@graphql-tools/utils" "^8.5.1"
+    tslib "~2.3.0"
+    value-or-promise "1.0.11"
+
 "@graphql-tools/stitch@^6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@graphql-tools/stitch/-/stitch-6.2.4.tgz#acfa6a577a33c0f02e4940ffff04753b23b87fd6"
@@ -1898,28 +1927,24 @@
     valid-url "1.0.9"
     ws "7.4.5"
 
-"@graphql-tools/url-loader@^7.4.2":
-  version "7.7.1"
-  resolved "https://registry.npmmirror.com/@graphql-tools/url-loader/-/url-loader-7.7.1.tgz#2faabdc1d2c47edc8edc9cc938eee2767189869f"
-  integrity sha512-K/5amdeHtKYI976HVd/AXdSNvLL7vx5QVjMlwN0OHeYyxSgC+UOH+KkS7cshYgL13SekGu0Mxbg9ABfgQ34ECA==
+"@graphql-tools/url-loader@^7.9.7":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.12.1.tgz#931a65da4faced1a71ddc5af638b87140ff3dfb6"
+  integrity sha512-Fd3ZZLEEr9GGFHEbdrcaMHFQu01BLpFnNDBkISupvjokd497O5Uh0xZvsZGC6mxVt0WWQWpgaK2ef+oLuOdLqQ==
   dependencies:
-    "@graphql-tools/delegate" "^8.4.1"
-    "@graphql-tools/utils" "^8.5.1"
-    "@graphql-tools/wrap" "^8.3.1"
+    "@graphql-tools/delegate" "8.8.0"
+    "@graphql-tools/utils" "8.8.0"
+    "@graphql-tools/wrap" "8.5.0"
     "@n1ru4l/graphql-live-query" "^0.9.0"
-    "@types/websocket" "^1.0.4"
     "@types/ws" "^8.0.0"
-    cross-undici-fetch "^0.1.19"
-    dset "^3.1.0"
+    cross-undici-fetch "^0.4.11"
+    dset "^3.1.2"
     extract-files "^11.0.0"
-    graphql-sse "^1.0.1"
     graphql-ws "^5.4.1"
-    isomorphic-ws "^4.0.1"
+    isomorphic-ws "^5.0.0"
     meros "^1.1.4"
-    subscriptions-transport-ws "^0.11.0"
-    sync-fetch "^0.3.1"
-    tslib "^2.3.0"
-    valid-url "^1.0.9"
+    sync-fetch "^0.4.0"
+    tslib "^2.4.0"
     value-or-promise "^1.0.11"
     ws "^8.3.0"
 
@@ -1930,7 +1955,7 @@
   dependencies:
     tslib "~2.3.0"
 
-"@graphql-tools/utils@8.6.1", "@graphql-tools/utils@^8.5.1", "@graphql-tools/utils@^8.5.3", "@graphql-tools/utils@^8.5.4", "@graphql-tools/utils@^8.6.0":
+"@graphql-tools/utils@8.6.1", "@graphql-tools/utils@^8.5.1":
   version "8.6.1"
   resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.6.1.tgz#52c7eb108f2ca2fd01bdba8eef85077ead1bf882"
   integrity sha512-uxcfHCocp4ENoIiovPxUWZEHOnbXqj3ekWc0rm7fUhW93a1xheARNHcNKhwMTR+UKXVJbTFQdGI1Rl5XdyvDBg==
@@ -1944,6 +1969,13 @@
   dependencies:
     tslib "^2.4.0"
 
+"@graphql-tools/utils@8.8.0", "@graphql-tools/utils@^8.6.5", "@graphql-tools/utils@^8.6.9":
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.8.0.tgz#8332ff80a1da9204ccf514750dd6f5c5cccf17dc"
+  integrity sha512-KJrtx05uSM/cPYFdTnGAS1doL5bftJLAiFCDMZ8Vkifztz3BFn3gpFiy/o4wDtM8s39G46mxmt2Km/RmeltfGw==
+  dependencies:
+    tslib "^2.4.0"
+
 "@graphql-tools/utils@^6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-6.2.4.tgz#38a2314d2e5e229ad4f78cca44e1199e18d55856"
@@ -1962,6 +1994,17 @@
     camel-case "4.1.2"
     tslib "~2.2.0"
 
+"@graphql-tools/wrap@8.5.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-8.5.0.tgz#ce1b0d775e1fc3a17404df566f4d2196d31c6e20"
+  integrity sha512-I+x9dBNzC135WWPi04ejqurR/zDmhfeGbCftCaYKF4CvgWd+ZaJx4Uc74n1SBegQtrj+KDrOS4HgKwf9vAVR7A==
+  dependencies:
+    "@graphql-tools/delegate" "8.8.0"
+    "@graphql-tools/schema" "8.5.0"
+    "@graphql-tools/utils" "8.8.0"
+    tslib "^2.4.0"
+    value-or-promise "1.0.11"
+
 "@graphql-tools/wrap@^6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-6.2.4.tgz#2709817da6e469753735a9fe038c9e99736b2c57"
@@ -1984,17 +2027,6 @@
     tslib "~2.2.0"
     value-or-promise "1.0.6"
 
-"@graphql-tools/wrap@^8.3.1":
-  version "8.3.3"
-  resolved "https://registry.npmmirror.com/@graphql-tools/wrap/-/wrap-8.3.3.tgz#014aa04a6cf671ffe477516255d1134777da056a"
-  integrity sha512-TpXN1S4Cv+oMA1Zsg9Nu4N9yrFxLuJkX+CTtSRrrdfETGHIxqfyDkm5slPDCckxP+RILA00g8ny2jzsYyNvX1w==
-  dependencies:
-    "@graphql-tools/delegate" "^8.4.2"
-    "@graphql-tools/schema" "^8.3.1"
-    "@graphql-tools/utils" "^8.5.3"
-    tslib "~2.3.0"
-    value-or-promise "1.0.11"
-
 "@graphql-typed-document-node/core@^3.0.0":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052"
@@ -2922,7 +2954,7 @@
 
 "@n1ru4l/graphql-live-query@^0.9.0":
   version "0.9.0"
-  resolved "https://registry.npmmirror.com/@n1ru4l/graphql-live-query/-/graphql-live-query-0.9.0.tgz#defaebdd31f625bee49e6745934f36312532b2bc"
+  resolved "https://registry.yarnpkg.com/@n1ru4l/graphql-live-query/-/graphql-live-query-0.9.0.tgz#defaebdd31f625bee49e6745934f36312532b2bc"
   integrity sha512-BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==
 
 "@nightwatch/chai@5.0.1":
@@ -4145,13 +4177,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/websocket@^1.0.4":
-  version "1.0.5"
-  resolved "https://registry.npmmirror.com/@types/websocket/-/websocket-1.0.5.tgz#3fb80ed8e07f88e51961211cd3682a3a4a81569c"
-  integrity sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/which@^1.3.2":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/which/-/which-1.3.2.tgz#9c246fc0c93ded311c8512df2891fb41f6227fdf"
@@ -6518,7 +6543,7 @@ buffer-json@^2.0.0:
   resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23"
   integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==
 
-buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0, buffer@^5.7.0:
+buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0, buffer@^5.7.0, buffer@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -6543,6 +6568,13 @@ busboy@^0.3.1:
   dependencies:
     dicer "0.3.0"
 
+busboy@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
+  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
+  dependencies:
+    streamsearch "^1.1.0"
+
 byline@5.0.0, byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
@@ -6842,14 +6874,6 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -6869,6 +6893,14 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 change-case@^4.0.0, change-case@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz#fedfc5f136045e2398c0410ee441f95704641e12"
@@ -7896,16 +7928,17 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-cross-undici-fetch@^0.1.19:
-  version "0.1.23"
-  resolved "https://registry.npmmirror.com/cross-undici-fetch/-/cross-undici-fetch-0.1.23.tgz#254c5f7d11f0e462a57187db94383ee6ca9f1525"
-  integrity sha512-PxSFKt7owZrL/WWowlOXVyD86HcUXePQ0853p/6DGktaONK10hVixV9RmqPaEsdrCTJkeBDlnXFT2tp6db0K0g==
+cross-undici-fetch@^0.4.11:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/cross-undici-fetch/-/cross-undici-fetch-0.4.11.tgz#bef38dc729a01db6e07c84fee6de1089b5d3d0a4"
+  integrity sha512-pRp+EWewyOPYIeUvwOqCIqylCFWqlBwwr6nlZB38v3PhWxS1RYfSgHUJApYTT8jm71SbL5p4qg5kUQv6ZyS24A==
   dependencies:
     abort-controller "^3.0.0"
+    busboy "^1.6.0"
     form-data-encoder "^1.7.1"
     formdata-node "^4.3.1"
     node-fetch "^2.6.7"
-    undici "^4.9.3"
+    undici "5.5.1"
     web-streams-polyfill "^3.2.0"
 
 crypto-random-string@^2.0.0:
@@ -8192,6 +8225,11 @@ dataloader@2.0.0:
   resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.0.0.tgz#41eaf123db115987e21ca93c005cd7753c55fe6f"
   integrity sha512-YzhyDAwA4TaQIhM5go+vCLmU0UikghC/t9DTQYZR2M/UvZ1MdOhPezSDZcjj9uqQJOMqjLcpWtyW2iNINdlatQ==
 
+dataloader@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7"
+  integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ==
+
 date-fns@^1.27.2, date-fns@^1.29.0:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
@@ -8259,6 +8297,13 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -8831,10 +8876,10 @@ download@^8.0.0:
     p-event "^2.1.0"
     pify "^4.0.1"
 
-dset@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.npmmirror.com/dset/-/dset-3.1.1.tgz#07de5af7a8d03eab337ad1a8ba77fe17bba61a8c"
-  integrity sha512-hYf+jZNNqJBD2GiMYb+5mqOIX4R4RRHXU3qWMWYN+rqcR2/YpRL2bUHr8C8fU+5DNvqYjJ8YvMGSLuVPWU1cNg==
+dset@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.2.tgz#89c436ca6450398396dc6538ea00abc0c54cd45a"
+  integrity sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==
 
 duplexer3@^0.1.4:
   version "0.1.4"
@@ -9930,7 +9975,7 @@ extract-files@9.0.0, extract-files@^9.0.0:
 
 extract-files@^11.0.0:
   version "11.0.0"
-  resolved "https://registry.npmmirror.com/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a"
+  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a"
   integrity sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==
 
 extract-files@^8.0.0:
@@ -10001,7 +10046,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.7, fast-glob@^3.2.9:
+fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9:
   version "3.2.11"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
   integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
@@ -10368,9 +10413,9 @@ fork-ts-checker-webpack-plugin@^6.4.0:
     tapable "^1.0.0"
 
 form-data-encoder@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.npmmirror.com/form-data-encoder/-/form-data-encoder-1.7.1.tgz#ac80660e4f87ee0d3d3c3638b7da8278ddb8ec96"
-  integrity sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg==
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz#1f1ae3dccf58ed4690b86d87e4f57c654fbab040"
+  integrity sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==
 
 form-data@3.0.0:
   version "3.0.0"
@@ -10409,9 +10454,9 @@ form-data@~2.3.2:
     mime-types "^2.1.12"
 
 formdata-node@^4.3.1:
-  version "4.3.2"
-  resolved "https://registry.npmmirror.com/formdata-node/-/formdata-node-4.3.2.tgz#0262e94931e36db7239c2b08bdb6aaf18ec47d21"
-  integrity sha512-k7lYJyzDOSL6h917favP8j1L0/wNyylzU+x+1w4p5haGVHNlP58dbpdJhiCUsDbWsa9HwEtLp89obQgXl2e0qg==
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.3.3.tgz#21415225be66e2c87a917bfc0fedab30a119c23c"
+  integrity sha512-coTew7WODO2vF+XhpUdmYz4UBvlsiTMSNaFYZlrXIqYbFd4W7bMwnoALNLE6uvNgzTg2j1JDF0ZImEfF06VPAA==
   dependencies:
     node-domexception "1.0.0"
     web-streams-polyfill "4.0.0-beta.1"
@@ -11082,26 +11127,26 @@ graphql-anywhere@^4.1.0-alpha.0:
     ts-invariant "^0.3.2"
     tslib "^1.10.0"
 
-graphql-config@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmmirror.com/graphql-config/-/graphql-config-4.1.0.tgz#a3b28d3fb537952ebeb69c75e4430605a10695e3"
-  integrity sha512-Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q==
+graphql-config@^4.3.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-4.3.1.tgz#636b539b1acc06fb48012d0e0f228014ccb0325f"
+  integrity sha512-czBWzJSGaLJfOHBLuUTZVRTjfgohPfvlaeN1B5nXBVptFARpiFuS7iI4FnRhCGwm6qt1h2j1g05nkg0OIGA6bg==
   dependencies:
     "@endemolshinegroup/cosmiconfig-typescript-loader" "3.0.2"
-    "@graphql-tools/graphql-file-loader" "^7.3.2"
-    "@graphql-tools/json-file-loader" "^7.3.2"
-    "@graphql-tools/load" "^7.4.1"
-    "@graphql-tools/merge" "^8.2.1"
-    "@graphql-tools/url-loader" "^7.4.2"
-    "@graphql-tools/utils" "^8.5.1"
+    "@graphql-tools/graphql-file-loader" "^7.3.7"
+    "@graphql-tools/json-file-loader" "^7.3.7"
+    "@graphql-tools/load" "^7.5.5"
+    "@graphql-tools/merge" "^8.2.6"
+    "@graphql-tools/url-loader" "^7.9.7"
+    "@graphql-tools/utils" "^8.6.5"
     cosmiconfig "7.0.1"
     cosmiconfig-toml-loader "1.0.0"
-    minimatch "3.0.4"
+    minimatch "4.2.1"
     string-env-interpolation "1.0.1"
 
-graphql-depth-limit@1.1.0:
+graphql-depth-limit@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmmirror.com/graphql-depth-limit/-/graphql-depth-limit-1.1.0.tgz#59fe6b2acea0ab30ee7344f4c75df39cc18244e8"
+  resolved "https://registry.yarnpkg.com/graphql-depth-limit/-/graphql-depth-limit-1.1.0.tgz#59fe6b2acea0ab30ee7344f4c75df39cc18244e8"
   integrity sha512-+3B2BaG8qQ8E18kzk9yiSdAa75i/hnnOwgSeAxVJctGQPvmeiLtqKOYF6HETCyRjiF7Xfsyal0HbLlxCQkgkrw==
   dependencies:
     arrify "^1.0.1"
@@ -11115,11 +11160,6 @@ graphql-extensions@^0.15.0:
     apollo-server-env "^3.1.0"
     apollo-server-types "^0.9.0"
 
-graphql-sse@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.npmmirror.com/graphql-sse/-/graphql-sse-1.0.6.tgz#4f98e0a06f2020542ed054399116108491263224"
-  integrity sha512-y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w==
-
 graphql-subscriptions@^1.0.0, graphql-subscriptions@^1.1.0, graphql-subscriptions@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz#2142b2d729661ddf967b7388f7cf1dd4cf2e061d"
@@ -11192,9 +11232,9 @@ graphql-ws@^4.4.1:
   integrity sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==
 
 graphql-ws@^5.4.1:
-  version "5.5.5"
-  resolved "https://registry.npmmirror.com/graphql-ws/-/graphql-ws-5.5.5.tgz#f375486d3f196e2a2527b503644693ae3a8670a9"
-  integrity sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw==
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.9.1.tgz#9c0fa48ceb695d61d574ed3ab21b426729e87f2d"
+  integrity sha512-mL/SWGBwIT9Meq0NlfS55yXXTOeWPMbK7bZBEZhFu46bcGk1coTx2Sdtzxdk+9yHWngD+Fk1PZDWaAutQa9tpw==
 
 "graphql@14.0.2 - 14.2.0 || ^14.3.1 || ^15.0.0", graphql@^15.1.0, graphql@^15.5.0:
   version "15.8.0"
@@ -12502,11 +12542,16 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-ws@4.0.1, isomorphic-ws@^4.0.1:
+isomorphic-ws@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
   integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
 
+isomorphic-ws@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf"
+  integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -14024,9 +14069,9 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash.lowercase@4.3.0:
+lodash.lowercase@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmmirror.com/lodash.lowercase/-/lodash.lowercase-4.3.0.tgz#46515aced4acb0b7093133333af068e4c3b14e9d"
+  resolved "https://registry.yarnpkg.com/lodash.lowercase/-/lodash.lowercase-4.3.0.tgz#46515aced4acb0b7093133333af068e4c3b14e9d"
   integrity sha512-UcvP1IZYyDKyEL64mmrwoA1AbFu5ahojhTtkOUr1K9dbuxzS9ev8i4TxMMGCqRC9TE8uDaSoufNAXxRPNTseVA==
 
 lodash.mapvalues@^4.6.0:
@@ -14645,6 +14690,13 @@ minimatch@3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4"
+  integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -15088,7 +15140,7 @@ node-dir@^0.1.17:
 
 node-domexception@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmmirror.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+  resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
   integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
 
 node-fetch@2.6.1:
@@ -18468,6 +18520,11 @@ streamsearch@0.1.2:
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
   integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
 
+streamsearch@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
+  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
+
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -18751,7 +18808,7 @@ stylus@^0.55.0:
 
 subscriptions-transport-ws@^0.11.0:
   version "0.11.0"
-  resolved "https://registry.npmmirror.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz#baf88f050cba51d52afe781de5e81b3c31f89883"
+  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz#baf88f050cba51d52afe781de5e81b3c31f89883"
   integrity sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==
   dependencies:
     backo2 "^1.0.2"
@@ -18864,12 +18921,12 @@ sync-fetch@0.3.0:
     buffer "^5.7.0"
     node-fetch "^2.6.1"
 
-sync-fetch@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.npmmirror.com/sync-fetch/-/sync-fetch-0.3.1.tgz#62aa82c4b4d43afd6906bfd7b5f92056458509f0"
-  integrity sha512-xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g==
+sync-fetch@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/sync-fetch/-/sync-fetch-0.4.1.tgz#87b8684eef2fa25c96c4683ae308473a4e5c571f"
+  integrity sha512-JDtyFEvnKUzt1CxRtzzsGgkBanEv8XRmLyJo0F0nGkpCR8EjYmpOJJXz8GA/SWtlPU0nAYh0+CNMNnFworGyOA==
   dependencies:
-    buffer "^5.7.0"
+    buffer "^5.7.1"
     node-fetch "^2.6.1"
 
 table@6.7.3:
@@ -19444,7 +19501,7 @@ tslib@^2, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0,
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
-tslib@^2.4.0:
+tslib@^2.4.0, tslib@~2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
@@ -19660,10 +19717,10 @@ undefsafe@^2.0.5:
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
   integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
 
-undici@^4.9.3:
-  version "4.13.0"
-  resolved "https://registry.npmmirror.com/undici/-/undici-4.13.0.tgz#7d10fe150c3241a6b3b0eba80eff59c9fb40f359"
-  integrity sha512-8lk8S/f2V0VUNGf2scU2b+KI2JSzEQLdCyRNRF3XmHu+5jectlSDaPSBCXAHFaUlt1rzngzOBVDgJS9/Gue/KA==
+undici@5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.5.1.tgz#baaf25844a99eaa0b22e1ef8d205bffe587c8f43"
+  integrity sha512-MEvryPLf18HvlCbLSzCW0U00IMftKGI5udnjrQbC5D4P0Hodwffhv+iGfWuJwg16Y/TK11ZFK8i+BPVW2z/eAw==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
@@ -19940,7 +19997,7 @@ v8-to-istanbul@^8.1.0:
     convert-source-map "^1.6.0"
     source-map "^0.7.3"
 
-valid-url@1.0.9, valid-url@^1.0.9:
+valid-url@1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"
   integrity sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA=
@@ -20475,13 +20532,13 @@ wdio-geckodriver-service@^2.0.2:
 
 web-streams-polyfill@4.0.0-beta.1:
   version "4.0.0-beta.1"
-  resolved "https://registry.npmmirror.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz#3b19b9817374b7cee06d374ba7eeb3aeb80e8c95"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz#3b19b9817374b7cee06d374ba7eeb3aeb80e8c95"
   integrity sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==
 
 web-streams-polyfill@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmmirror.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965"
-  integrity sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
+  integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
 
 webdriver@7.16.14:
   version "7.16.14"
@@ -21130,15 +21187,15 @@ ws@8.2.3:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
   integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
 
-ws@>=7.4.6, ws@^8.2.3, ws@^8.4.2:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
-  integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
+ws@>=7.4.6, ws@^8.2.3, ws@^8.3.0, ws@^8.4.2:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.0.tgz#8e71c75e2f6348dbf8d78005107297056cb77769"
+  integrity sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==
 
 "ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.0.0, ws@^7.3.1, ws@^7.4.6:
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
-  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
+  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
 
 ws@^6.1.0:
   version "6.2.2"
@@ -21147,11 +21204,6 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^8.3.0:
-  version "8.5.0"
-  resolved "https://registry.npmmirror.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
-
 xdg-basedir@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"

From 0260e4dacd89b6edf63bef07fd80d3b6108f72b5 Mon Sep 17 00:00:00 2001
From: BackRunner <dev@backrunner.top>
Date: Thu, 7 Jul 2022 16:35:27 +0800
Subject: [PATCH 37/47] fix: add devServer.server.type to useHttps judgement
 (#7222)

---
 packages/@vue/cli-service/lib/commands/serve.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@vue/cli-service/lib/commands/serve.js b/packages/@vue/cli-service/lib/commands/serve.js
index b0063cb6cc..aef507398c 100644
--- a/packages/@vue/cli-service/lib/commands/serve.js
+++ b/packages/@vue/cli-service/lib/commands/serve.js
@@ -108,7 +108,8 @@ module.exports = (api, options) => {
     const modesUseHttps = ['https', 'http2']
     const serversUseHttps = ['https', 'spdy']
     const optionsUseHttps = modesUseHttps.some(modeName => !!projectDevServerOptions[modeName]) ||
-      (typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server))
+      (typeof projectDevServerOptions.server === 'string' && serversUseHttps.includes(projectDevServerOptions.server)) ||
+      (typeof projectDevServerOptions.server === 'object' && projectDevServerOptions.server !== null && serversUseHttps.includes(projectDevServerOptions.server.type))
     const useHttps = args.https || optionsUseHttps || defaults.https
     const protocol = useHttps ? 'https' : 'http'
     const host = args.host || process.env.HOST || projectDevServerOptions.host || defaults.host

From 4e024b77af8256ab858bb6cbf6179258d0c495b1 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 7 Jul 2022 17:34:38 +0800
Subject: [PATCH 38/47] ci: bump appveyor node version

The dev dependency `@graphql-eslint/eslint-plugin` is causing CI
failures in Node.js 12
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 62424c42ca..f54d23cd69 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  nodejs_version: "12"
+  nodejs_version: "14"
 
 install:
   - ps: Install-Product node $env:nodejs_version

From b154dbd7aca4b4538e6c483b1d4b817499d7b8eb Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 7 Jul 2022 18:21:27 +0800
Subject: [PATCH 39/47] v5.0.8

---
 CHANGELOG.md                                         |  3 +++
 lerna.json                                           |  2 +-
 packages/@vue/babel-preset-app/package.json          |  2 +-
 packages/@vue/cli-init/package.json                  |  2 +-
 packages/@vue/cli-overlay/package.json               |  2 +-
 packages/@vue/cli-plugin-babel/package.json          |  6 +++---
 packages/@vue/cli-plugin-e2e-cypress/package.json    |  4 ++--
 packages/@vue/cli-plugin-e2e-nightwatch/package.json |  4 ++--
 .../@vue/cli-plugin-e2e-webdriverio/package.json     |  4 ++--
 packages/@vue/cli-plugin-eslint/package.json         |  4 ++--
 packages/@vue/cli-plugin-pwa/package.json            |  4 ++--
 packages/@vue/cli-plugin-router/package.json         |  6 +++---
 packages/@vue/cli-plugin-typescript/package.json     |  4 ++--
 packages/@vue/cli-plugin-unit-jest/package.json      |  4 ++--
 packages/@vue/cli-plugin-unit-mocha/package.json     |  4 ++--
 packages/@vue/cli-plugin-vuex/package.json           |  4 ++--
 packages/@vue/cli-service/package.json               | 10 +++++-----
 packages/@vue/cli-shared-utils/package.json          |  2 +-
 packages/@vue/cli-test-utils/package.json            |  2 +-
 packages/@vue/cli-ui-addon-webpack/package.json      |  8 ++++----
 packages/@vue/cli-ui-addon-widgets/package.json      |  8 ++++----
 packages/@vue/cli-ui/package.json                    | 12 ++++++------
 packages/@vue/cli/package.json                       | 12 ++++++------
 packages/vue-cli-version-marker/package.json         |  4 ++--
 24 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c93aa2e71..84c1fb2de5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+
+
+
 ## 5.0.7 (2022-07-05)
 
 * `@vue/cli-service`
diff --git a/lerna.json b/lerna.json
index f38c615913..1164c8b2b4 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "5.0.7",
+  "version": "5.0.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
index 24932fe200..690d9555cb 100644
--- 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": "5.0.7",
+  "version": "5.0.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
index e12c888865..7bbe34a336 100644
--- a/packages/@vue/cli-init/package.json
+++ b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "5.0.7",
+  "version": "5.0.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
index 1a8ff5e0e8..94b707b731 100644
--- a/packages/@vue/cli-overlay/package.json
+++ b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "5.0.7",
+  "version": "5.0.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
index 94c0e489a2..3a1d863599 100644
--- 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": "5.0.7",
+  "version": "5.0.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.12.16",
-    "@vue/babel-preset-app": "^5.0.7",
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/babel-preset-app": "^5.0.8",
+    "@vue/cli-shared-utils": "^5.0.8",
     "babel-loader": "^8.2.2",
     "thread-loader": "^3.0.0",
     "webpack": "^5.54.0"
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
index 564ba2649a..037d9cb253 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "eslint-plugin-cypress": "^2.11.2"
   },
   "devDependencies": {
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
index fa7c54a674..5075b10c39 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "deepmerge": "^4.2.2",
     "nightwatch": "^2.0.5"
   },
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/package.json b/packages/@vue/cli-plugin-e2e-webdriverio/package.json
index 53665e27eb..41bafe9eff 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "e2e-webdriverio plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/mocha": "^8.2.1",
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "@wdio/cli": "^7.0.7",
     "@wdio/local-runner": "^7.0.7",
     "@wdio/mocha-framework": "^7.0.7",
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
index b43599eedb..26f227844a 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "eslint-webpack-plugin": "^3.1.0",
     "globby": "^11.0.2",
     "webpack": "^5.54.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
index 91363bd98d..1767c8f119 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "html-webpack-plugin": "^5.1.0",
     "webpack": "^5.54.0",
     "workbox-webpack-plugin": "^6.1.0"
diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
index d98e77a3fd..088fce57ab 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^5.0.7"
+    "@vue/cli-shared-utils": "^5.0.8"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.7"
+    "@vue/cli-test-utils": "^5.0.8"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
index eaa78bcf82..89c4070ced 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/core": "^7.12.16",
     "@types/webpack-env": "^1.15.2",
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "babel-loader": "^8.2.2",
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "globby": "^11.0.2",
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
index f18c6266f7..29505acb37 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.12.16",
     "@babel/plugin-transform-modules-commonjs": "^7.15.0",
     "@types/jest": "^27.0.1",
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "babel-jest": "^27.1.0",
     "deepmerge": "^4.2.2",
     "jest": "^27.1.0",
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
index 31097dc0da..75678a69b5 100644
--- 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": "5.0.7",
+  "version": "5.0.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": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "jsdom": "^18.0.1",
     "jsdom-global": "^3.0.2",
     "mocha": "^8.3.0",
diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
index 7736f594fc..d46cc88dcc 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^5.0.7"
+    "@vue/cli-test-utils": "^5.0.8"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index 51d35a517e..d535d53a27 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -27,10 +27,10 @@
     "@soda/friendly-errors-webpack-plugin": "^1.8.0",
     "@soda/get-current-script": "^1.0.2",
     "@types/minimist": "^1.2.0",
-    "@vue/cli-overlay": "^5.0.7",
-    "@vue/cli-plugin-router": "^5.0.7",
-    "@vue/cli-plugin-vuex": "^5.0.7",
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-overlay": "^5.0.8",
+    "@vue/cli-plugin-router": "^5.0.8",
+    "@vue/cli-plugin-vuex": "^5.0.8",
+    "@vue/cli-shared-utils": "^5.0.8",
     "@vue/component-compiler-utils": "^3.3.0",
     "@vue/vue-loader-v15": "npm:vue-loader@^15.9.7",
     "@vue/web-component-wrapper": "^1.3.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
index e0a3965108..d1b42703be 100644
--- 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": "5.0.7",
+  "version": "5.0.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
index 7db6ceb244..b2fdd76ca5 100644
--- 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": "5.0.7",
+  "version": "5.0.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
index 50e5fc63b0..ce3e28b2a1 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.7",
-    "@vue/cli-plugin-eslint": "^5.0.7",
-    "@vue/cli-service": "^5.0.7",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
index 441178b02c..ff6d17fc60 100644
--- 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": "5.0.7",
+  "version": "5.0.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -20,9 +20,9 @@
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "^5.0.7",
-    "@vue/cli-plugin-eslint": "^5.0.7",
-    "@vue/cli-service": "^5.0.7",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
     "@vue/eslint-config-standard": "^6.1.0",
     "core-js": "^3.8.3",
     "eslint": "^7.32.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 8c0497c86e..7fd2276a88 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -37,7 +37,7 @@
     "@achrinza/node-ipc": "^9.2.5",
     "@akryum/winattr": "^3.0.0",
     "@graphql-tools/schema": "^8.5.0",
-    "@vue/cli-shared-utils": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
     "apollo-server-express": "^3.9.0",
     "clone": "^2.1.1",
     "deepmerge": "^4.2.2",
@@ -68,10 +68,10 @@
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@graphql-eslint/eslint-plugin": "^3.8.0",
-    "@vue/cli-plugin-babel": "^5.0.7",
-    "@vue/cli-plugin-e2e-cypress": "^5.0.7",
-    "@vue/cli-plugin-eslint": "^5.0.7",
-    "@vue/cli-service": "^5.0.7",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-e2e-cypress": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
     "@vue/eslint-config-standard": "^6.1.0",
     "@vue/ui": "^0.12.2",
     "ansi_up": "^5.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
index 6a8bac8710..d478c033c4 100644
--- a/packages/@vue/cli/package.json
+++ b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -27,10 +27,10 @@
   "dependencies": {
     "@types/ejs": "^3.0.6",
     "@types/inquirer": "^8.1.3",
-    "@vue/cli-shared-utils": "^5.0.7",
-    "@vue/cli-ui": "^5.0.7",
-    "@vue/cli-ui-addon-webpack": "^5.0.7",
-    "@vue/cli-ui-addon-widgets": "^5.0.7",
+    "@vue/cli-shared-utils": "^5.0.8",
+    "@vue/cli-ui": "^5.0.8",
+    "@vue/cli-ui-addon-webpack": "^5.0.8",
+    "@vue/cli-ui-addon-widgets": "^5.0.8",
     "boxen": "^5.0.0",
     "commander": "^7.1.0",
     "debug": "^4.1.0",
@@ -62,7 +62,7 @@
     "yaml-front-matter": "^4.1.0"
   },
   "devDependencies": {
-    "@vue/cli-service": "^5.0.7",
+    "@vue/cli-service": "^5.0.8",
     "cmd-shim": "^4.1.0"
   },
   "engines": {
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
index 793cd92ba0..6f07a5e07e 100644
--- a/packages/vue-cli-version-marker/package.json
+++ b/packages/vue-cli-version-marker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
   "main": "package.json",
   "devDependencies": {
-    "@vue/cli": "^5.0.7"
+    "@vue/cli": "^5.0.8"
   }
 }

From bc1c0bc5b49ac871539c3bb0b0c79451c0ee881a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 17 Aug 2022 14:03:06 +0800
Subject: [PATCH 40/47] chore: update readme [ci skip]

---
 README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 71d56a0193..738fd2e1ad 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,15 @@
 # Vue CLI [![Build Status](https://circleci.com/gh/vuejs/vue-cli/tree/dev.svg?style=shield)](https://circleci.com/gh/vuejs/vue-cli/tree/dev) [![Windows Build status](https://ci.appveyor.com/api/projects/status/rkpafdpdwie9lqx0/branch/dev?svg=true)](https://ci.appveyor.com/project/yyx990803/vue-cli/branch/dev) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
 
-## Status
+## ⚠️ Status
 
-Vue CLI is now in maintenance mode. For new Vue 3 projects, please use [create-vue](https://github.com/vuejs/create-vue) to scaffold [Vite](https://vitejs.dev/)-based projects.
+Vue CLI is now in maintenance mode. For new projects, please use [create-vue](https://github.com/vuejs/create-vue) to scaffold [Vite](https://vitejs.dev/)-based projects, which supports both Vue 2 and Vue 3.
+
+Also refer to the latest [Tooling Guide](https://vuejs.org/guide/scaling-up/tooling.html) on setting up a new Vue 3 project.
+
+For information on migrating from Vue CLI to Vite:
+
+- [Vue CLI -> Vite Migration Guide from VueSchool.io](https://vueschool.io/articles/vuejs-tutorials/how-to-migrate-from-vue-cli-to-vite/)
+- [Tools / Plugins that help with auto migration](https://github.com/vitejs/awesome-vite#vue-cli)
 
 ## Documentation
 

From 95ad425474ec784404188d1874fd59176a97a0f3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 17 Aug 2022 14:39:51 +0800
Subject: [PATCH 41/47] docs: bump vitepress

---
 package.json |   2 +-
 yarn.lock    | 508 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 297 insertions(+), 213 deletions(-)

diff --git a/package.json b/package.json
index f74d819dc0..24b08604cf 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "typescript": "~4.5.5",
     "verdaccio": "^5.0.1",
     "vite-plugin-pwa": "^0.11.3",
-    "vitepress": "^0.20.1",
+    "vitepress": "^0.22.4",
     "webpack": "^5.54.0",
     "yorkie": "^2.0.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 9b2a3da701..8a074dc22e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18,24 +18,24 @@
   dependencies:
     fswin "^2.17.1227"
 
-"@algolia/autocomplete-core@1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz#ec0178e07b44fd74a057728ac157291b26cecf37"
-  integrity sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A==
+"@algolia/autocomplete-core@1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.7.1.tgz#025538b8a9564a9f3dd5bcf8a236d6951c76c7d1"
+  integrity sha512-eiZw+fxMzNQn01S8dA/hcCpoWCOCwcIIEUtHHdzN5TGB3IpzLbuhqFeTfh2OUhhgkE8Uo17+wH+QJ/wYyQmmzg==
   dependencies:
-    "@algolia/autocomplete-shared" "1.5.2"
+    "@algolia/autocomplete-shared" "1.7.1"
 
-"@algolia/autocomplete-preset-algolia@1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz#36c5638cc6dba6ea46a86e5a0314637ca40a77ca"
-  integrity sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw==
+"@algolia/autocomplete-preset-algolia@1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.1.tgz#7dadc5607097766478014ae2e9e1c9c4b3f957c8"
+  integrity sha512-pJwmIxeJCymU1M6cGujnaIYcY3QPOVYZOXhFkWVM7IxKzy272BwCvMFMyc5NpG/QmiObBxjo7myd060OeTNJXg==
   dependencies:
-    "@algolia/autocomplete-shared" "1.5.2"
+    "@algolia/autocomplete-shared" "1.7.1"
 
-"@algolia/autocomplete-shared@1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz#e157f9ad624ab8fd940ff28bd2094cdf199cdd79"
-  integrity sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug==
+"@algolia/autocomplete-shared@1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.1.tgz#95c3a0b4b78858fed730cf9c755b7d1cd0c82c74"
+  integrity sha512-eTmGVqY3GeyBTT8IWiB2K5EuURAqhnumfktAEoHxfDY2o7vg2rSnO16ZtIG0fMgt3py28Vwgq42/bVEuaQV7pg==
 
 "@algolia/cache-browser-local-storage@4.12.1":
   version "4.12.1"
@@ -1453,27 +1453,27 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@docsearch/css@3.0.0-alpha.50", "@docsearch/css@^3.0.0-alpha.41":
-  version "3.0.0-alpha.50"
-  resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.0.0-alpha.50.tgz#794c6a8d301840a49b55f5b331c7be84b9723643"
-  integrity sha512-QeWFCQOtS9D+Fi20liKsPXF2j/xWKh52e+P2Z1UATIdPMqmH6zoB2lcUz+cgv6PPVgWUtECeR6VSSUm71LT94w==
+"@docsearch/css@3.2.1", "@docsearch/css@^3.0.0":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.2.1.tgz#c05d7818b0e43b42f9efa2d82a11c36606b37b27"
+  integrity sha512-gaP6TxxwQC+K8D6TRx5WULUWKrcbzECOPA2KCVMuI+6C7dNiGUk5yXXzVhc5sld79XKYLnO9DRTI4mjXDYkh+g==
 
-"@docsearch/js@^3.0.0-alpha.41":
-  version "3.0.0-alpha.50"
-  resolved "https://registry.yarnpkg.com/@docsearch/js/-/js-3.0.0-alpha.50.tgz#8d59834ceb4a27463851e7e7ce9968f3549cc8f2"
-  integrity sha512-1ap9Wz5oR/Z8yybaCZhsptXU43es3H52eEQUZtmzb8dUWyCW+3iXaKVB/qeMJOQWtggZ/WvZV3YknVIbCMR2dQ==
+"@docsearch/js@^3.0.0":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@docsearch/js/-/js-3.2.1.tgz#d6856fb6223c7a47091640264d5144d59806bc30"
+  integrity sha512-H1PekEtSeS0msetR2YGGey2w7jQ2wAKfGODJvQTygSwMgUZ+2DHpzUgeDyEBIXRIfaBcoQneqrzsljM62pm6Xg==
   dependencies:
-    "@docsearch/react" "3.0.0-alpha.50"
+    "@docsearch/react" "3.2.1"
     preact "^10.0.0"
 
-"@docsearch/react@3.0.0-alpha.50":
-  version "3.0.0-alpha.50"
-  resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.0.0-alpha.50.tgz#a7dc547836c2b221fd3aa8eb87bfb47a579ef141"
-  integrity sha512-oDGV1zZCRYv7MWsh6CyQVthYTRc3b4q+6kKwNYb1/g/Wf/4nJHutpxolFLHdEUDhrJ4Xi8wxwQG+lEwAVBTHPg==
+"@docsearch/react@3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.2.1.tgz#112ad88db07367fa6fd933d67d58421d8d8289aa"
+  integrity sha512-EzTQ/y82s14IQC5XVestiK/kFFMe2aagoYFuTAIfIb/e+4FU7kSMKonRtLwsCiLQHmjvNQq+HO+33giJ5YVtaQ==
   dependencies:
-    "@algolia/autocomplete-core" "1.5.2"
-    "@algolia/autocomplete-preset-algolia" "1.5.2"
-    "@docsearch/css" "3.0.0-alpha.50"
+    "@algolia/autocomplete-core" "1.7.1"
+    "@algolia/autocomplete-preset-algolia" "1.7.1"
+    "@docsearch/css" "3.2.1"
     algoliasearch "^4.0.0"
 
 "@endemolshinegroup/cosmiconfig-typescript-loader@3.0.2":
@@ -1496,6 +1496,11 @@
     ts-node "^8"
     tslib "^1"
 
+"@esbuild/linux-loong64@0.14.54":
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028"
+  integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==
+
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -4353,10 +4358,10 @@
   resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-6.0.0-6-next.16.tgz#f88f555b502636c37ec1722d832c6fd826b63892"
   integrity sha512-FbYl3273qaA0/fRwrvE876/HuvU81zjsnR70rCEojBelDuddl3xbY1LVdvthCjUGuIj2SUNpTzGhyROdqHJUCg==
 
-"@vitejs/plugin-vue@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-2.1.0.tgz#ddf5e0059f84f2ff649afc25ce5a59211e670542"
-  integrity sha512-AZ78WxvFMYd8JmM/GBV6a6SGGTU0GgN/0/4T+FnMMsLzFEzTeAUwuraapy50ifHZsC+G5SvWs86bvaCPTneFlA==
+"@vitejs/plugin-vue@^2.3.2":
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-2.3.4.tgz#966a6279060eb2d9d1a02ea1a331af071afdcf9e"
+  integrity sha512-IfFNbtkbIm36O9KB8QodlwwYvTEsJb4Lll4c2IwB3VHc2gie2mSPtSzL0eYay7X2jd/2WX02FjSGTWR6OPr/zg==
 
 "@vue/babel-helper-vue-jsx-merge-props@^1.2.1":
   version "1.2.1"
@@ -4468,7 +4473,25 @@
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.2.30", "@vue/compiler-dom@^3.0.5":
+"@vue/compiler-core@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.37.tgz#b3c42e04c0e0f2c496ff1784e543fbefe91e215a"
+  integrity sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/shared" "3.2.37"
+    estree-walker "^2.0.2"
+    source-map "^0.6.1"
+
+"@vue/compiler-dom@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz#10d2427a789e7c707c872da9d678c82a0c6582b5"
+  integrity sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==
+  dependencies:
+    "@vue/compiler-core" "3.2.37"
+    "@vue/shared" "3.2.37"
+
+"@vue/compiler-dom@^3.0.5":
   version "3.2.30"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.30.tgz#ed15e6243227baeaa445d04df804aee6e4926eab"
   integrity sha512-t7arHz2SXLCXlF2fdGDFVbhENbGMez254Z5edUqb//6WXJU1lC7GvSkUE7i5x8WSjgfqt60i0V8zdmk16rvLdw==
@@ -4476,29 +4499,29 @@
     "@vue/compiler-core" "3.2.30"
     "@vue/shared" "3.2.30"
 
-"@vue/compiler-sfc@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.30.tgz#9d2e56adb859059551fc1204bc37503f168c4d0c"
-  integrity sha512-P/5YpILtcQY92z72gxhkyOUPHVskEzhSrvYi91Xcr+csOxaDaYU5OqOxCzZKcf3Og70Tat404vO1OHrwprN90A==
+"@vue/compiler-sfc@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz#3103af3da2f40286edcd85ea495dcb35bc7f5ff4"
+  integrity sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==
   dependencies:
     "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.30"
-    "@vue/compiler-dom" "3.2.30"
-    "@vue/compiler-ssr" "3.2.30"
-    "@vue/reactivity-transform" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-core" "3.2.37"
+    "@vue/compiler-dom" "3.2.37"
+    "@vue/compiler-ssr" "3.2.37"
+    "@vue/reactivity-transform" "3.2.37"
+    "@vue/shared" "3.2.37"
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
     postcss "^8.1.10"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.30.tgz#fc2bc13a9cdfd70fcffab3f0bc7de141cd9c3411"
-  integrity sha512-OUh3MwAu/PsD7VN3UOdBbTkltkrUCNouSht47+CMRzpUR5+ta7+xyMAVHeq8wg4YZenWaJimbR5TL35Ka4Vk6g==
+"@vue/compiler-ssr@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz#4899d19f3a5fafd61524a9d1aee8eb0505313cff"
+  integrity sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==
   dependencies:
-    "@vue/compiler-dom" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-dom" "3.2.37"
+    "@vue/shared" "3.2.37"
 
 "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.3.0":
   version "3.3.0"
@@ -4542,54 +4565,59 @@
   dependencies:
     vue-eslint-parser "^8.0.0"
 
-"@vue/reactivity-transform@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.30.tgz#2006e9f4645777a481b78ae77fc486159afa8480"
-  integrity sha512-Le5XzCJyK3qTjoTnvQG/Ehu8fYjayauMNFyMaEnwFlm/avDofpuibpS9u+/6AgzsGnVWN+i0Jgf25bJd9DIwMw==
+"@vue/reactivity-transform@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz#0caa47c4344df4ae59f5a05dde2a8758829f8eca"
+  integrity sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==
   dependencies:
     "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-core" "3.2.37"
+    "@vue/shared" "3.2.37"
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
 
-"@vue/reactivity@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.30.tgz#fdae2bb66d075c34593ea7e15c6831300a1ad39e"
-  integrity sha512-qlNKbkRn2JiGxVUEdoXbLAy+vcuHUCcq+YH2uXWz0BNMvXY2plmz+oqsw+694llwmYLkke5lbdYF4DIupisIkg==
+"@vue/reactivity@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.37.tgz#5bc3847ac58828e2b78526e08219e0a1089f8848"
+  integrity sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==
   dependencies:
-    "@vue/shared" "3.2.30"
+    "@vue/shared" "3.2.37"
 
-"@vue/runtime-core@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.30.tgz#1acc119ff8a49c06af6b03611bc4e03f464ca8a2"
-  integrity sha512-RTi7xH0Ht/6wfbo2WFBMJTEiyWFTqGhrksJm8lz6E+auO6lXZ6Eq3gPNfLt47GDWCm4xyrv+rs5R4UbarPEQ1Q==
+"@vue/runtime-core@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.37.tgz#7ba7c54bb56e5d70edfc2f05766e1ca8519966e3"
+  integrity sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==
   dependencies:
-    "@vue/reactivity" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/reactivity" "3.2.37"
+    "@vue/shared" "3.2.37"
 
-"@vue/runtime-dom@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.30.tgz#16a85b359ea1fff9b1dd61e9d00e93f4652aba5e"
-  integrity sha512-a3+jrncDvEFQmB+v9k0VyT4/Y3XO6OAueCroXXY4yLyr6PJeyxljweV5TzvW0rvVzH9sZO0QAvG76Lo+6C92Qw==
+"@vue/runtime-dom@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz#002bdc8228fa63949317756fb1e92cdd3f9f4bbd"
+  integrity sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==
   dependencies:
-    "@vue/runtime-core" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/runtime-core" "3.2.37"
+    "@vue/shared" "3.2.37"
     csstype "^2.6.8"
 
-"@vue/server-renderer@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.30.tgz#4acccad3933475d07b94560c6cb205363975b969"
-  integrity sha512-pzb8J/w+JdZVOtuKFlirGqrs4GP60FXGDJySw3WV2pCetuFstaacDrnymEeSo3ohAD+Qjv7zAG+Y7OvkdxQxmQ==
+"@vue/server-renderer@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.37.tgz#840a29c8dcc29bddd9b5f5ffa22b95c0e72afdfc"
+  integrity sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==
   dependencies:
-    "@vue/compiler-ssr" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-ssr" "3.2.37"
+    "@vue/shared" "3.2.37"
 
 "@vue/shared@3.2.30":
   version "3.2.30"
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.30.tgz#e2ba8f6692399c27c81c668ecd3f1a4e13ee2f5e"
   integrity sha512-B3HouBtUxcfu2w2d+VhdLcVBXKYYhXiFMAfQ+hoe8NUhKkPRkWDIqhpuehCZxVQ3S2dN1P1WfKGlxGC+pfmxGg==
 
+"@vue/shared@3.2.37":
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702"
+  integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==
+
 "@vue/test-utils@^1.1.3":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.0.tgz#d563decdcd9c68a7bca151d4179a2bfd6d5c3e15"
@@ -9202,113 +9230,132 @@ es6-weak-map@^2.0.3:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
-esbuild-android-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.15.tgz#3fc3ff0bab76fe35dd237476b5d2b32bb20a3d44"
-  integrity sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==
-
-esbuild-darwin-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.15.tgz#8e9169c16baf444eacec60d09b24d11b255a8e72"
-  integrity sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==
-
-esbuild-darwin-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.15.tgz#1b07f893b632114f805e188ddfca41b2b778229a"
-  integrity sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==
-
-esbuild-freebsd-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.15.tgz#0b8b7eca1690c8ec94c75680c38c07269c1f4a85"
-  integrity sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==
-
-esbuild-freebsd-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.15.tgz#2e1a6c696bfdcd20a99578b76350b41db1934e52"
-  integrity sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==
-
-esbuild-linux-32@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.15.tgz#6fd39f36fc66dd45b6b5f515728c7bbebc342a69"
-  integrity sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==
-
-esbuild-linux-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.15.tgz#9cb8e4bcd7574e67946e4ee5f1f1e12386bb6dd3"
-  integrity sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==
-
-esbuild-linux-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.15.tgz#3891aa3704ec579a1b92d2a586122e5b6a2bfba1"
-  integrity sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==
-
-esbuild-linux-arm@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.15.tgz#8a00e99e6a0c6c9a6b7f334841364d8a2b4aecfe"
-  integrity sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==
-
-esbuild-linux-mips64le@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.15.tgz#36b07cc47c3d21e48db3bb1f4d9ef8f46aead4f7"
-  integrity sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==
-
-esbuild-linux-ppc64le@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.15.tgz#f7e6bba40b9a11eb9dcae5b01550ea04670edad2"
-  integrity sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==
-
-esbuild-netbsd-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.15.tgz#a2fedc549c2b629d580a732d840712b08d440038"
-  integrity sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==
-
-esbuild-openbsd-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.15.tgz#b22c0e5806d3a1fbf0325872037f885306b05cd7"
-  integrity sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==
-
-esbuild-sunos-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.15.tgz#d0b6454a88375ee8d3964daeff55c85c91c7cef4"
-  integrity sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==
-
-esbuild-windows-32@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.15.tgz#c96d0b9bbb52f3303322582ef8e4847c5ad375a7"
-  integrity sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==
-
-esbuild-windows-64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz#1f79cb9b1e1bb02fb25cd414cb90d4ea2892c294"
-  integrity sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==
-
-esbuild-windows-arm64@0.13.15:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.15.tgz#482173070810df22a752c686509c370c3be3b3c3"
-  integrity sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==
-
-esbuild@^0.13.12:
-  version "0.13.15"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.15.tgz#db56a88166ee373f87dbb2d8798ff449e0450cdf"
-  integrity sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==
+esbuild-android-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be"
+  integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==
+
+esbuild-android-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771"
+  integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==
+
+esbuild-darwin-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25"
+  integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==
+
+esbuild-darwin-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73"
+  integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==
+
+esbuild-freebsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d"
+  integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==
+
+esbuild-freebsd-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48"
+  integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==
+
+esbuild-linux-32@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5"
+  integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==
+
+esbuild-linux-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652"
+  integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==
+
+esbuild-linux-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b"
+  integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==
+
+esbuild-linux-arm@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59"
+  integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==
+
+esbuild-linux-mips64le@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34"
+  integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==
+
+esbuild-linux-ppc64le@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e"
+  integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==
+
+esbuild-linux-riscv64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8"
+  integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==
+
+esbuild-linux-s390x@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6"
+  integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==
+
+esbuild-netbsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81"
+  integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==
+
+esbuild-openbsd-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b"
+  integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==
+
+esbuild-sunos-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da"
+  integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==
+
+esbuild-windows-32@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31"
+  integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==
+
+esbuild-windows-64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4"
+  integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==
+
+esbuild-windows-arm64@0.14.54:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982"
+  integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==
+
+esbuild@^0.14.27:
+  version "0.14.54"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2"
+  integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==
   optionalDependencies:
-    esbuild-android-arm64 "0.13.15"
-    esbuild-darwin-64 "0.13.15"
-    esbuild-darwin-arm64 "0.13.15"
-    esbuild-freebsd-64 "0.13.15"
-    esbuild-freebsd-arm64 "0.13.15"
-    esbuild-linux-32 "0.13.15"
-    esbuild-linux-64 "0.13.15"
-    esbuild-linux-arm "0.13.15"
-    esbuild-linux-arm64 "0.13.15"
-    esbuild-linux-mips64le "0.13.15"
-    esbuild-linux-ppc64le "0.13.15"
-    esbuild-netbsd-64 "0.13.15"
-    esbuild-openbsd-64 "0.13.15"
-    esbuild-sunos-64 "0.13.15"
-    esbuild-windows-32 "0.13.15"
-    esbuild-windows-64 "0.13.15"
-    esbuild-windows-arm64 "0.13.15"
+    "@esbuild/linux-loong64" "0.14.54"
+    esbuild-android-64 "0.14.54"
+    esbuild-android-arm64 "0.14.54"
+    esbuild-darwin-64 "0.14.54"
+    esbuild-darwin-arm64 "0.14.54"
+    esbuild-freebsd-64 "0.14.54"
+    esbuild-freebsd-arm64 "0.14.54"
+    esbuild-linux-32 "0.14.54"
+    esbuild-linux-64 "0.14.54"
+    esbuild-linux-arm "0.14.54"
+    esbuild-linux-arm64 "0.14.54"
+    esbuild-linux-mips64le "0.14.54"
+    esbuild-linux-ppc64le "0.14.54"
+    esbuild-linux-riscv64 "0.14.54"
+    esbuild-linux-s390x "0.14.54"
+    esbuild-netbsd-64 "0.14.54"
+    esbuild-openbsd-64 "0.14.54"
+    esbuild-sunos-64 "0.14.54"
+    esbuild-windows-32 "0.14.54"
+    esbuild-windows-64 "0.14.54"
+    esbuild-windows-arm64 "0.14.54"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -12136,6 +12183,13 @@ is-core-module@^2.5.0, is-core-module@^2.7.0, is-core-module@^2.8.0, is-core-mod
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.9.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -15039,6 +15093,11 @@ nanoid@^2.1.0:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
   integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
 
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -16552,6 +16611,15 @@ postcss@^8.1.10, postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.5:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.13:
+  version "8.4.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
+  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 preact@^10.0.0:
   version "10.6.5"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.6.5.tgz#726d8bd12903a0d51cdd17e2e1b90cc539403e0c"
@@ -17487,6 +17555,15 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.0:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+  dependencies:
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@1.0.2, responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -17604,7 +17681,14 @@ rollup-plugin-terser@^7.0.0:
     serialize-javascript "^4.0.0"
     terser "^5.0.0"
 
-rollup@^2.43.1, rollup@^2.59.0, rollup@^2.60.2:
+"rollup@>=2.59.0 <2.78.0":
+  version "2.77.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12"
+  integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+rollup@^2.43.1, rollup@^2.60.2:
   version "2.67.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.67.1.tgz#4402665706fa00f321d446ce45f880e02cf54f01"
   integrity sha512-1Sbcs4OuW+aD+hhqpIRl+RqooIpF6uQcfzU/QSI7vGkwADY6cM4iLsBGRM2CGLXDTDN5y/yShohFmnKegSPWzg==
@@ -20127,29 +20211,29 @@ vite-plugin-pwa@^0.11.3:
     workbox-build "^6.4.2"
     workbox-window "^6.4.2"
 
-vite@^2.7.0:
-  version "2.7.13"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.7.13.tgz#99b56e27dfb1e4399e407cf94648f5c7fb9d77f5"
-  integrity sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==
+vite@^2.9.7:
+  version "2.9.15"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.15.tgz#2858dd5b2be26aa394a283e62324281892546f0b"
+  integrity sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ==
   dependencies:
-    esbuild "^0.13.12"
-    postcss "^8.4.5"
-    resolve "^1.20.0"
-    rollup "^2.59.0"
+    esbuild "^0.14.27"
+    postcss "^8.4.13"
+    resolve "^1.22.0"
+    rollup ">=2.59.0 <2.78.0"
   optionalDependencies:
     fsevents "~2.3.2"
 
-vitepress@^0.20.1:
-  version "0.20.10"
-  resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-0.20.10.tgz#18266182aee192191db76f63b68203eea3ac148d"
-  integrity sha512-dKgH6k1yxdEjIIxoXGI0vMg3lpBLvMarre/vvt4beuxd+rXOUB1a7DAtXDmgIXOMGQ7IcF+4zyd2132IedhjtQ==
+vitepress@^0.22.4:
+  version "0.22.4"
+  resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-0.22.4.tgz#d4d778fb06decfc2c31c105f6a7a136843cdfb08"
+  integrity sha512-oZUnLO/SpYdThaBKefDeOiVlr0Rie4Ppx3FzMnMyLtJnI5GlBMNjqYqMy/4+umm/iC+ZDJfI+IlDKxv5fZnYzA==
   dependencies:
-    "@docsearch/css" "^3.0.0-alpha.41"
-    "@docsearch/js" "^3.0.0-alpha.41"
-    "@vitejs/plugin-vue" "^2.0.0"
+    "@docsearch/css" "^3.0.0"
+    "@docsearch/js" "^3.0.0"
+    "@vitejs/plugin-vue" "^2.3.2"
     prismjs "^1.25.0"
-    vite "^2.7.0"
-    vue "^3.2.26"
+    vite "^2.9.7"
+    vue "^3.2.33"
 
 vscode-jsonrpc@^4.0.0:
   version "4.0.0"
@@ -20416,16 +20500,16 @@ vue@^2.6.14:
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
   integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
 
-vue@^3.2.26:
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.30.tgz#47de3039631ac22cab2fd26b427575260199b8bb"
-  integrity sha512-ZmTFWVJUX2XADkuOB8GcLTuxnBLogjJBTNVrM7WsTnjqRQ+VR8bLNrvNsbn8vj/LaP5+0WFAPrpngOYE2x+e+Q==
+vue@^3.2.33:
+  version "3.2.37"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.37.tgz#da220ccb618d78579d25b06c7c21498ca4e5452e"
+  integrity sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==
   dependencies:
-    "@vue/compiler-dom" "3.2.30"
-    "@vue/compiler-sfc" "3.2.30"
-    "@vue/runtime-dom" "3.2.30"
-    "@vue/server-renderer" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-dom" "3.2.37"
+    "@vue/compiler-sfc" "3.2.37"
+    "@vue/runtime-dom" "3.2.37"
+    "@vue/server-renderer" "3.2.37"
+    "@vue/shared" "3.2.37"
 
 vuex@^3.6.2:
   version "3.6.2"

From 7c0134e653a0f58315ac9b06e940a5c5928b8b0b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 17 Aug 2022 15:13:10 +0800
Subject: [PATCH 42/47] docs: add recommendation for create-vue in docs

---
 README.md                      |  4 +-
 docs/.vitepress/theme/index.js | 93 +++++++++++++++++++++++++++++++---
 docs/guide/index.md            |  4 --
 docs/guide/installation.md     |  5 --
 docs/ru/guide/index.md         |  4 --
 docs/ru/guide/installation.md  |  5 --
 docs/zh/guide/index.md         |  4 --
 docs/zh/guide/installation.md  |  5 --
 8 files changed, 87 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 738fd2e1ad..0962eaf2fa 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 ## ⚠️ Status
 
-Vue CLI is now in maintenance mode. For new projects, please use [create-vue](https://github.com/vuejs/create-vue) to scaffold [Vite](https://vitejs.dev/)-based projects, which supports both Vue 2 and Vue 3.
+Vue CLI is now in maintenance mode. For new projects, please use [create-vue](https://github.com/vuejs/create-vue) to scaffold [Vite](https://vitejs.dev/)-based projects. `create-vue` supports both Vue 2 and Vue 3.
 
-Also refer to the latest [Tooling Guide](https://vuejs.org/guide/scaling-up/tooling.html) on setting up a new Vue 3 project.
+Also refer to the [Vue 3 Tooling Guide](https://vuejs.org/guide/scaling-up/tooling.html) for the latest recommendations.
 
 For information on migrating from Vue CLI to Vite:
 
diff --git a/docs/.vitepress/theme/index.js b/docs/.vitepress/theme/index.js
index f9abee78f0..50ca114c48 100644
--- a/docs/.vitepress/theme/index.js
+++ b/docs/.vitepress/theme/index.js
@@ -2,19 +2,96 @@ import { h } from 'vue'
 import DefaultTheme from 'vitepress/dist/client/theme-default'
 import AlgoliaSearchBox from './AlgoliaSearchBox.vue'
 import './custom.css'
+import { useData } from 'vitepress'
 
 export default {
   ...DefaultTheme,
-  Layout() {
-    return h(DefaultTheme.Layout, null, {
-      'navbar-search': () => {
-        return h(AlgoliaSearchBox, {
-          options: {
-            indexName: 'cli_vuejs',
-            apiKey: 'f6df220f7d246aff64a56300b7f19f21',
+  Layout: {
+    setup() {
+      const { lang } = useData()
+      return () => {
+        return h(DefaultTheme.Layout, null, {
+          'page-top': () => {
+            return lang.value === 'zh-CN' ? notice_zh_cn() : notice_en()
+          },
+          'navbar-search': () => {
+            return h(AlgoliaSearchBox, {
+              options: {
+                indexName: 'cli_vuejs',
+                apiKey: 'f6df220f7d246aff64a56300b7f19f21'
+              }
+            })
           }
         })
       }
-    })
+    }
   }
 }
+
+function notice_en() {
+  return h('div', { class: 'warning custom-block' }, [
+    h('p', { class: 'custom-block-title' }, '⚠️ Notice'),
+    h('p', [
+      'Vue CLI is now in maintenance mode. For new projects, please use ',
+      h(
+        'a',
+        {
+          href: 'https://github.com/vuejs/create-vue',
+          target: '_blank'
+        },
+        [h('code', 'create-vue')]
+      ),
+      ' to scaffold ',
+      h('a', { href: 'https://vitejs.dev', target: '_blank' }, 'Vite'),
+      '-based projects. ',
+      h('code', 'create-vue'),
+      ' supports both Vue 2 and Vue 3.'
+    ]),
+    h('p', [
+      'Also refer to the ',
+      h(
+        'a',
+        {
+          href: 'https://vuejs.org/guide/scaling-up/tooling.html',
+          target: '_blank'
+        },
+        'Vue 3 Tooling Guide'
+      ),
+      ' for the latest recommendations.'
+    ])
+  ])
+}
+
+function notice_zh_cn() {
+  return h('div', { class: 'warning custom-block' }, [
+    h('p', { class: 'custom-block-title' }, '⚠️ Notice'),
+    h('p', [
+      'Vue CLI 现已处于维护模式。新项目请使用 ',
+      h(
+        'a',
+        {
+          href: 'https://github.com/vuejs/create-vue',
+          target: '_blank'
+        },
+        [h('code', 'create-vue')]
+      ),
+      ' 来创建基于 ',
+      h('a', { href: 'https://cn.vitejs.dev', target: '_blank' }, 'Vite'),
+      ' 的项目. ',
+      h('code', 'create-vue'),
+      ' 同时支持 Vue 2 和 Vue 3.'
+    ]),
+    h('p', [
+      '另外，请参考 ',
+      h(
+        'a',
+        {
+          href: 'https://vuejs.org/guide/scaling-up/tooling.html',
+          target: '_blank'
+        },
+        'Vue 3 工具链指南'
+      ),
+      ' 以了解最新的工具推荐。'
+    ])
+  ])
+}
diff --git a/docs/guide/index.md b/docs/guide/index.md
index 620cbd3980..03625ef225 100644
--- a/docs/guide/index.md
+++ b/docs/guide/index.md
@@ -4,10 +4,6 @@ sidebarDepth: 0
 
 # Overview
 
-::: warning
-This documentation is for `@vue/cli`. For the old `vue-cli`, see [here](https://github.com/vuejs/vue-cli/tree/v2#vue-cli--).
-:::
-
 Vue CLI is a full system for rapid Vue.js development, providing:
 
 - Interactive project scaffolding via `@vue/cli`.
diff --git a/docs/guide/installation.md b/docs/guide/installation.md
index 780b3ed938..1681a62cee 100644
--- a/docs/guide/installation.md
+++ b/docs/guide/installation.md
@@ -1,10 +1,5 @@
 # Installation
 
-::: warning Warning regarding Previous Versions
-The package name changed from `vue-cli` to `@vue/cli`.
-If you have the previous `vue-cli` (1.x or 2.x) package installed globally, you need to uninstall it first with `npm uninstall vue-cli -g` or `yarn global remove vue-cli`.
-:::
-
 ::: tip Node Version Requirement
 Vue CLI 4.x requires [Node.js](https://nodejs.org/) version 8.9 or above (v10+ recommended). You can manage multiple versions of Node on the same machine with [n](https://github.com/tj/n), [nvm](https://github.com/creationix/nvm) or [nvm-windows](https://github.com/coreybutler/nvm-windows).
 :::
diff --git a/docs/ru/guide/index.md b/docs/ru/guide/index.md
index 25a1e090fe..29f17b2805 100644
--- a/docs/ru/guide/index.md
+++ b/docs/ru/guide/index.md
@@ -4,10 +4,6 @@ sidebarDepth: 0
 
 # Введение
 
-::: warning Предупреждение
-Эта документация для `@vue/cli`. Для старой версии `vue-cli`, см. [здесь](https://github.com/vuejs/vue-cli/tree/v2#vue-cli--).
-:::
-
 Vue CLI — полноценная система для быстрой разработки на Vue.js, предоставляющая:
 
 - Интерактивное создание проекта через `@vue/cli`.
diff --git a/docs/ru/guide/installation.md b/docs/ru/guide/installation.md
index 90150989dd..4e28152933 100644
--- a/docs/ru/guide/installation.md
+++ b/docs/ru/guide/installation.md
@@ -1,10 +1,5 @@
 # Установка
 
-::: danger Предупреждение о предыдущих версиях
-Имя пакета изменилось с `vue-cli` на `@vue/cli`.
-Если у вас установлена глобально предыдущая версия пакета `vue-cli` (1.x или 2.x), то необходимо сначала удалить её командой `npm uninstall vue-cli -g` или `yarn global remove vue-cli`.
-:::
-
 ::: tip Требования к версии Node
 Vue CLI 4.x требуется [Node.js](https://nodejs.org/) версии 8.9 или выше (рекомендуется v10+). Управлять несколькими версиями Node на машине можно через [n](https://github.com/tj/n), [nvm](https://github.com/creationix/nvm) или [nvm-windows](https://github.com/coreybutler/nvm-windows).
 :::
diff --git a/docs/zh/guide/index.md b/docs/zh/guide/index.md
index 084b9d9795..f5a09a1b45 100644
--- a/docs/zh/guide/index.md
+++ b/docs/zh/guide/index.md
@@ -4,10 +4,6 @@ sidebarDepth: 0
 
 # 介绍
 
-::: warning 警告
-这份文档对应的是 `@vue/cli`。老版本的 `vue-cli` 文档请移步[这里](https://github.com/vuejs/vue-cli/tree/v2#vue-cli--)。
-:::
-
 Vue CLI 是一个基于 Vue.js 进行快速开发的完整系统，提供：
 
 - 通过 `@vue/cli` 实现的交互式的项目脚手架。
diff --git a/docs/zh/guide/installation.md b/docs/zh/guide/installation.md
index 6f33d71b12..17cc5768f6 100644
--- a/docs/zh/guide/installation.md
+++ b/docs/zh/guide/installation.md
@@ -1,10 +1,5 @@
 # 安装
 
-::: warning 关于旧版本
-Vue CLI 的包名称由 `vue-cli` 改成了 `@vue/cli`。
-如果你已经全局安装了旧版本的 `vue-cli` (1.x 或 2.x)，你需要先通过 `npm uninstall vue-cli -g` 或 `yarn global remove vue-cli` 卸载它。
-:::
-
 ::: tip Node 版本要求
 Vue CLI 4.x 需要 [Node.js](https://nodejs.org/) v8.9 或更高版本 (推荐 v10 以上)。你可以使用 [n](https://github.com/tj/n)，[nvm](https://github.com/creationix/nvm) 或 [nvm-windows](https://github.com/coreybutler/nvm-windows) 在同一台电脑中管理多个 Node 版本。
 :::

From 248f770f7c1adf28953b424b3b863a2115c2211d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 17 Aug 2022 15:22:28 +0800
Subject: [PATCH 43/47] docs: simplify message wording + message on landing
 page

---
 docs/.vitepress/theme/index.js | 26 +++++++++++---------------
 docs/index.md                  | 19 ++++---------------
 docs/zh/index.md               | 17 ++++-------------
 3 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/docs/.vitepress/theme/index.js b/docs/.vitepress/theme/index.js
index 50ca114c48..86aa96a8c6 100644
--- a/docs/.vitepress/theme/index.js
+++ b/docs/.vitepress/theme/index.js
@@ -30,9 +30,13 @@ export default {
 
 function notice_en() {
   return h('div', { class: 'warning custom-block' }, [
-    h('p', { class: 'custom-block-title' }, '⚠️ Notice'),
+    h(
+      'p',
+      { class: 'custom-block-title' },
+      '⚠️ Vue CLI is in Maintenance Mode!'
+    ),
     h('p', [
-      'Vue CLI is now in maintenance mode. For new projects, please use ',
+      'For new projects, it is now recommended to use ',
       h(
         'a',
         {
@@ -44,10 +48,6 @@ function notice_en() {
       ' to scaffold ',
       h('a', { href: 'https://vitejs.dev', target: '_blank' }, 'Vite'),
       '-based projects. ',
-      h('code', 'create-vue'),
-      ' supports both Vue 2 and Vue 3.'
-    ]),
-    h('p', [
       'Also refer to the ',
       h(
         'a',
@@ -64,9 +64,9 @@ function notice_en() {
 
 function notice_zh_cn() {
   return h('div', { class: 'warning custom-block' }, [
-    h('p', { class: 'custom-block-title' }, '⚠️ Notice'),
+    h('p', { class: 'custom-block-title' }, '⚠️ Vue CLI 现已处于维护模式!'),
     h('p', [
-      'Vue CLI 现已处于维护模式。新项目请使用 ',
+      '现在官方推荐使用 ',
       h(
         'a',
         {
@@ -77,16 +77,12 @@ function notice_zh_cn() {
       ),
       ' 来创建基于 ',
       h('a', { href: 'https://cn.vitejs.dev', target: '_blank' }, 'Vite'),
-      ' 的项目. ',
-      h('code', 'create-vue'),
-      ' 同时支持 Vue 2 和 Vue 3.'
-    ]),
-    h('p', [
-      '另外，请参考 ',
+      ' 的新项目。 ',
+      '另外请参考 ',
       h(
         'a',
         {
-          href: 'https://vuejs.org/guide/scaling-up/tooling.html',
+          href: 'https://cn.vuejs.org/guide/scaling-up/tooling.html',
           target: '_blank'
         },
         'Vue 3 工具链指南'
diff --git a/docs/index.md b/docs/index.md
index 7227867878..c321469d11 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,24 +3,13 @@ home: true
 heroImage: /favicon.png
 actionText: Get Started →
 actionLink: /guide/
-
-features:
-  - title: Feature Rich
-    details: Out-of-the-box support for Babel, TypeScript, ESLint, PostCSS, PWA, Unit Testing & End-to-end Testing.
-  - title: Extensible
-    details: The plugin system allows the community to build and share reusable solutions to common needs.
-  - title: No Need to Eject
-    details: Vue CLI is fully configurable without the need for ejecting. This allows your project to stay up-to-date for the long run.
-  - title: Graphical User Interface
-    details: Create, develop and manage your projects through an accompanying graphical user interface.
-  - title:
-    details:
-  - title: Future Ready
-    details: Effortlessly ship native ES2015 code for modern browsers, or build your vue components as native web components.
-
 footer: MIT Licensed | Copyright © 2018-present Evan You
 ---
 
+:::warning Vue CLI is in Maintenance Mode!
+For new projects, please use [create-vue](https://github.com/vuejs/create-vue) to scaffold [Vite](https://vitejs.dev/)-based projects. Also refer to the [Vue 3 Tooling Guide](https://vuejs.org/guide/scaling-up/tooling.html) for the latest recommendations.
+:::
+
 ## Getting Started
 
 Install:
diff --git a/docs/zh/index.md b/docs/zh/index.md
index b8772dbe5b..333472410d 100644
--- a/docs/zh/index.md
+++ b/docs/zh/index.md
@@ -3,22 +3,13 @@ home: true
 heroImage: /favicon.png
 actionText: 起步 →
 actionLink: /zh/guide/
-features:
-- title: 功能丰富
-  details: 对 Babel、TypeScript、ESLint、PostCSS、PWA、单元测试和 End-to-end 测试提供开箱即用的支持。
-- title: 易于扩展
-  details: 它的插件系统可以让社区根据常见需求构建和共享可复用的解决方案。
-- title: 无需 Eject
-  details: Vue CLI 完全是可配置的，无需 eject。这样你的项目就可以长期保持更新了。
-- title: CLI 之上的图形化界面
-  details: 通过配套的图形化界面创建、开发和管理你的项目。
-- title: 即刻创建原型
-  details: 用单个 Vue 文件即刻实践新的灵感。
-- title: 面向未来
-  details: 为现代浏览器轻松产出原生的 ES2015 代码，或将你的 Vue 组件构建为原生的 Web Components 组件。
 footer: MIT Licensed | Copyright © 2018-present Evan You
 ---
 
+:::warning Vue CLI 现已处于维护模式!
+现在官方推荐使用 [create-vue](https://github.com/vuejs/create-vue) 来创建基于 [Vite](https://vitejs.dev/) 的新项目。另外请参考 [Vue 3 工具链指南](https://cn.vuejs.org/guide/scaling-up/tooling.html) 以了解最新的工具推荐。
+:::
+
 ## 起步
 
 安装：

From e63681735f01e5f22f0791251683c8418aa2aa8e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 17 Aug 2022 15:38:27 +0800
Subject: [PATCH 44/47] docs: revert vitepress version

---
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 24b08604cf..a2c1f44926 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "typescript": "~4.5.5",
     "verdaccio": "^5.0.1",
     "vite-plugin-pwa": "^0.11.3",
-    "vitepress": "^0.22.4",
+    "vitepress": "^0.20.10",
     "webpack": "^5.54.0",
     "yorkie": "^2.0.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 8a074dc22e..c48eacde12 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1453,12 +1453,12 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@docsearch/css@3.2.1", "@docsearch/css@^3.0.0":
+"@docsearch/css@3.2.1", "@docsearch/css@^3.0.0-alpha.41":
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.2.1.tgz#c05d7818b0e43b42f9efa2d82a11c36606b37b27"
   integrity sha512-gaP6TxxwQC+K8D6TRx5WULUWKrcbzECOPA2KCVMuI+6C7dNiGUk5yXXzVhc5sld79XKYLnO9DRTI4mjXDYkh+g==
 
-"@docsearch/js@^3.0.0":
+"@docsearch/js@^3.0.0-alpha.41":
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/@docsearch/js/-/js-3.2.1.tgz#d6856fb6223c7a47091640264d5144d59806bc30"
   integrity sha512-H1PekEtSeS0msetR2YGGey2w7jQ2wAKfGODJvQTygSwMgUZ+2DHpzUgeDyEBIXRIfaBcoQneqrzsljM62pm6Xg==
@@ -4358,7 +4358,7 @@
   resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-6.0.0-6-next.16.tgz#f88f555b502636c37ec1722d832c6fd826b63892"
   integrity sha512-FbYl3273qaA0/fRwrvE876/HuvU81zjsnR70rCEojBelDuddl3xbY1LVdvthCjUGuIj2SUNpTzGhyROdqHJUCg==
 
-"@vitejs/plugin-vue@^2.3.2":
+"@vitejs/plugin-vue@^2.0.0":
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-2.3.4.tgz#966a6279060eb2d9d1a02ea1a331af071afdcf9e"
   integrity sha512-IfFNbtkbIm36O9KB8QodlwwYvTEsJb4Lll4c2IwB3VHc2gie2mSPtSzL0eYay7X2jd/2WX02FjSGTWR6OPr/zg==
@@ -20211,7 +20211,7 @@ vite-plugin-pwa@^0.11.3:
     workbox-build "^6.4.2"
     workbox-window "^6.4.2"
 
-vite@^2.9.7:
+vite@^2.7.0:
   version "2.9.15"
   resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.15.tgz#2858dd5b2be26aa394a283e62324281892546f0b"
   integrity sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ==
@@ -20223,17 +20223,17 @@ vite@^2.9.7:
   optionalDependencies:
     fsevents "~2.3.2"
 
-vitepress@^0.22.4:
-  version "0.22.4"
-  resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-0.22.4.tgz#d4d778fb06decfc2c31c105f6a7a136843cdfb08"
-  integrity sha512-oZUnLO/SpYdThaBKefDeOiVlr0Rie4Ppx3FzMnMyLtJnI5GlBMNjqYqMy/4+umm/iC+ZDJfI+IlDKxv5fZnYzA==
+vitepress@^0.20.10:
+  version "0.20.10"
+  resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-0.20.10.tgz#18266182aee192191db76f63b68203eea3ac148d"
+  integrity sha512-dKgH6k1yxdEjIIxoXGI0vMg3lpBLvMarre/vvt4beuxd+rXOUB1a7DAtXDmgIXOMGQ7IcF+4zyd2132IedhjtQ==
   dependencies:
-    "@docsearch/css" "^3.0.0"
-    "@docsearch/js" "^3.0.0"
-    "@vitejs/plugin-vue" "^2.3.2"
+    "@docsearch/css" "^3.0.0-alpha.41"
+    "@docsearch/js" "^3.0.0-alpha.41"
+    "@vitejs/plugin-vue" "^2.0.0"
     prismjs "^1.25.0"
-    vite "^2.9.7"
-    vue "^3.2.33"
+    vite "^2.7.0"
+    vue "^3.2.26"
 
 vscode-jsonrpc@^4.0.0:
   version "4.0.0"
@@ -20500,7 +20500,7 @@ vue@^2.6.14:
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
   integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
 
-vue@^3.2.33:
+vue@^3.2.26:
   version "3.2.37"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.37.tgz#da220ccb618d78579d25b06c7c21498ca4e5452e"
   integrity sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==

From ea4c98ae84f20d410126707a1defc58a33998e8b Mon Sep 17 00:00:00 2001
From: chlorine <nicksonlvqq@gmail.com>
Date: Sun, 4 Sep 2022 12:33:55 +0800
Subject: [PATCH 45/47] fix: pnpm v7 install error (#7265)

---
 packages/@vue/cli/lib/Creator.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@vue/cli/lib/Creator.js b/packages/@vue/cli/lib/Creator.js
index 05e1754ecd..d502972517 100644
--- a/packages/@vue/cli/lib/Creator.js
+++ b/packages/@vue/cli/lib/Creator.js
@@ -167,7 +167,8 @@ module.exports = class Creator extends EventEmitter {
     // generate a .npmrc file for pnpm, to persist the `shamefully-flatten` flag
     if (packageManager === 'pnpm') {
       const pnpmConfig = hasPnpmVersionOrLater('4.0.0')
-        ? 'shamefully-hoist=true\n'
+        // pnpm v7 makes breaking change to set strict-peer-dependencies=true by default, which may cause some problems when installing
+        ? 'shamefully-hoist=true\nstrict-peer-dependencies=false\n'
         : 'shamefully-flatten=true\n'
 
       await writeFileTree(context, {

From f0f254e4bc81ed322eeb9f7de346e987e845068e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Nov 2022 10:58:56 +0800
Subject: [PATCH 46/47] chore(deps): bump loader-utils from 1.4.0 to 1.4.1
 (#7324)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c48eacde12..cb1bbd2f41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13886,9 +13886,9 @@ loader-runner@^4.1.0, loader-runner@^4.2.0:
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
 loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
+  integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -14760,11 +14760,16 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.1.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
+minimist@^1.2.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"

From cfde3e7847945dfc502a921b8f2ee9e2a4fb1f85 Mon Sep 17 00:00:00 2001
From: kenzo104 <121165043+kenzo104@users.noreply.github.com>
Date: Wed, 5 Jul 2023 02:04:48 -1100
Subject: [PATCH 47/47] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 0962eaf2fa..f6a9cd28c1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+hi there
+
 # Vue CLI [![Build Status](https://circleci.com/gh/vuejs/vue-cli/tree/dev.svg?style=shield)](https://circleci.com/gh/vuejs/vue-cli/tree/dev) [![Windows Build status](https://ci.appveyor.com/api/projects/status/rkpafdpdwie9lqx0/branch/dev?svg=true)](https://ci.appveyor.com/project/yyx990803/vue-cli/branch/dev) [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
 
 ## ⚠️ Status