aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-04-07 12:49:20 -0700
committerChris Rebert <[email protected]>2015-04-07 12:49:20 -0700
commit2dfdab6ec4171214e58dbee5d845de089072af71 (patch)
treecaafe483ca31931eb9e96df2acdb7f5f19d22c2f
parent2e6511bb51d23b1f54d2a2ed32282e4a50ba959a (diff)
parent3094d8390cfba82ea97e829a840604fef0c3aa6e (diff)
downloadbootstrap-2dfdab6ec4171214e58dbee5d845de089072af71.tar.xz
bootstrap-2dfdab6ec4171214e58dbee5d845de089072af71.zip
Merge pull request #16252 from twbs/bump-uglify
Bump grunt-contrib-uglify to ~0.9.0
-rw-r--r--package.json2
-rw-r--r--test-infra/npm-shrinkwrap.json30
2 files changed, 25 insertions, 7 deletions
diff --git a/package.json b/package.json
index 12c969f18..12cc2549f 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
"grunt-contrib-jshint": "~0.11.0",
"grunt-contrib-less": "~1.0.0",
"grunt-contrib-qunit": "~0.7.0",
- "grunt-contrib-uglify": "~0.8.0",
+ "grunt-contrib-uglify": "~0.9.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~3.0.0",
"grunt-exec": "~0.4.6",
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index 87e3ec02a..f01793d5a 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -2421,8 +2421,8 @@
}
},
"grunt-contrib-uglify": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.8.1.tgz",
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.9.0.tgz",
"dependencies": {
"chalk": {
"version": "1.0.0",
@@ -2625,8 +2625,8 @@
}
},
"uglify-js": {
- "version": "2.4.17",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.17.tgz",
+ "version": "2.4.19",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.19.tgz",
"dependencies": {
"async": {
"version": "0.2.10",
@@ -2647,8 +2647,26 @@
"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
},
"yargs": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"
+ "version": "3.5.4",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+ "dependencies": {
+ "camelcase": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
+ },
+ "decamelize": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
+ },
+ "window-size": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+ },
+ "wordwrap": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+ }
+ }
}
}
},