aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-12-28 18:50:51 -0800
committerChris Rebert <[email protected]>2014-12-28 18:50:51 -0800
commit4484700d10fca0e3ccaa9fe6727f49575797f305 (patch)
treef949c5cf9cc83dc945c91cfc49db927e5707586a
parent688780eb07b00533ebffe1302e5c85cc0f154002 (diff)
parent6099bfdea87fe70d61a13ea0627056e7998ea84d (diff)
downloadbootstrap-4484700d10fca0e3ccaa9fe6727f49575797f305.tar.xz
bootstrap-4484700d10fca0e3ccaa9fe6727f49575797f305.zip
Merge pull request #15452 from twbs/bump-load-grunt-tasks
bump load-grunt-tasks to ~2.0.0
-rw-r--r--package.json2
-rw-r--r--test-infra/npm-shrinkwrap.json66
2 files changed, 22 insertions, 46 deletions
diff --git a/package.json b/package.json
index 26a509eb9..ec442abcc 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
"grunt-jscs": "~1.0.0",
"grunt-saucelabs": "~8.4.0",
"grunt-sed": "~0.1.1",
- "load-grunt-tasks": "~1.0.0",
+ "load-grunt-tasks": "~2.0.0",
"npm-shrinkwrap": "^200.0.0",
"remarkable": "~1.6.0",
"time-grunt": "~1.0.0"
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index da6d02501..9427a6c24 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -3884,46 +3884,16 @@
}
},
"load-grunt-tasks": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-1.0.0.tgz",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-2.0.0.tgz",
"dependencies": {
"findup-sync": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
- "dependencies": {
- "glob": {
- "version": "3.2.11",
- "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
- "dependencies": {
- "inherits": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
- },
- "minimatch": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
- "dependencies": {
- "lru-cache": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
- },
- "sigmund": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
- }
- }
- }
- }
- },
- "lodash": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
- }
- }
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz"
},
"multimatch": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-1.0.1.tgz",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.0.0.tgz",
"dependencies": {
"array-differ": {
"version": "1.0.0",
@@ -3940,16 +3910,22 @@
}
},
"minimatch": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
"dependencies": {
- "lru-cache": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
- },
- "sigmund": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+ "brace-expansion": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+ "dependencies": {
+ "balanced-match": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+ }
+ }
}
}
}