Port code changes from commit bbc5570 - update dependencies and modernize URL parsing

Co-authored-by: tarunramsinghani <2929463+tarunramsinghani@users.noreply.github.com>

Author: Copilot

app/exec/build/tasks/create.ts

@@ -5,7 +5,7 @@ import path = require("path");
 import shell = require("shelljs");
 import tasksBase = require("./default");
 import trace = require("../../../lib/trace");
-import uuid = require("uuid");
+import { v1 as uuidv1 } from "uuid";
 
 export interface TaskCreateResult {
 	taskPath: string;
@@ -81,7 +81,7 @@ export class TaskCreate extends tasksBase.BuildTaskBase<TaskCreateResult> {
 
 			trace.debug("creating definition");
 			let def: any = {};
-			def.id = uuid.v1();
+			def.id = uuidv1();
 			trace.debug("id: " + def.id);
 			def.name = taskName;
 			trace.debug("name: " + def.name);

app/exec/extension/_lib/merger.ts

@@ -13,7 +13,7 @@ import {
 import { forwardSlashesPath, toZipItemName } from "./utils";
 import _ = require("lodash");
 import fs = require("fs");
-import glob = require("glob");
+import { glob } from "glob";
 import jju = require("jju");
 import jsonInPlace = require("json-in-place");
 import loc = require("./loc");
@@ -56,18 +56,7 @@ export class Merger {
 			const globs = this.settings.manifestGlobs.map(p => (path.isAbsolute(p) ? p : path.join(this.settings.root, p)));
 
 			trace.debug("merger.gatherManifestsFromGlob");
-			const promises = globs.map(
-				pattern =>
-					new Promise<string[]>((resolve, reject) => {
-						glob(pattern, (err, matches) => {
-							if (err) {
-								reject(err);
-							} else {
-								resolve(matches);
-							}
-						});
-					}),
-			);
+			const promises = globs.map(pattern => glob(pattern));
 
 			return Promise.all(promises)
 				.then(results => _.uniq(_.flatten<string>(results)))
@@ -104,7 +93,7 @@ export class Merger {
 
 		// build environment object from --env parameter
 		const env = {};
-		(this.settings.env || []).forEach(kvp => { 
+		(this.settings.env || []).forEach(kvp => {
 			const [key, ...value] = kvp.split('=');
 			env[key] = value.join('=');
 		});
@@ -119,7 +108,7 @@ export class Merger {
 			throw new Error(`The export function from manifest-js file ${fullJsFile} must return the manifest object`)
 		}
 		return manifestData;
-	}	
+	}
 
 	/**
 	 * Finds all manifests and merges them into two JS Objects: vsoManifest and vsixManifest
@@ -413,9 +402,9 @@ export class Merger {
 	private async validateBuildTaskContributions(contributions: any[]): Promise<void> {
 		try {
 			// Filter contributions to only build tasks
-			const buildTaskContributions = contributions.filter(contrib => 
-				contrib.type === "ms.vss-distributed-task.task" && 
-				contrib.properties && 
+			const buildTaskContributions = contributions.filter(contrib =>
+				contrib.type === "ms.vss-distributed-task.task" &&
+				contrib.properties &&
 				contrib.properties.name
 			);
 

app/lib/connection.ts

@@ -1,20 +1,33 @@
 import { BasicCredentialHandler } from "azure-devops-node-api/handlers/basiccreds";
 
-import url = require("url");
 import apim = require("azure-devops-node-api/WebApi");
 import apibasem = require("azure-devops-node-api/interfaces/common/VsoBaseInterfaces");
 import trace = require("./trace");
 
 export class TfsConnection {
-	private parsedUrl: url.Url;
+	private parsedUrl: URL;
 
 	private accountUrl: string;
 	private collectionUrl: string;
 
 	constructor(private serviceUrl: string) {
-		this.parsedUrl = url.parse(this.serviceUrl);
+		// Parse URL, but handle failures gracefully to mimic url.parse() behavior
+		try {
+			this.parsedUrl = new URL(this.serviceUrl);
+		} catch (error) {
+			// Mimic url.parse() behavior for invalid URLs
+			// url.parse() would return an object with null/empty values instead of throwing
+			this.parsedUrl = {
+				protocol: this.serviceUrl && this.serviceUrl.includes('://') ? this.serviceUrl.split('://')[0] + ':' : '',
+				host: null,
+				hostname: null,
+				pathname: this.serviceUrl && !this.serviceUrl.includes('://') ? this.serviceUrl : '',
+				search: '',
+				hash: ''
+			} as any;
+		}
 
-		var splitPath: string[] = this.parsedUrl.path.split("/").slice(1);
+		var splitPath: string[] = this.parsedUrl.pathname.split("/").slice(1);
 		this.accountUrl = this.parsedUrl.protocol + "//" + this.parsedUrl.host;
 
 		if (splitPath.length === 2 && splitPath[0] === "tfs") {

package.json

@@ -19,27 +19,27 @@
     "prepublishOnly": "npm run build",
     "build:tests": "tsc -p tsconfig.tests.json",
     "postbuild:tests": "ncp tests/build-samples _tests/build-samples && ncp tests/extension-samples _tests/extension-samples",
-  "test": "npm run build:tests && mocha \"_tests/tests/**/*.js\"",
-  "test:ci": "npm run build:tests && mocha \"_tests/tests/**/*.js\" --reporter xunit --reporter-options output=test-results.xml",
-  "test:commandline": "npm run build:tests && mocha \"_tests/tests/commandline.js\"",
-  "test:server-integration": "npm run build:tests && mocha \"_tests/tests/server-integration-*.js\"",
-  "test:focused-login": "npm run build:tests && mocha \"_tests/tests/focused-login-test.js\"",
-  "test:server-integration-login": "npm run build:tests && mocha \"_tests/tests/server-integration-login.js\"",
-  "test:server-integration-workitem": "npm run build:tests && mocha \"_tests/tests/server-integration-workitem.js\"",
-  "test:build-local": "npm run build:tests && mocha \"_tests/tests/build-local-tests.js\"",
-  "test:build-server-integration": "npm run build:tests && mocha \"_tests/tests/build-server-integration-tests.js\"",
-  "test:build-consolidated": "npm run test:build-local && npm run test:build-server-integration",
-  "test:extension-local": "npm run build:tests && mocha \"_tests/tests/extension-local-tests.js\"",
-  "test:extension-server-integration": "npm run build:tests && mocha \"_tests/tests/extension-server-integration-tests.js\"",
-  "test:extension-consolidated": "npm run test:extension-local && npm run test:extension-server-integration"
+    "test": "npm run build:tests && mocha \"_tests/tests/**/*.js\"",
+    "test:ci": "npm run build:tests && mocha \"_tests/tests/**/*.js\" --reporter xunit --reporter-options output=test-results.xml",
+    "test:commandline": "npm run build:tests && mocha \"_tests/tests/commandline.js\"",
+    "test:server-integration": "npm run build:tests && mocha \"_tests/tests/server-integration-*.js\"",
+    "test:focused-login": "npm run build:tests && mocha \"_tests/tests/focused-login-test.js\"",
+    "test:server-integration-login": "npm run build:tests && mocha \"_tests/tests/server-integration-login.js\"",
+    "test:server-integration-workitem": "npm run build:tests && mocha \"_tests/tests/server-integration-workitem.js\"",
+    "test:build-local": "npm run build:tests && mocha \"_tests/tests/build-local-tests.js\"",
+    "test:build-server-integration": "npm run build:tests && mocha \"_tests/tests/build-server-integration-tests.js\"",
+    "test:build-consolidated": "npm run test:build-local && npm run test:build-server-integration",
+    "test:extension-local": "npm run build:tests && mocha \"_tests/tests/extension-local-tests.js\"",
+    "test:extension-server-integration": "npm run build:tests && mocha \"_tests/tests/extension-server-integration-tests.js\"",
+    "test:extension-consolidated": "npm run test:extension-local && npm run test:extension-server-integration"
   },
   "dependencies": {
     "app-root-path": "1.0.0",
-    "archiver": "2.0.3",
+    "archiver": "^7.0.1",
     "azure-devops-node-api": "^14.0.0",
     "clipboardy": "^4.0.0",
     "colors": "~1.3.0",
-    "glob": "7.1.2",
+    "glob": "^11.0.3",
     "jju": "^1.4.0",
     "json-in-place": "^1.0.1",
     "jszip": "^3.10.1",
@@ -50,32 +50,30 @@
     "os-homedir": "^1.0.1",
     "prompt": "^1.3.0",
     "read": "^1.0.6",
-    "shelljs": "^0.8.5",
+    "shelljs": "^0.10.0",
     "tmp": "^0.2.4",
     "tracer": "0.7.4",
     "util.promisify": "^1.0.0",
-    "uuid": "^3.0.1",
+    "uuid": "^13.0.0",
     "validator": "^13.7.0",
     "winreg": "0.0.12",
     "xml2js": "^0.5.0"
   },
   "devDependencies": {
     "@types/clipboardy": "~1.1.0",
-    "@types/glob": "^5.0.29",
     "@types/jju": "^1.4.1",
     "@types/jszip": "~3.1.2",
     "@types/lodash": "~4.14.110",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^10.0.0",
     "@types/node": "8.10.66",
     "@types/shelljs": "^0.8.11",
-    "@types/uuid": "^2.0.29",
     "@types/validator": "^4.5.27",
     "@types/winreg": "^1.2.29",
     "@types/xml2js": "0.0.27",
-    "mocha": "^10.2.0",
+    "mocha": "^11.7.3",
     "ncp": "^2.0.0",
-    "rimraf": "^2.6.1",
+    "rimraf": "^6.0.1",
     "typescript": "^4.9.5"
   },
   "engines": {