From 59684c97b065645dbbeda2ffb9b33bb39572d0dd Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Sun, 3 Jan 2016 10:01:43 -0800 Subject: [PATCH] build(npm): update to minimatch@3.0.0 --- npm-shrinkwrap.clean.json | 60 ++++++++++++++++++++++++---- npm-shrinkwrap.json | 84 ++++++++++++++++++++++++++++++++++----- package.json | 2 +- 3 files changed, 127 insertions(+), 19 deletions(-) diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 60e72755f7..009a91a23c 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -82,7 +82,12 @@ "version": "0.9.2" }, "glob": { - "version": "4.3.5" + "version": "4.3.5", + "dependencies": { + "minimatch": { + "version": "2.0.10" + } + } }, "lodash": { "version": "3.2.0" @@ -1457,6 +1462,9 @@ "broccoli-funnel": { "version": "1.0.1", "dependencies": { + "minimatch": { + "version": "2.0.10" + }, "walk-sync": { "version": "0.2.6" } @@ -1487,6 +1495,9 @@ }, "fs-extra": { "version": "0.13.0" + }, + "minimatch": { + "version": "2.0.10" } } }, @@ -2210,7 +2221,12 @@ "version": "0.2.1", "dependencies": { "glob": { - "version": "4.3.5" + "version": "4.3.5", + "dependencies": { + "minimatch": { + "version": "2.0.10" + } + } } } }, @@ -2760,7 +2776,12 @@ } }, "glob": { - "version": "4.5.3" + "version": "4.5.3", + "dependencies": { + "minimatch": { + "version": "2.0.10" + } + } }, "glob-base": { "version": "0.3.0" @@ -2769,7 +2790,12 @@ "version": "2.0.0" }, "glob-stream": { - "version": "3.1.18" + "version": "3.1.18", + "dependencies": { + "minimatch": { + "version": "2.0.10" + } + } }, "glob-watcher": { "version": "0.0.6" @@ -3959,7 +3985,12 @@ } }, "matcher-collection": { - "version": "1.0.1" + "version": "1.0.1", + "dependencies": { + "minimatch": { + "version": "2.0.10" + } + } }, "media-typer": { "version": "0.3.0" @@ -4023,7 +4054,7 @@ "version": "1.0.0" }, "minimatch": { - "version": "2.0.10" + "version": "3.0.0" }, "minimist": { "version": "1.2.0" @@ -4088,7 +4119,12 @@ "version": "0.7.1" }, "multimatch": { - "version": "2.0.0" + "version": "2.0.0", + "dependencies": { + "minimatch": { + "version": "2.0.10" + } + } }, "multiparty": { "version": "3.3.2" @@ -4663,6 +4699,9 @@ "graceful-fs": { "version": "4.1.2" }, + "minimatch": { + "version": "2.0.10" + }, "readable-stream": { "version": "2.0.5" } @@ -5312,7 +5351,12 @@ "version": "2.6.0" }, "glob": { - "version": "4.3.5" + "version": "4.3.5", + "dependencies": { + "minimatch": { + "version": "2.0.10" + } + } }, "semver": { "version": "2.3.2" diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index eb8fc1cc5c..b9aa5c8e9f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -134,7 +134,14 @@ "glob": { "version": "4.3.5", "from": "glob@>=4.3.0 <4.4.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz" + "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz", + "dependencies": { + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + } + } }, "lodash": { "version": "3.2.0", @@ -2271,6 +2278,11 @@ "from": "broccoli-funnel@1.0.1", "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.0.1.tgz", "dependencies": { + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + }, "walk-sync": { "version": "0.2.6", "from": "walk-sync@>=0.2.6 <0.3.0", @@ -2319,6 +2331,11 @@ "version": "0.13.0", "from": "fs-extra@>=0.13.0 <0.14.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.13.0.tgz" + }, + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" } } }, @@ -3485,7 +3502,14 @@ "glob": { "version": "4.3.5", "from": "glob@>=4.3.0 <4.4.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz" + "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz", + "dependencies": { + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + } + } } } }, @@ -4367,7 +4391,14 @@ "glob": { "version": "4.5.3", "from": "glob@>=4.0.6 <5.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz" + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "dependencies": { + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + } + } }, "glob-base": { "version": "0.3.0", @@ -4382,7 +4413,14 @@ "glob-stream": { "version": "3.1.18", "from": "glob-stream@>=3.1.5 <4.0.0", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz" + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", + "dependencies": { + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + } + } }, "glob-watcher": { "version": "0.0.6", @@ -6296,7 +6334,14 @@ "matcher-collection": { "version": "1.0.1", "from": "matcher-collection@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.1.tgz" + "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.1.tgz", + "dependencies": { + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.10 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + } + } }, "media-typer": { "version": "0.3.0", @@ -6398,9 +6443,9 @@ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz" }, "minimatch": { - "version": "2.0.10", - "from": "minimatch@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + "version": "3.0.0", + "from": "minimatch@3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz" }, "minimist": { "version": "1.2.0", @@ -6503,7 +6548,14 @@ "multimatch": { "version": "2.0.0", "from": "multimatch@2.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.0.0.tgz", + "dependencies": { + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + } + } }, "multiparty": { "version": "3.3.2", @@ -7436,6 +7488,11 @@ "from": "graceful-fs@>=4.1.2 <5.0.0", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz" }, + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.10 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + }, "readable-stream": { "version": "2.0.5", "from": "readable-stream@>=2.0.2 <3.0.0", @@ -8473,7 +8530,14 @@ "glob": { "version": "4.3.5", "from": "glob@>=4.3.0 <4.4.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz" + "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz", + "dependencies": { + "minimatch": { + "version": "2.0.10", + "from": "minimatch@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz" + } + } }, "semver": { "version": "2.3.2", diff --git a/package.json b/package.json index bcc1c1a934..d4206835e6 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "madge": "0.5.0", "merge": "^1.2.0", "merge2": "^0.3.5", - "minimatch": "^2.0.1", + "minimatch": "^3.0.0", "minimist": "^1.2.0", "mock-fs": "^3.6.0", "node-uuid": "1.4.x",