Bump dependencies versions

SonarSource · Apr 26, 2018 · f04d7ec · f04d7ec
1 parent 282d679
commit f04d7ec
Show file tree

Hide file tree

Showing 13 changed files with 2,931 additions and 2,140 deletions.
diff --git a/common/ts/helpers/__tests__/utils-test.ts b/common/ts/helpers/__tests__/utils-test.ts
@@ -1,4 +1,4 @@
-import { isWindows, setIfNotEmpty, toCleanJSON } from '../utils';
+import { setIfNotEmpty, toCleanJSON } from '../utils';
 
 describe('toCleanJSON', () => {
   it('should jsonify', () => {

diff --git a/common/ts/helpers/utils.ts b/common/ts/helpers/utils.ts
@@ -12,11 +12,11 @@ export const PROP_NAMES = {
   PROJECTSETTINGS: 'project.settings'
 };
 
-export function toCleanJSON(props: { [key: string]: string }) {
+export function toCleanJSON(props: { [key: string]: string | undefined }) {
   return JSON.stringify(props, Object.keys(props).filter(key => props[key] != null));
 }
 
-export function setIfNotEmpty(props: { [key: string]: string }, key: string, value: string) {
+export function setIfNotEmpty(props: { [key: string]: string }, key: string, value?: string) {
   if (value) {
     props[key] = value;
   }

diff --git a/common/ts/package-lock.json b/common/ts/package-lock.json
diff --git a/common/ts/package.json b/common/ts/package.json
@@ -6,8 +6,8 @@
   "license": "LGPL-3.0",
   "dependencies": {
     "fs-extra": "5.0.0",
-    "request": "2.83.0",
-    "vsts-task-lib": "2.3.0",
+    "request": "2.85.0",
+    "vsts-task-lib": "2.4.0",
     "vso-node-api": "6.3.2"
   },
   "engines": {

diff --git a/common/ts/prepare-task.ts b/common/ts/prepare-task.ts
@@ -13,7 +13,7 @@ export default async function prepareTask(endpoint: Endpoint, rootPath: string)
   const props: { [key: string]: string } = {};
 
   if (endpoint.type === EndpointType.SonarCloud) {
-    await populateBranchAndPrProps(endpoint, props);
+    await populateBranchAndPrProps(props);
     tl.debug(`[SQ] Branch and PR parameters: ${JSON.stringify(props)}`);
   }
 
@@ -37,7 +37,7 @@ export default async function prepareTask(endpoint: Endpoint, rootPath: string)
   await scanner.runPrepare();
 }
 
-async function populateBranchAndPrProps(endpoint: Endpoint, props: { [key: string]: string }) {
+async function populateBranchAndPrProps(props: { [key: string]: string }) {
   const collectionUrl = tl.getVariable('System.TeamFoundationCollectionUri');
   const prId = tl.getVariable('System.PullRequest.PullRequestId');
   const provider = tl.getVariable('Build.Repository.Provider');
@@ -86,7 +86,7 @@ async function getDefaultBranch(provider: string, collectionUrl: string) {
     return DEFAULT;
   }
   try {
-    const vsts: vm.WebApi = getWebApi(collectionUrl);
+    const vsts = getWebApi(collectionUrl);
     const gitApi = await vsts.getGitApi();
     const repo = await gitApi.getRepository(
       tl.getVariable(REPO_NAME_VAR),

diff --git a/common/ts/sonarqube/Analysis.ts b/common/ts/sonarqube/Analysis.ts
@@ -77,7 +77,11 @@ export default class Analysis {
     }
 
     const rows = failedConditions.map(condition => {
-      const metric = this.metrics.getMetricByKey(condition.metricKey);
+      const metric = this.metrics && this.metrics.getMetricByKey(condition.metricKey);
+      if (!metric) {
+        return null;
+      }
+
       const threshold =
         condition.status === 'WARN' ? condition.warningThreshold : condition.errorThreshold;
       return `<tr>