diff options
| author | Chris Rebert <[email protected]> | 2014-12-28 19:46:23 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-12-28 19:46:23 -0800 |
| commit | ac78d16e41de8fe7a221576e098dfd0e2abf8b0e (patch) | |
| tree | 2e464e5ef2896c76e0b2d31006e24c1060d0385d | |
| parent | 120b1f164b6c0ac813d36bf5af0fc5eedb55d126 (diff) | |
| parent | a4626760750b14cebb19efc7010833f05491f1ed (diff) | |
| download | bootstrap-ac78d16e41de8fe7a221576e098dfd0e2abf8b0e.tar.xz bootstrap-ac78d16e41de8fe7a221576e098dfd0e2abf8b0e.zip | |
Merge pull request #15454 from twbs/bump-compress
bump grunt-contrib-compress to ~0.13.0
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | test-infra/npm-shrinkwrap.json | 62 |
2 files changed, 53 insertions, 11 deletions
diff --git a/package.json b/package.json index de0ecfecc..8ebba8c42 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "grunt-autoprefixer": "~2.0.0", "grunt-banner": "~0.2.3", "grunt-contrib-clean": "~0.6.0", - "grunt-contrib-compress": "~0.12.0", + "grunt-contrib-compress": "~0.13.0", "grunt-contrib-concat": "~0.5.0", "grunt-contrib-connect": "~0.9.0", "grunt-contrib-copy": "~0.7.0", diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json index fa4914abf..4fcb9d134 100644 --- a/test-infra/npm-shrinkwrap.json +++ b/test-infra/npm-shrinkwrap.json @@ -344,12 +344,12 @@ } }, "grunt-contrib-compress": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.12.0.tgz", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-0.13.0.tgz", "dependencies": { "archiver": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.11.0.tgz", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.13.0.tgz", "dependencies": { "async": { "version": "0.9.0", @@ -360,16 +360,26 @@ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz" }, "glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.2.2.tgz", "dependencies": { + "inflight": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", + "dependencies": { + "wrappy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" + } + } + }, "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", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz", "dependencies": { "lru-cache": { "version": "2.5.0", @@ -380,6 +390,16 @@ "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz" } } + }, + "once": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz", + "dependencies": { + "wrappy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" + } + } } } }, @@ -414,8 +434,8 @@ } }, "tar-stream": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.1.tgz", "dependencies": { "bl": { "version": "0.9.3", @@ -437,6 +457,28 @@ } } }, + "readable-stream": { + "version": "1.0.33", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", + "dependencies": { + "core-util-is": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" + }, + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + } + } + }, "xtend": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz" |
