Upgrade: ignore major.

mysticatea · Mar 27, 2016 · c72f6c6 · c72f6c6
1 parent 2ebe566
commit c72f6c6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/lib/util/get-npmignore.js b/lib/util/get-npmignore.js
@@ -10,8 +10,9 @@
 // Requirements
 //------------------------------------------------------------------------------
 
+var fs = require("fs");
 var path = require("path");
-var Ignore = require("ignore").Ignore;
+var ignore = require("ignore");
 var Cache = require("./cache");
 var exists = require("./exists");
 var getPackageJson = require("./get-package-json");
@@ -100,20 +101,20 @@ function parseWhiteList(files) {
         return null;
     }
 
-    var ignore = new Ignore({twoGlobstars: true});
-    ignore.addPattern("*");
+    var ig = ignore();
+    ig.add("*");
 
     for (var i = 0; i < files.length; ++i) {
         var file = files[i];
 
         if (typeof file === "string") {
             file = "/" + file.replace(SLASH_AT_BEGIN_END, "");
-            ignore.addPattern("!" + file);
-            ignore.addPattern("!" + file + "/**");
+            ig.add("!" + file);
+            ig.add("!" + file + "/**");
         }
     }
 
-    return not(ignore.createFilter());
+    return not(ig.createFilter());
 }
 
 /**
@@ -136,9 +137,9 @@ function parseNpmignore(basedir, filesFieldExists) {
         }
     }
 
-    var ignore = new Ignore({twoGlobstars: true});
-    ignore.addIgnoreFile(filePath);
-    return not(ignore.createFilter());
+    var ig = ignore();
+    ig.add(fs.readFileSync(filePath, "utf8"));
+    return not(ig.createFilter());
 }
 
 //------------------------------------------------------------------------------

diff --git a/package.json b/package.json
@@ -20,14 +20,14 @@
     "eslint": ">=1.10.3 <3.0.0"
   },
   "dependencies": {
-    "ignore": "^2.2.19",
+    "ignore": "^3.0.11",
     "minimatch": "^3.0.0",
     "object-assign": "^4.0.1",
-    "resolve": "^1.1.6"
+    "resolve": "^1.1.7"
   },
   "devDependencies": {
     "coveralls": "^2.11.4",
-    "eslint": "^2.0.0",
+    "eslint": "^2.5.1",
     "eslint-config-mysticatea": "^2.0.0",
     "istanbul": "^0.4.0",
     "mocha": "^2.3.4",