fix micromatch usage

Author: sandorfr

Common/Node/multimatch.ts

@@ -2,15 +2,11 @@ import micromatch = require('micromatch');
 import path = require('path');
 import * as tl from 'azure-pipelines-task-lib/task';
 
-export function getMatches(directory: string, filters: string): string[] {
-  return applyMatch(directory, filters, tl.find(directory));
-}
-
 export function applyMatch(
   directory: string,
   filters: string,
   files: string[]
-) {
+): string[] {
   var patterns = filters.split('\n').map(pattern => {
     if (pattern.match(/^!/)) {
       return '!' + path.join(directory, pattern.substr(1));
@@ -19,9 +15,12 @@ export function applyMatch(
   });
 
   var allFiles = files.map(file => path.resolve(file));
-  var filteredFiles = allFiles.filter(
-    micromatch.filter(patterns, { nodupes: true })
-  );
-
+  var filteredFiles = (micromatch as any)(allFiles, patterns, {
+    nodupes: true
+  });
   return filteredFiles;
 }
+
+export function getMatches(directory: string, filters: string): string[] {
+  return applyMatch(directory, filters, tl.find(directory));
+}

Tasks/JsonPatch/jsonPatch.ts

@@ -9,7 +9,7 @@ try {
   var targetPath = tl.getPathInput('JsonWorkingDir', true);
   var patchContent = tl.getInput('JsonPatchContent', true);
 
-  var patterns: any = tl.getInput('JsonTargetFilters', true);
+  var patterns: string = tl.getInput('JsonTargetFilters', true);
   var outputPatchedFile = tl.getBoolInput('OutputPatchFile', true);
   var failIfNoPatchApplied = tl.getBoolInput('FailIfNoPatchApplied', true);
   var treatErrors = tl.getInput('TreatErrors', true);

Tasks/JsonPatch/package.json

@@ -8,7 +8,7 @@
     "micromatch": "^4.0.2",
     "fast-json-patch": "2.1.0",
     "xregexp": "4.2.4",
-    "azure-pipelines-task-lib": "2.8.0",
+    "azure-pipelines-task-lib": "^2.8.0",
     "json5": "2.1.0",
     "shelljs": "0.8.3"
   }

Tasks/JsonPatch/yarn.lock

@@ -9,7 +9,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-azure-pipelines-task-lib@2.8.0:
+azure-pipelines-task-lib@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/azure-pipelines-task-lib/-/azure-pipelines-task-lib-2.8.0.tgz#8a0117a98f86c2e9ee85333e649874bf83ccb836"
   dependencies:

package.json

@@ -41,7 +41,7 @@
     "@types/jasmine": "^2.5.53",
     "@types/js-yaml": "^3.9.0",
     "@types/json5": "0.0.29",
-    "@types/micromatch": "^2.3.29",
+    "@types/micromatch": "^3.1.0",
     "@types/node": "8.0.19",
     "@types/parse-glob": "^3.0.29",
     "@types/q": "^1.0.3",

yarn.lock

@@ -20,6 +20,10 @@
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/async/-/async-3.0.0.tgz#d403560ee2aabccdb7936cb9a3fee5f147d626bd"
 
+"@types/braces@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.0.tgz#7da1c0d44ff1c7eb660a36ec078ea61ba7eb42cb"
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -70,11 +74,11 @@
   version "4.14.133"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.133.tgz#430721c96da22dd1694443e68e6cec7ba1c1003d"
 
-"@types/micromatch@^2.3.29":
-  version "2.3.30"
-  resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-2.3.30.tgz#c2a143675f200fbcebe57fb0dab0cbf58093d4b0"
+"@types/micromatch@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-3.1.0.tgz#514c8a3d24b2680a9b838eeb80e6d7d724545433"
   dependencies:
-    "@types/parse-glob" "*"
+    "@types/braces" "*"
 
 "@types/minimatch@*":
   version "3.0.3"
@@ -92,7 +96,7 @@
   version "8.0.19"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.19.tgz#e46e2b0243de7d03f15b26b45c59ebb84f657a4e"
 
-"@types/parse-glob@*", "@types/parse-glob@^3.0.29":
+"@types/parse-glob@^3.0.29":
   version "3.0.29"
   resolved "https://registry.yarnpkg.com/@types/parse-glob/-/parse-glob-3.0.29.tgz#6a40ec7ebd2418ee69ee397e48e42169268a10bf"