From 867099725892ffaaf30aaa9fffbae2ea75726c75 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Tue, 23 Feb 2021 15:44:02 +0800
Subject: [PATCH] chore: bump js-yaml version

---
 .../cli-ui/apollo-server/connectors/configurations.js     | 4 ++--
 packages/@vue/cli-ui/package.json                         | 2 +-
 packages/@vue/cli/__tests__/invoke.spec.js                | 8 ++++----
 packages/@vue/cli/lib/util/configTransforms.js            | 4 ++--
 packages/@vue/cli/package.json                            | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/@vue/cli-ui/apollo-server/connectors/configurations.js b/packages/@vue/cli-ui/apollo-server/connectors/configurations.js
index 3890377d3b..7b15f2cb0c 100644
--- a/packages/@vue/cli-ui/apollo-server/connectors/configurations.js
+++ b/packages/@vue/cli-ui/apollo-server/connectors/configurations.js
@@ -77,7 +77,7 @@ function readFile (config, fileDescriptor, context) {
       if (file.type === 'json') {
         fileData = JSON.parse(rawContent)
       } else if (file.type === 'yaml') {
-        fileData = yaml.safeLoad(rawContent)
+        fileData = yaml.load(rawContent)
       }
     }
   }
@@ -121,7 +121,7 @@ function writeFile (config, fileId, data, changedFields, context) {
     if (file.type === 'json') {
       rawContent = JSON.stringify(data, null, 2)
     } else if (file.type === 'yaml') {
-      rawContent = yaml.safeDump(data)
+      rawContent = yaml.dump(data)
     } else if (file.type === 'js') {
       const source = fs.readFileSync(file.path, { encoding: 'utf8' })
       if (!source.trim()) {
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 1ee482df67..e0655f6a67 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -49,7 +49,7 @@
     "graphql-tag": "^2.10.3",
     "graphql-type-json": "^0.3.1",
     "javascript-stringify": "^2.0.1",
-    "js-yaml": "^3.14.1",
+    "js-yaml": "^4.0.0",
     "lodash.merge": "^4.6.1",
     "lowdb": "^1.0.0",
     "lru-cache": "^6.0.0",
diff --git a/packages/@vue/cli/__tests__/invoke.spec.js b/packages/@vue/cli/__tests__/invoke.spec.js
index 6aceee2ba3..2b7137ab91 100644
--- a/packages/@vue/cli/__tests__/invoke.spec.js
+++ b/packages/@vue/cli/__tests__/invoke.spec.js
@@ -134,8 +134,8 @@ test('invoke with existing files (yaml)', async () => {
   await project.write(`.eslintrc.yml`, `
 root: true
 extends:
-  - 'plugin:vue/essential'
-  - 'eslint:recommended'
+  - plugin:vue/essential
+  - eslint:recommended
   `.trim())
 
   await project.run(`${require.resolve('../bin/vue')} invoke eslint --config airbnb`)
@@ -143,8 +143,8 @@ extends:
   const updated = await project.read('.eslintrc.yml')
   expect(updated).toMatch(`
 extends:
-  - 'plugin:vue/essential'
-  - 'eslint:recommended'
+  - plugin:vue/essential
+  - eslint:recommended
   - '@vue/airbnb'
 `.trim())
 })
diff --git a/packages/@vue/cli/lib/util/configTransforms.js b/packages/@vue/cli/lib/util/configTransforms.js
index 2d535c4ca5..adf4c08ad5 100644
--- a/packages/@vue/cli/lib/util/configTransforms.js
+++ b/packages/@vue/cli/lib/util/configTransforms.js
@@ -48,9 +48,9 @@ const transformJSON = {
 }
 
 const transformYAML = {
-  read: ({ source }) => require('js-yaml').safeLoad(source),
+  read: ({ source }) => require('js-yaml').load(source),
   write: ({ value, existing }) => {
-    return require('js-yaml').safeDump(merge(existing, value, mergeOptions), {
+    return require('js-yaml').dump(merge(existing, value, mergeOptions), {
       skipInvalid: true
     })
   }
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
index db4451673e..e97ed72425 100644
--- a/packages/@vue/cli/package.json
+++ b/packages/@vue/cli/package.json
@@ -45,7 +45,7 @@
     "inquirer": "^7.1.0",
     "isbinaryfile": "^4.0.6",
     "javascript-stringify": "^2.0.1",
-    "js-yaml": "^3.14.1",
+    "js-yaml": "^4.0.0",
     "leven": "^3.1.0",
     "lodash.clonedeep": "^4.5.0",
     "lru-cache": "^6.0.0",