[DEPENDENCY] Bump js-yaml from 3.14.1 to 4.0.0 (#402)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthias Osswald <mat.osswald@sap.com>

lib/cli/commands/init.js

@@ -20,7 +20,7 @@ initCommand.handler = async function() {
 	}
 
 	const projectConfig = await init.init();
-	const yaml = jsYaml.safeDump(projectConfig);
+	const yaml = jsYaml.dump(projectConfig);
 
 	await writeFile(yamlPath, yaml);
 	console.log(`Wrote ui5.yaml to ${yamlPath}:\n`);

lib/framework/updateYaml.js

@@ -1,20 +1,12 @@
 const path = require("path");
 const log = require("@ui5/logger").getLogger("cli:framework:updateYaml");
-const {loadAll, safeDump, DEFAULT_SAFE_SCHEMA} = require("js-yaml");
+const {loadAll, dump} = require("js-yaml");
 const {fromYaml, getPosition, getValue} = require("data-with-position");
 
-function safeLoadAll({configFile, configPath}) {
-	// Using loadAll with DEFAULT_SAFE_SCHEMA instead of safeLoadAll to pass "filename".
-	// safeLoadAll doesn't handle its parameters properly.
-	// See https://github.com/nodeca/js-yaml/issues/456 and https://github.com/nodeca/js-yaml/pull/381
-	return loadAll(configFile, undefined, {
-		filename: configPath,
-		schema: DEFAULT_SAFE_SCHEMA
-	});
-}
-
 function getProjectYamlDocument({project, configFile, configPath}) {
-	const configs = safeLoadAll({configFile, configPath});
+	const configs = loadAll(configFile, undefined, {
+		filename: configPath
+	});
 
 	const projectDocumentIndex = configs.findIndex((config) => {
 		return config.metadata && config.metadata.name === project.metadata.name;
@@ -138,7 +130,7 @@ function formatValue(value, indent) {
 		return string;
 	} else if (Array.isArray(value)) {
 		const indentString = " ".repeat(indent);
-		const string = safeDump(value);
+		const string = dump(value);
 		const arr = string.split("\n");
 		arr.pop();
 		return "\n" + indentString + arr.join("\n" + indentString) + "\n";
@@ -261,7 +253,7 @@ module.exports = async function({project, data}) {
 
 	// Validate content before writing
 	try {
-		safeLoadAll({configFile: adoptedYaml});
+		loadAll(adoptedYaml);
 	} catch (err) {
 		const error = new Error("Failed to update YAML file: " + err.message);
 		error.name = "FrameworkUpdateYamlFailed";

package.json

@@ -115,7 +115,7 @@
 		"chalk": "^4.1.0",
 		"data-with-position": "^0.4.1",
 		"import-local": "^3.0.2",
-		"js-yaml": "^3.14.1",
+		"js-yaml": "^4.0.0",
 		"open": "^7.4.2",
 		"semver": "^7.3.4",
 		"treeify": "^1.0.1",

test/lib/cli/commands/init.js

@@ -23,7 +23,7 @@ test.serial("Writes ui5.yaml to fs", async (t) => {
 	mock("path", {resolve: () => ui5YamlPath});
 	sinon.stub(fsHelper, "exists").resolves(false);
 	sinon.stub(init, "init").resolves({});
-	sinon.stub(jsYaml, "safeDump").returns(ui5Yaml);
+	sinon.stub(jsYaml, "dump").returns(ui5Yaml);
 	const fsWriteFileStub = sinon.stub(fs, "writeFile").callsArgWith(2);
 
 	await initCommand.handler({});

test/lib/framework/updateYaml.js

@@ -791,9 +791,13 @@ framework: { name: "SAPUI5" }
 	}));
 
 	t.is(error.message,
-		"Failed to update YAML file: bad indentation of a mapping entry at line 5, column 14:\n" +
-		"                 version: \"1.76.0\"\n" +
-		"                 ^"
+		`Failed to update YAML file: bad indentation of a mapping entry (5:14)\n` +
+		`\n` +
+		` 2 | metadata:\n` +
+		` 3 |   name: my-project\n` +
+		` 4 | framework: { name: "SAPUI5" }\n` +
+		` 5 |              version: "1.76.0"\n` +
+		`------------------^`
 	);
 	t.is(t.context.fsWriteFileStub.callCount, 0, "fs.writeFile should not be called");
 });