diff options
| author | Rebecca Turner <me@re-becca.org> | 2015-07-03 03:30:43 +0300 |
|---|---|---|
| committer | Rebecca Turner <me@re-becca.org> | 2015-07-03 06:18:05 +0300 |
| commit | 537f57872b663d32a63c3a5c2e980ed6d7ff1123 (patch) | |
| tree | 0c40677320c56e2aa73bafd6cc0af97c9bd83bc7 /node_modules/glob | |
| parent | dcd498b8a9b20676180071cbf50d519cd7adee3d (diff) | |
glob@5.0.13
Diffstat (limited to 'node_modules/glob')
| -rw-r--r-- | node_modules/glob/glob.js | 4 | ||||
| -rw-r--r-- | node_modules/glob/package.json | 26 |
2 files changed, 17 insertions, 13 deletions
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js index d8ac4eff6..b343a7192 100644 --- a/node_modules/glob/glob.js +++ b/node_modules/glob/glob.js @@ -57,6 +57,7 @@ var ownProp = common.ownProp var inflight = require('inflight') var util = require('util') var childrenIgnored = common.childrenIgnored +var isIgnored = common.isIgnored var once = require('once') @@ -432,6 +433,9 @@ Glob.prototype._emitMatch = function (index, e) { if (this.matches[index][e]) return + if (isIgnored(this, e)) + return + if (this.paused) { this._emitQueue.push([index, e]) return diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json index b07a4ed44..76d36757a 100644 --- a/node_modules/glob/package.json +++ b/node_modules/glob/package.json @@ -1,12 +1,12 @@ { "_args": [ [ - "glob@~5.0.10", + "glob@~5.0.12", "/Users/rebecca/code/npm" ] ], - "_from": "glob@>=5.0.10 <5.1.0", - "_id": "glob@5.0.12", + "_from": "glob@>=5.0.12 <5.1.0", + "_id": "glob@5.0.13", "_inCache": true, "_location": "/glob", "_nodeVersion": "2.2.1", @@ -18,10 +18,10 @@ "_phantomChildren": {}, "_requested": { "name": "glob", - "raw": "glob@~5.0.10", - "rawSpec": "~5.0.10", + "raw": "glob@~5.0.12", + "rawSpec": "~5.0.12", "scope": null, - "spec": ">=5.0.10 <5.1.0", + "spec": ">=5.0.12 <5.1.0", "type": "range" }, "_requiredBy": [ @@ -35,10 +35,10 @@ "/tap", "/tap-mocha-reporter" ], - "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.12.tgz", - "_shasum": "3861d827ae59ff38d206eb096659fb0800acee27", + "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.13.tgz", + "_shasum": "0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f", "_shrinkwrap": null, - "_spec": "glob@~5.0.10", + "_spec": "glob@~5.0.12", "_where": "/Users/rebecca/code/npm", "author": { "email": "i@izs.me", @@ -64,8 +64,8 @@ }, "directories": {}, "dist": { - "shasum": "3861d827ae59ff38d206eb096659fb0800acee27", - "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.12.tgz" + "shasum": "0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f", + "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.13.tgz" }, "engines": { "node": "*" @@ -75,7 +75,7 @@ "glob.js", "sync.js" ], - "gitHead": "9439afd114a16460ad29cd2fb23267ddd45dd688", + "gitHead": "507733d3c97f073ac676f58f2b6f2fe4c00f3e1c", "homepage": "https://github.com/isaacs/node-glob#readme", "license": "ISC", "main": "glob.js", @@ -100,5 +100,5 @@ "test": "tap test/*.js --cov", "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js" }, - "version": "5.0.12" + "version": "5.0.13" } |