summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2016-04-10 22:28:28 +0200
committerSamy Pesse <samypesse@gmail.com>2016-04-10 22:28:29 +0200
commitd7f7dcd47bd3f011ef97798a0f1eb1fb4c72bdb0 (patch)
tree9ac07a46387723aa4f37f548f87afaa6b97f501b
parentb1981e09b823a3a3f8632940f435958f3f3c5a56 (diff)
downloadgitbook-d7f7dcd47bd3f011ef97798a0f1eb1fb4c72bdb0.zip
gitbook-d7f7dcd47bd3f011ef97798a0f1eb1fb4c72bdb0.tar.gz
gitbook-d7f7dcd47bd3f011ef97798a0f1eb1fb4c72bdb0.tar.bz2
Switch to ignore@3.1.1
-rw-r--r--lib/output/base.js6
-rw-r--r--package.json2
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/output/base.js b/lib/output/base.js
index 4563646..903323f 100644
--- a/lib/output/base.js
+++ b/lib/output/base.js
@@ -38,10 +38,8 @@ function Output(book, opts, parent) {
// Files to ignore in output
this.ignore = Ignore();
- // Hack to inherits from rules of the book:
- // Waiting for https://github.com/kaelzhang/node-ignore/pull/19 to be merged
- this.ignore._rules = this.ignore._rules.concat(this.book.ignore._rules);
- this.ignore._cache = {};
+ // Hack to inherits from rules of the book
+ this.ignore.add(this.book.ignore);
}
// Default name for generator
diff --git a/package.json b/package.json
index 5e332d5..5475097 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"github-slugid": "1.0.1",
"graceful-fs": "4.1.3",
"i18n-t": "1.0.0",
- "ignore": "3.0.14",
+ "ignore": "3.1.1",
"json-schema-defaults": "0.1.1",
"jsonschema": "1.1.0",
"juice": "1.10.0",