Merging support for latest eslint/tslint

microsoft · Jan 7, 2025 · 2a2215e · 2a2215e
2 parents daa3e70 + 5b11e86
commit 2a2215e
Show file tree

Hide file tree

Showing 46 changed files with 4,007 additions and 3,361 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "cSpell.words": [
+        "uuidv"
+    ],
+    "eslint.useFlatConfig": true
+}
diff --git a/BuildTasks/Common/v4/Common.ts b/BuildTasks/Common/v4/Common.ts
@@ -5,10 +5,10 @@ import * as tl from "azure-pipelines-task-lib/task";
 import * as trl from "azure-pipelines-task-lib/toolrunner";
 import * as fse from "fs-extra";
 import ToolRunner = trl.ToolRunner;
-import * as uuidv5 from "uuidv5";
+import uuidv5 from "uuidv5";
 import * as tmp from "tmp";
 
-function writeBuildTempFile(taskName: string, data: any): string {
+function writeBuildTempFile(taskName: string, data: string | Buffer): string {
     const tempDir = tl.getVariable("Agent.TempDirectory");
     const tempFile = tmp.tmpNameSync({ prefix: taskName, postfix: ".tmp", tmpdir: tempDir });
 
@@ -78,11 +78,11 @@ export function validateAndSetTfxManifestArguments(tfx: ToolRunner): (() => void
 
             if (!matchingVsixFile || matchingVsixFile.length === 0) {
                 tl.setResult(tl.TaskResult.Failed, `Found no vsix files matching: ${vsixFilePattern}.`);
-                throw "failed";
+                throw new Error("failed");
             }
             if (matchingVsixFile.length !== 1) {
                 tl.setResult(tl.TaskResult.Failed, `Found multiple vsix files matching: ${vsixFilePattern}.`);
-                throw "failed";
+                throw new Error("failed");
             }
             tfx.arg(["--vsix", matchingVsixFile[0]]);
             break;
@@ -293,7 +293,7 @@ export class TfxJsonOutputStream extends stream.Writable {
         super();
     }
 
-    // eslint-disable-next-line @typescript-eslint/ban-types
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     _write(chunk: any, enc: string, cb: (Function)) : void {
         const chunkStr: string = chunk.toString();
         if (chunkStr.startsWith("[command]"))
@@ -544,3 +544,15 @@ export function writeManifest(manifest: any, path: string): Promise<void> {
 export function checkUpdateTasksManifests(manifestFile?: string): Promise<void> {
     return updateManifests(manifestFile ? [manifestFile] : []);
 }
+
+export default {
+    validateAndSetTfxManifestArguments,
+    runTfx,
+    getExtensionVersion,
+    getMarketplaceEndpointDetails,
+    setTfxMarketplaceArguments,
+    TfxJsonOutputStream,
+    updateManifests,
+    writeManifest,
+    checkUpdateTasksManifests
+};
diff --git a/BuildTasks/Common/v4/tsconfig.json b/BuildTasks/Common/v4/tsconfig.json
@@ -3,5 +3,9 @@
     "compilerOptions": {
         "outDir": "./Common", 
         "sourceRoot": "./"
-    }
+    },
+    "files": [
+        "Common.ts",
+        "uuidv5.d.ts"
+    ]
   }
diff --git a/BuildTasks/Common/v4/uuidv5.d.ts b/BuildTasks/Common/v4/uuidv5.d.ts
@@ -12,6 +12,6 @@ declare module 'uuidv5' {
         createUUIDv5: createUUIDv5;
         spaces: space;
     }
-    const exp: createUUIDv5;
-    export = exp;
+    const createUUIDv5: createUUIDv5;
+    export default createUUIDv5;
 }
diff --git a/BuildTasks/Common/v5/Common.ts b/BuildTasks/Common/v5/Common.ts
@@ -78,11 +78,11 @@ export function validateAndSetTfxManifestArguments(tfx: ToolRunner): (() => Prom
 
             if (!matchingVsixFile || matchingVsixFile.length === 0) {
                 tl.setResult(tl.TaskResult.Failed, `Found no vsix files matching: ${vsixFilePattern}.`);
-                throw "failed";
+                throw new Error("failed");
             }
             if (matchingVsixFile.length !== 1) {
                 tl.setResult(tl.TaskResult.Failed, `Found multiple vsix files matching: ${vsixFilePattern}.`);
-                throw "failed";
+                throw new Error("failed");
             }
             tfx.arg(["--vsix", matchingVsixFile[0]]);
             break;
@@ -305,7 +305,6 @@ export class TfxJsonOutputStream extends stream.Writable {
         super();
     }
 
-    // eslint-disable-next-line @typescript-eslint/ban-types
     _write(chunk: any, enc: string, cb: (Function)): void {
         const chunkStr: string = chunk.toString();
         if (chunkStr.startsWith("[command]")) {
@@ -553,3 +552,15 @@ export function writeManifest(manifest: any, path: string): Promise<void> {
 export function checkUpdateTasksManifests(manifestFile?: string): Promise<void> {
     return updateManifests(manifestFile ? [manifestFile] : []);
 }
+
+export default {
+    validateAndSetTfxManifestArguments,
+    runTfx,
+    getExtensionVersion,
+    getMarketplaceEndpointDetails,
+    setTfxMarketplaceArguments,
+    TfxJsonOutputStream,
+    updateManifests,
+    writeManifest,
+    checkUpdateTasksManifests
+};