types: minimatch is a function, close #1902

cypress-io · Jun 7, 2018 · 68a6fc5 · 68a6fc5
1 parent 531a950
commit 68a6fc5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -41,7 +41,7 @@
     "@types/chai-jquery": "1.1.35",
     "@types/jquery": "3.2.16",
     "@types/lodash": "4.14.87",
-    "@types/minimatch": "3.0.1",
+    "@types/minimatch": "3.0.3",
     "@types/mocha": "2.2.44",
     "@types/sinon": "4.0.0",
     "@types/sinon-chai": "2.7.29",

diff --git a/cli/types/minimatch.d.ts b/cli/types/minimatch.d.ts
@@ -3,10 +3,9 @@
 // so that Cypress can get and use the Blob type
 // tslint:disable-next-line:no-implicit-dependencies
 import * as mimimatch from 'minimatch'
-
 export = Mimimatch
 export as namespace Mimimatch
 
 declare namespace Mimimatch {
-  type MimimatchStatic = mimimatch.IMinimatchStatic
+  type MimimatchStatic = mimimatch.IMinimatchStatic & typeof mimimatch
 }
diff --git a/cli/types/tests/kitchen-sink.ts b/cli/types/tests/kitchen-sink.ts
@@ -1533,3 +1533,7 @@ cy.wrap('foo').then(subject => {
 }).then(subject => {
   subject // $ExpectType string
 })
+
+Cypress.minimatch('/users/1/comments', '/users/*/comments', {
+  matchBase: true,
+})