Update tsc incompatible errors

microsoft · Aug 21, 2023 · 7ab4f6c · 7ab4f6c
1 parent 302b3a8
commit 7ab4f6c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/node/internal.ts b/node/internal.ts
@@ -507,7 +507,12 @@ function _tryGetExecutablePath(filePath: string, extensions: string[]): string {
 //     R   W  X  R  W X R W X
 //   256 128 64 32 16 8 4 2 1
 function isUnixExecutable(stats: fs.Stats) {
-    return (stats.mode & 1) > 0 || ((stats.mode & 8) > 0 && stats.gid === process.getgid()) || ((stats.mode & 64) > 0 && stats.uid === process.getuid());
+    const uid = process.getuid?.(); // Use optional chaining here
+    const gid = process.getgid?.(); 
+
+    return (stats.mode & 1) > 0 ||
+        ((stats.mode & 8) > 0 && gid !== undefined && stats.gid === gid) ||
+        ((stats.mode & 64) > 0 && uid !== undefined && stats.uid === uid);
 }
 
 export function _legacyFindFiles_convertPatternToRegExp(pattern: string): RegExp {

diff --git a/node/package-lock.json b/node/package-lock.json
diff --git a/node/package.json b/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-pipelines-task-lib",
-  "version": "4.4.0",
+  "version": "5.4.0",
   "description": "Azure Pipelines Task SDK",
   "main": "./task.js",
   "typings": "./task.d.ts",
@@ -42,7 +42,7 @@
     "@types/node": "^20.3.1",
     "@types/q": "^1.5.4",
     "@types/semver": "^7.3.4",
-    "@types/shelljs": "^0.8.8",
+    "@types/shelljs": "^0.8.12",
     "mocha": "^9.2.2",
     "typescript": "^5.1.6"
   }

diff --git a/node/task.ts b/node/task.ts
@@ -781,7 +781,8 @@ export function mkdirP(p: string): void {
     let testDir: string = p;
     while (true) {
         // validate the loop is not out of control
-        if (stack.length >= (process.env['TASKLIB_TEST_MKDIRP_FAILSAFE'] || 1000)) {
+        const failsafeLimit = parseInt(process.env['TASKLIB_TEST_MKDIRP_FAILSAFE'] || '1000', 10);
+        if (stack.length >= failsafeLimit) {
             // let the framework throw
             debug('loop is out of control');
             fs.mkdirSync(p);

diff --git a/node/toolrunner.ts b/node/toolrunner.ts
@@ -1066,7 +1066,7 @@ class ExecState extends events.EventEmitter {
     private delay = 10000; // 10 seconds
     private done: boolean;
     private options: IExecOptions;
-    private timeout: NodeJS.Timer | null = null;
+    private timeout: NodeJS.Timeout | null = null;
     private toolPath: string;
 
     public CheckComplete(): void {