diff options
author | Kat Marchán <kzm@sykosomatic.org> | 2016-09-08 03:38:45 +0300 |
---|---|---|
committer | Kat Marchán <kzm@sykosomatic.org> | 2016-09-09 00:53:10 +0300 |
commit | 2818fb0f6081d68a91f0905945ad102f26c6cf85 (patch) | |
tree | 40da40a5cc743a4fa42190b8618822f98391fafd | |
parent | b82fd838edbfff5d2833a62f6d8ae8ea2df5a1f2 (diff) |
glob@7.0.6
stop throwing on `glob.hasMagic("")`
Credit: @isaacs
-rw-r--r-- | node_modules/glob/glob.js | 4 | ||||
-rw-r--r-- | node_modules/glob/package.json | 47 | ||||
-rw-r--r-- | package.json | 2 |
3 files changed, 29 insertions, 24 deletions
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js index 02d15b755..9eca910bb 100644 --- a/node_modules/glob/glob.js +++ b/node_modules/glob/glob.js @@ -100,6 +100,10 @@ glob.hasMagic = function (pattern, options_) { var g = new Glob(pattern, options) var set = g.minimatch.set + + if (!pattern) + return false + if (set.length > 1) return true diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json index 85556e557..66ce2c924 100644 --- a/node_modules/glob/package.json +++ b/node_modules/glob/package.json @@ -2,40 +2,39 @@ "_args": [ [ { - "raw": "glob@7.0.5", + "raw": "glob@7.0.6", "scope": null, "escapedName": "glob", "name": "glob", - "rawSpec": "7.0.5", - "spec": "7.0.5", + "rawSpec": "7.0.6", + "spec": "7.0.6", "type": "version" }, - "/Users/rebecca/code/npm" + "/Users/zkat/Documents/code/npm" ] ], - "_from": "glob@7.0.5", - "_id": "glob@7.0.5", + "_from": "glob@7.0.6", + "_id": "glob@7.0.6", "_inCache": true, - "_installable": true, "_location": "/glob", - "_nodeVersion": "4.4.4", + "_nodeVersion": "4.5.0", "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/glob-7.0.5.tgz_1466471133629_0.7749870484694839" + "host": "packages-16-east.internal.npmjs.com", + "tmp": "tmp/glob-7.0.6.tgz_1472074762911_0.47247025789693" }, "_npmUser": { "name": "isaacs", "email": "i@izs.me" }, - "_npmVersion": "3.9.1", + "_npmVersion": "3.10.7", "_phantomChildren": {}, "_requested": { - "raw": "glob@7.0.5", + "raw": "glob@7.0.6", "scope": null, "escapedName": "glob", "name": "glob", - "rawSpec": "7.0.5", - "spec": "7.0.5", + "rawSpec": "7.0.6", + "spec": "7.0.6", "type": "version" }, "_requiredBy": [ @@ -43,13 +42,15 @@ "/", "/node-gyp", "/rimraf", - "/tap" + "/standard/standard-engine/deglob", + "/tap", + "/tap/tap-mocha-reporter" ], - "_resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", - "_shasum": "b4202a69099bbb4d292a7c1b95b6682b67ebdc95", + "_resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", + "_shasum": "211bafaf49e525b8cd93260d14ab136152b3f57a", "_shrinkwrap": null, - "_spec": "glob@7.0.5", - "_where": "/Users/rebecca/code/npm", + "_spec": "glob@7.0.6", + "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -75,8 +76,8 @@ }, "directories": {}, "dist": { - "shasum": "b4202a69099bbb4d292a7c1b95b6682b67ebdc95", - "tarball": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz" + "shasum": "211bafaf49e525b8cd93260d14ab136152b3f57a", + "tarball": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz" }, "engines": { "node": "*" @@ -86,7 +87,7 @@ "sync.js", "common.js" ], - "gitHead": "1319866c764e1a1bb39114dcbc2c1d518bb9b476", + "gitHead": "98327d8def195b1ba200217952df8ea829426038", "homepage": "https://github.com/isaacs/node-glob#readme", "license": "ISC", "main": "glob.js", @@ -112,5 +113,5 @@ "test": "tap test/*.js --cov", "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js" }, - "version": "7.0.5" + "version": "7.0.6" } diff --git a/package.json b/package.json index 66c5f6009..d29515abd 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "fs-write-stream-atomic": "~1.0.8", "fstream": "~1.0.10", "fstream-npm": "~1.2.0", - "glob": "~7.0.5", + "glob": "~7.0.6", "graceful-fs": "~4.1.4", "has-unicode": "~2.0.1", "hosted-git-info": "~2.1.5", |