Resolve vulnerabilities (#401)

* Resolve vulnerabilities * fix updated mkdirp usage mkdirp major bump caused breaking changes, which broke some commands * fix shelljs types Co-authored-by: DaniilShmelev <[email protected]>
microsoft · Feb 18, 2022 · 30ffb29 · 30ffb29
1 parent d49fb32
commit 30ffb29
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 63 deletions.
diff --git a/app/exec/extension/_lib/loc.ts b/app/exec/extension/_lib/loc.ts
@@ -69,15 +69,7 @@ export namespace LocPrep {
 				}
 			})
 			.then(determinedPath => {
-				return new Promise((resolve, reject) => {
-					mkdirp(path.dirname(determinedPath), (err, made) => {
-						if (err) {
-							reject(err);
-						} else {
-							resolve(made);
-						}
-					});
-				}).then(() => {
+				return mkdirp(path.dirname(determinedPath)).then(() => {
 					return promisify(writeFile)(determinedPath, JSON.stringify(resources, null, 4), "utf8");
 				});
 			});

diff --git a/app/exec/extension/_lib/vsix-writer.ts b/app/exec/extension/_lib/vsix-writer.ts
@@ -128,7 +128,7 @@ export class VsixWriter {
 				throw new Error("--output-path must be a directory when using --metadata-only.");
 			}
 			if (!pathExists) {
-				await promisify(mkdirp)(outputPath, undefined);
+				await mkdirp(outputPath);
 			}
 
 			for (const builder of this.manifestBuilders) {
@@ -138,7 +138,7 @@ export class VsixWriter {
 						const content = fileObj.content || (await promisify(readFile)(fileObj.path, "utf-8"));
 						const writePath = path.join(this.settings.outputPath, fileObj.partName);
 						const folder = path.dirname(writePath);
-						await promisify(mkdirp)(folder, undefined);
+						await mkdirp(folder);
 						await promisify(writeFile)(writePath, content, "utf-8");
 					}
 				}
@@ -245,15 +245,7 @@ export class VsixWriter {
 		return Promise.all(builderPromises).then(() => {
 			trace.debug("Writing vsix to: %s", outputPath);
 
-			return new Promise((resolve, reject) => {
-				mkdirp(path.dirname(outputPath), (err, made) => {
-					if (err) {
-						reject(err);
-					} else {
-						resolve(made);
-					}
-				});
-			}).then(async () => {
+			return mkdirp(path.dirname(outputPath)).then(async () => {
 				let buffer = await vsix.generateAsync({
 					type: "nodebuffer",
 					compression: "DEFLATE",

diff --git a/app/exec/extension/init.ts b/app/exec/extension/init.ts
@@ -465,15 +465,7 @@ export class ExtensionInit extends extBase.ExtensionBase<InitResult> {
 
 	private async createFolderIfNotExists(folderPath: string) {
 		try {
-			await new Promise((resolve, reject) => {
-				mkdirp(folderPath, err => {
-					if (err) {
-						reject(err);
-					} else {
-						resolve();
-					}
-				});
-			});
+			await mkdirp(folderPath);
 		} catch {
 			// folder already exists, perhaps. Or maybe we can't write to it.
 		}

diff --git a/app/lib/jsonvalidate.ts b/app/lib/jsonvalidate.ts
@@ -1,7 +1,6 @@
 import { defer } from "./promiseUtils";
 
 var fs = require("fs");
-var shell = require("shelljs");
 var check = require("validator");
 var trace = require("./trace");
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tfx-cli",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "CLI for Azure DevOps Services and Team Foundation Server",
   "repository": {
     "type": "git",
@@ -30,17 +30,17 @@
     "jszip": "^3.7.1",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.4",
     "onecolor": "^2.5.0",
     "os-homedir": "^1.0.1",
     "prompt": "^1.2.0",
     "read": "^1.0.6",
-    "shelljs": "^0.5.1",
+    "shelljs": "^0.8.5",
     "tmp": "0.0.26",
     "tracer": "0.7.4",
     "util.promisify": "^1.0.0",
     "uuid": "^3.0.1",
-    "validator": "^3.43.0",
+    "validator": "^13.7.0",
     "winreg": "0.0.12",
     "xml2js": "^0.4.16"
   },
@@ -50,9 +50,9 @@
     "@types/jju": "^1.4.1",
     "@types/jszip": "~3.1.2",
     "@types/lodash": "~4.14.110",
-    "@types/mkdirp": "^0.3.28",
+    "@types/mkdirp": "^1.0.2",
     "@types/node": "~8.5.1",
-    "@types/shelljs": "^0.3.30",
+    "@types/shelljs": "^0.8.11",
     "@types/uuid": "^2.0.29",
     "@types/validator": "^4.5.27",
     "@types/winreg": "^1.2.29",