From 9f73f4aab5f56b256c5cf9e461e81abfa2844945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Thu, 8 Sep 2016 13:37:14 -0700 Subject: [PATCH] glob@7.0.6 stop throwing on `glob.hasMagic("")` Credit: @isaacs --- node_modules/glob/glob.js | 4 ++++ node_modules/glob/package.json | 24 ++++++++++++------------ package.json | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js index 02d15b755dd84..9eca910bb05ec 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 de3a917ba7007..b7e69be96217a 100644 --- a/node_modules/glob/package.json +++ b/node_modules/glob/package.json @@ -6,7 +6,7 @@ }, "name": "glob", "description": "a little globber", - "version": "7.0.5", + "version": "7.0.6", "repository": { "type": "git", "url": "git://github.com/isaacs/node-glob.git" @@ -44,23 +44,23 @@ "benchclean": "node benchclean.js" }, "license": "ISC", - "gitHead": "1319866c764e1a1bb39114dcbc2c1d518bb9b476", + "gitHead": "98327d8def195b1ba200217952df8ea829426038", "bugs": { "url": "https://github.com/isaacs/node-glob/issues" }, "homepage": "https://github.com/isaacs/node-glob#readme", - "_id": "glob@7.0.5", - "_shasum": "b4202a69099bbb4d292a7c1b95b6682b67ebdc95", - "_from": "glob@>=7.0.4 <7.1.0", - "_npmVersion": "3.9.1", - "_nodeVersion": "4.4.4", + "_id": "glob@7.0.6", + "_shasum": "211bafaf49e525b8cd93260d14ab136152b3f57a", + "_from": "glob@7.0.6", + "_npmVersion": "3.10.7", + "_nodeVersion": "4.5.0", "_npmUser": { "name": "isaacs", "email": "i@izs.me" }, "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" }, "maintainers": [ { @@ -69,10 +69,10 @@ } ], "_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" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", + "_resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", "readme": "ERROR: No README data found!" } diff --git a/package.json b/package.json index ba2d661a07525..2a63a4058af5e 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "fstream-npm": "~1.1.1", "github-url-from-git": "~1.4.0", "github-url-from-username-repo": "~1.0.2", - "glob": "~7.0.5", + "glob": "~7.0.6", "graceful-fs": "~4.1.5", "hosted-git-info": "~2.1.5", "inflight": "~1.0.4",