aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-12-12 13:39:04 -0800
committerChris Rebert <[email protected]>2014-12-12 13:39:04 -0800
commit79af63aac907a340e2eb9372f250b01442c86e08 (patch)
tree2ee9151180ebcc847d3a542aae22ce4d4b6f59c8
parentf9db33d7dbc464a71d2143e3dd323fd7db47773b (diff)
parent5f41801083d202fda57d4581c24c6333afcb274a (diff)
downloadbootstrap-79af63aac907a340e2eb9372f250b01442c86e08.tar.xz
bootstrap-79af63aac907a340e2eb9372f250b01442c86e08.zip
Merge pull request #15355 from twbs/fix-15279
use npm-shrinkwrap ^200.0.0
-rw-r--r--package.json2
-rw-r--r--test-infra/npm-shrinkwrap.json252
2 files changed, 222 insertions, 32 deletions
diff --git a/package.json b/package.json
index 8f4f3aa0e..791d3bb51 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"grunt-saucelabs": "~8.3.3",
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~1.0.0",
- "npm-shrinkwrap": "5.0.0",
+ "npm-shrinkwrap": "^200.0.0",
"remarkable": "~1.4.2",
"time-grunt": "~1.0.0"
},
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index 454e2b55f..86ee20dd5 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -1,7 +1,7 @@
{
"name": "bootstrap",
"version": "3.3.1",
- "npm-shrinkwrap-version": "5.0.0",
+ "npm-shrinkwrap-version": "200.0.0",
"dependencies": {
"btoa": {
"version": "1.1.2",
@@ -170,6 +170,10 @@
"underscore.string": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
+ },
+ "which": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.0.8.tgz"
}
}
},
@@ -256,8 +260,8 @@
"resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-4.0.2.tgz",
"dependencies": {
"caniuse-db": {
- "version": "1.0.30000031",
- "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000031.tgz"
+ "version": "1.0.30000032",
+ "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000032.tgz"
},
"postcss": {
"version": "3.0.7",
@@ -2541,10 +2545,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"
},
- "vow": {
- "version": "0.4.4",
- "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.4.tgz"
- },
"vow-queue": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.3.1.tgz"
@@ -2995,6 +2995,174 @@
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
},
+ "grunt": {
+ "version": "0.4.5",
+ "resolved": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
+ "dependencies": {
+ "async": {
+ "version": "0.1.22",
+ "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
+ },
+ "coffee-script": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
+ },
+ "dateformat": {
+ "version": "1.0.2-1.2.3",
+ "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"
+ },
+ "eventemitter2": {
+ "version": "0.4.14",
+ "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
+ },
+ "exit": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+ },
+ "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"
+ }
+ }
+ },
+ "getobject": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
+ },
+ "glob": {
+ "version": "3.1.21",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+ "dependencies": {
+ "graceful-fs": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+ },
+ "inherits": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"
+ }
+ }
+ },
+ "grunt-legacy-log": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz",
+ "dependencies": {
+ "lodash": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+ },
+ "underscore.string": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"
+ }
+ }
+ },
+ "grunt-legacy-util": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"
+ },
+ "hooker": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
+ },
+ "iconv-lite": {
+ "version": "0.2.11",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz"
+ },
+ "js-yaml": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz",
+ "dependencies": {
+ "argparse": {
+ "version": "0.1.16",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+ "dependencies": {
+ "underscore": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+ },
+ "underscore.string": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
+ }
+ }
+ },
+ "esprima": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"
+ }
+ }
+ },
+ "lodash": {
+ "version": "0.9.2",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
+ },
+ "minimatch": {
+ "version": "0.2.14",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.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"
+ }
+ }
+ },
+ "nopt": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+ "dependencies": {
+ "abbrev": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+ }
+ }
+ },
+ "rimraf": {
+ "version": "2.2.8",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+ },
+ "underscore.string": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
+ },
+ "which": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.0.8.tgz"
+ }
+ }
+ },
"lodash": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
@@ -3320,8 +3488,8 @@
}
},
"sauce-tunnel": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/sauce-tunnel/-/sauce-tunnel-2.1.0.tgz",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/sauce-tunnel/-/sauce-tunnel-2.1.1.tgz",
"dependencies": {
"chalk": {
"version": "0.4.0",
@@ -3578,8 +3746,8 @@
}
},
"npm-shrinkwrap": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-5.0.0.tgz",
+ "version": "200.0.0",
+ "resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-200.0.0.tgz",
"dependencies": {
"array-find": {
"version": "0.1.1",
@@ -3708,8 +3876,8 @@
}
},
"npm": {
- "version": "2.1.11",
- "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.11.tgz",
+ "version": "2.1.12",
+ "resolved": "https://registry.npmjs.org/npm/-/npm-2.1.12.tgz",
"dependencies": {
"abbrev": {
"version": "1.0.5",
@@ -3832,8 +4000,8 @@
"resolved": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.1.tgz",
"dependencies": {
"fstream-ignore": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.1.tgz"
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"
}
}
},
@@ -3846,12 +4014,12 @@
"resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz"
},
"glob": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/glob/-/glob-4.2.1.tgz"
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz"
},
"graceful-fs": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
},
"inflight": {
"version": "1.0.4",
@@ -3884,12 +4052,22 @@
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
},
"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": {
- "sigmund": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+ "brace-expansion": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.0.1.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.0",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.0.tgz"
+ }
+ }
}
}
},
@@ -3905,7 +4083,19 @@
},
"node-gyp": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz"
+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz",
+ "dependencies": {
+ "minimatch": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+ "dependencies": {
+ "sigmund": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+ }
+ }
+ }
+ }
},
"nopt": {
"version": "3.0.1",
@@ -4040,8 +4230,8 @@
"resolved": "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.3.0.tgz"
},
"request": {
- "version": "2.48.0",
- "resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz",
+ "version": "2.49.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.49.0.tgz",
"dependencies": {
"aws-sign2": {
"version": "0.5.0",
@@ -4052,8 +4242,8 @@
"resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz"
},
"caseless": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz"
},
"combined-stream": {
"version": "0.0.7",
@@ -4132,8 +4322,8 @@
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
},
"node-uuid": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
},
"oauth-sign": {
"version": "0.5.0",