Remove Node-Api Hack and Update to Node-Api 10.0 (#27)

* Remove Node-Api Hack and Update to Node-Api 10.0 with the Serialization fix

* Add Null Checks for inputs and packaging fixes

Author: saikrishnav

Tasks/emailReportTask/config/ConfigurationProvider.ts

@@ -12,6 +12,7 @@ import { GroupTestResultsBy } from "./report/GroupTestResultsBy";
 import { PipelineConfiguration } from "./pipeline/PipelineConfiguration";
 import { PipelineType } from "./pipeline/PipelineType";
 import { StringUtils } from "../utils/StringUtils";
+import { isNullOrUndefined } from "util";
 
 export class ConfigurationProvider implements IConfigurationProvider {
   private pipelineConfiguration: PipelineConfiguration;
@@ -115,12 +116,12 @@ export class ConfigurationProvider implements IConfigurationProvider {
     const groupTestSummaryByStr = tl.getInput(TaskConstants.GROUPTESTSUMMARYBY_INPUTKEY, false);
 
     const groupTestSummaryBy: Array<GroupTestResultsBy> = new Array();
-    if (groupTestSummaryByStr != null) {
-      groupTestSummaryByStr.split(",").forEach(element => { groupTestSummaryBy.push(this.getGroupTestResultsByEnumFromString(element)) });
+    if (!isNullOrUndefined(groupTestSummaryByStr)) {
+      (groupTestSummaryByStr as string).split(",").forEach(element => { groupTestSummaryBy.push(this.getGroupTestResultsByEnumFromString(element)) });
     }
 
     // derived input values
-    const includeResultsConfig = includeResultsStr == null ? includeResultsStr.split(",") : [];
+    const includeResultsConfig = isNullOrUndefined(includeResultsStr) ? [] : includeResultsStr.split(",");
     const includeFailedTests = includeResultsConfig.includes("1");
     const includeOtherTests = includeResultsConfig.includes("2");
     const includePassedTests = includeResultsConfig.includes("3");

Tasks/emailReportTask/package.json

@@ -7,12 +7,12 @@
   "main": "../../dist/emailReportExtension/emailReportTask/index.js",
   "types": "../../dist/emailReportExtension/emailReportTask/index.d.ts",
   "dependencies": {
-    "azure-devops-node-api": "^8.0.0",
+    "azure-devops-node-api": "^10.0.0",
     "azure-pipelines-task-lib": "^2.8.0",
     "js2xmlparser": "^4.0.0",
     "nodemailer": "^6.3.0",
     "performance-now": "^2.1.0",
     "reflect-metadata": "^0.1.13",
     "xslt-processor": "^0.11.5"
   }
-}d
+}

Tasks/emailReportTask/task.dev.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 2,
-    "Patch": 108
+    "Patch": 116
   },
   "groups": [
     {

Tasks/emailReportTask/task.prod.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 1
+    "Patch": 3
   },
   "groups": [
     {

commands/package.js

@@ -25,20 +25,6 @@ exec(npmInstallCommand, function (error) {
     console.log(`NPM Install Error: ${error}`);
   } else {
     console.log("NPM Install Done");
-
-    console.log("Patching azure-devops-node-api node_modules..[REMOVE THIS AFTER 9.0.2 release]");
-    const serializationJsFilePath = path.resolve(`${common.TaskOutDir}/node_modules/azure-devops-node-api/serialization.js`);
-    let dataToWrite = "";
-    fs.readFile(serializationJsFilePath, 'utf8', function(err, data) {
-        if (err) throw err;
-        const lines = data.split("\r\n");
-        if(lines.length > 216) {
-          lines[215] = "break;"
-          dataToWrite = lines.join("\r\n");
-          fs.writeFileSync(serializationJsFilePath, dataToWrite);
-          fs.writeFileSync(path.resolve(`${__dirname}/../node_modules/azure-devops-node-api/serialization.js`), dataToWrite);
-        }
-      });
   }
 });
 
@@ -61,18 +47,17 @@ if (fs.existsSync(imagesDir)) {
 // Package extension only for prod
 if (common.ReleaseType.toLowerCase() == "prod") {
   console.log(`Run command in ${common.ExtensionOutDir}: tfx extension create --root . --extension-id ${extensionId} --no-prompt`);
-  // process.chdir(common.ExtensionOutDir);
-  // var command = `tfx extension create --root . --extension-id ${extensionId} --no-prompt`;
-  // console.log(`Running: ${command}`);
-  // exec(command, function (error) {
-  //   if (error) {
-  //     console.log(`Package create error: ${error}`);
-  //   } else {
-  //     console.log("Package created");
-  //   }
-  // });
-} else {
-  console.log(`Navigate to ${common.TaskOutDir} and run the tfx upload command on the desired azure devops account to upload task directly. Command: 'tfx login && tfx build tasks upload --task-path .'`);
+  process.chdir(common.ExtensionOutDir);
+  var command = `tfx extension create --root . --extension-id ${extensionId} --no-prompt`;
+  console.log(`Running: ${command}`);
+  exec(command, function (error) {
+    if (error) {
+      console.log(`Package create error: ${error}`);
+    } else {
+      console.log("Package created. Upload the VSIX to Visual Studio Marketplace if you wish to publish the extension.");
+    }
+  });
 }
+console.log(`If you want to upload to AzureDevOps account directly, then Navigate to ${common.TaskOutDir} and run the tfx upload command on the desired azure devops account to upload task directly. Command: 'tfx login && tfx build tasks upload --task-path .'`);
 
 process.chdir(cwd);

package-lock.json

@@ -29,7 +29,7 @@
     "@types/sinon": "^7.0.12",
     "@types/stats-lite": "^2.2.0",
     "@types/string-template": "^1.0.2",
-    "azure-devops-node-api": "^8.0.0",
+    "azure-devops-node-api": "^10.0.0",
     "azure-pipelines-task-lib": "^2.8.0",
     "js2xmlparser": "^4.0.0",
     "nodemailer": "^6.3.0",