summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/ignore-walk
diff options
context:
space:
mode:
Diffstat (limited to 'deps/npm/node_modules/ignore-walk')
-rw-r--r--deps/npm/node_modules/ignore-walk/README.md2
-rw-r--r--deps/npm/node_modules/ignore-walk/index.js14
-rw-r--r--deps/npm/node_modules/ignore-walk/package.json19
3 files changed, 21 insertions, 14 deletions
diff --git a/deps/npm/node_modules/ignore-walk/README.md b/deps/npm/node_modules/ignore-walk/README.md
index 66b69e894b..278f61017f 100644
--- a/deps/npm/node_modules/ignore-walk/README.md
+++ b/deps/npm/node_modules/ignore-walk/README.md
@@ -1,7 +1,7 @@
# ignore-walk
[![Build
-Status](https://travis-ci.org/isaacs/ignore-walk.svg?branch=master)](https://travis-ci.org/isaacs/ignore-walk)
+Status](https://travis-ci.org/npm/ignore-walk.svg?branch=master)](https://travis-ci.org/npm/ignore-walk)
Nested/recursive `.gitignore`/`.npmignore` parsing and filtering.
diff --git a/deps/npm/node_modules/ignore-walk/index.js b/deps/npm/node_modules/ignore-walk/index.js
index abfd9ece57..eec6851804 100644
--- a/deps/npm/node_modules/ignore-walk/index.js
+++ b/deps/npm/node_modules/ignore-walk/index.js
@@ -17,7 +17,7 @@ class Walker extends EE {
this.includeEmpty = !!opts.includeEmpty
this.root = this.parent ? this.parent.root : this.path
this.follow = !!opts.follow
- this.result = this.parent ? this.parent.result : []
+ this.result = this.parent ? this.parent.result : new Set()
this.entries = null
this.sawError = false
}
@@ -31,8 +31,12 @@ class Walker extends EE {
if (!(this.sawError && ev === 'error')) {
if (ev === 'error')
this.sawError = true
- else if (ev === 'done' && !this.parent)
- data = data.sort(this.sort)
+ else if (ev === 'done' && !this.parent) {
+ data = Array.from(data)
+ .map(e => /^@/.test(e) ? `./${e}` : e).sort(this.sort)
+ this.result = data
+ }
+
if (ev === 'error' && this.parent)
ret = this.parent.emit('error', data)
else
@@ -57,7 +61,7 @@ class Walker extends EE {
this.entries = entries
if (entries.length === 0) {
if (this.includeEmpty)
- this.result.push(this.path.substr(this.root.length + 1))
+ this.result.add(this.path.substr(this.root.length + 1))
this.emit('done', this.result)
} else {
const hasIg = this.entries.some(e =>
@@ -145,7 +149,7 @@ class Walker extends EE {
const abs = this.path + '/' + entry
if (!st.isDirectory()) {
if (file)
- this.result.push(abs.substr(this.root.length + 1))
+ this.result.add(abs.substr(this.root.length + 1))
then()
} else {
// is a directory
diff --git a/deps/npm/node_modules/ignore-walk/package.json b/deps/npm/node_modules/ignore-walk/package.json
index cc041a55e4..882c1398b0 100644
--- a/deps/npm/node_modules/ignore-walk/package.json
+++ b/deps/npm/node_modules/ignore-walk/package.json
@@ -1,8 +1,8 @@
{
"_from": "ignore-walk@^3.0.1",
- "_id": "ignore-walk@3.0.1",
+ "_id": "ignore-walk@3.0.3",
"_inBundle": false,
- "_integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+ "_integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
"_location": "/ignore-walk",
"_phantomChildren": {},
"_requested": {
@@ -18,10 +18,10 @@
"_requiredBy": [
"/npm-packlist"
],
- "_resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
- "_shasum": "a83e62e7d272ac0e3b551aaa82831a19b69f82f8",
+ "_resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+ "_shasum": "017e2447184bfeade7c238e4aefdd1e8f95b1e37",
"_spec": "ignore-walk@^3.0.1",
- "_where": "/Users/rebecca/code/npm/node_modules/npm-packlist",
+ "_where": "/Users/mperrotte/npminc/cli/node_modules/npm-packlist",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",
@@ -40,7 +40,7 @@
"mkdirp": "^0.5.1",
"mutate-fs": "^1.1.0",
"rimraf": "^2.6.1",
- "tap": "^10.7.2"
+ "tap": "^14.6.9"
},
"files": [
"index.js"
@@ -65,7 +65,10 @@
"postpublish": "git push origin --all; git push origin --tags",
"postversion": "npm publish",
"preversion": "npm test",
- "test": "tap test/*.js --100"
+ "test": "tap"
},
- "version": "3.0.1"
+ "tap": {
+ "jobs": 1
+ },
+ "version": "3.0.3"
}