From ac316722b0fedff39981939ffbc5458d52ea6bc8 Mon Sep 17 00:00:00 2001 From: Ryan Kelly Date: Tue, 10 Nov 2015 18:28:15 +1100 Subject: [PATCH] chore(build): switch to grunt-nsp --- .travis.yml | 1 + Gruntfile.js | 2 +- {tasks => grunttasks}/bump.js | 0 {tasks => grunttasks}/copyright.js | 0 {tasks => grunttasks}/eslint.js | 0 {tasks => grunttasks}/jscs.js | 0 {tasks => grunttasks}/lint.js | 0 grunttasks/nsp.js | 11 + {tasks => grunttasks}/release.js | 0 {tasks => grunttasks}/server.js | 0 {tasks => grunttasks}/test.js | 0 npm-shrinkwrap.json | 309 ++++++++++++++--------------- package.json | 4 +- 13 files changed, 168 insertions(+), 159 deletions(-) rename {tasks => grunttasks}/bump.js (100%) rename {tasks => grunttasks}/copyright.js (100%) rename {tasks => grunttasks}/eslint.js (100%) rename {tasks => grunttasks}/jscs.js (100%) rename {tasks => grunttasks}/lint.js (100%) create mode 100644 grunttasks/nsp.js rename {tasks => grunttasks}/release.js (100%) rename {tasks => grunttasks}/server.js (100%) rename {tasks => grunttasks}/test.js (100%) diff --git a/.travis.yml b/.travis.yml index df401bade..b53b4e0b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ before_script: script: - npm run outdated - grunt test + - grunt nsp --force matrix: allow_failures: diff --git a/Gruntfile.js b/Gruntfile.js index 7bd4ce3be..8a4f24081 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -16,7 +16,7 @@ module.exports = function (grunt) { mainJsFiles: '{,lib/**/,scripts/**/,test/**/,tasks/**/,bin/**/}*.js' }); - grunt.loadTasks('tasks'); + grunt.loadTasks('grunttasks'); grunt.registerTask('default', [ 'test' diff --git a/tasks/bump.js b/grunttasks/bump.js similarity index 100% rename from tasks/bump.js rename to grunttasks/bump.js diff --git a/tasks/copyright.js b/grunttasks/copyright.js similarity index 100% rename from tasks/copyright.js rename to grunttasks/copyright.js diff --git a/tasks/eslint.js b/grunttasks/eslint.js similarity index 100% rename from tasks/eslint.js rename to grunttasks/eslint.js diff --git a/tasks/jscs.js b/grunttasks/jscs.js similarity index 100% rename from tasks/jscs.js rename to grunttasks/jscs.js diff --git a/tasks/lint.js b/grunttasks/lint.js similarity index 100% rename from tasks/lint.js rename to grunttasks/lint.js diff --git a/grunttasks/nsp.js b/grunttasks/nsp.js new file mode 100644 index 000000000..8a9d97989 --- /dev/null +++ b/grunttasks/nsp.js @@ -0,0 +1,11 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +module.exports = function (grunt) { + grunt.config('nsp', { + output: 'summary', + package: grunt.file.readJSON('package.json'), + shrinkwrap: grunt.file.readJSON('npm-shrinkwrap.json') + }); +}; diff --git a/tasks/release.js b/grunttasks/release.js similarity index 100% rename from tasks/release.js rename to grunttasks/release.js diff --git a/tasks/server.js b/grunttasks/server.js similarity index 100% rename from tasks/server.js rename to grunttasks/server.js diff --git a/tasks/test.js b/grunttasks/test.js similarity index 100% rename from tasks/test.js rename to grunttasks/test.js diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 162632c5d..4070a569a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -4,12 +4,12 @@ "dependencies": { "URIjs": { "version": "1.16.1", - "from": "URIjs@1.16.1", + "from": "URIjs@>=1.14.2 <2.0.0", "resolved": "https://registry.npmjs.org/URIjs/-/URIjs-1.16.1.tgz" }, "bluebird": { "version": "2.10.2", - "from": "bluebird@2.10.2", + "from": "bluebird@>=2.9.14 <3.0.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz" }, "buf": { @@ -19,7 +19,7 @@ }, "convict": { "version": "0.8.2", - "from": "convict@0.8.2", + "from": "convict@>=0.8.0 <0.9.0", "resolved": "https://registry.npmjs.org/convict/-/convict-0.8.2.tgz", "dependencies": { "cjson": { @@ -34,32 +34,32 @@ "dependencies": { "nomnom": { "version": "1.8.1", - "from": "nomnom@>= 1.5.x", + "from": "nomnom@>=1.5.0", "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz", "dependencies": { "underscore": { "version": "1.6.0", - "from": "underscore@~1.6.0", + "from": "underscore@>=1.6.0 <1.7.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "chalk": { "version": "0.4.0", - "from": "chalk@~0.4.0", + "from": "chalk@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", "dependencies": { "has-color": { "version": "0.1.7", - "from": "has-color@~0.1.0", + "from": "has-color@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz" }, "ansi-styles": { "version": "1.0.0", - "from": "ansi-styles@~1.0.0", + "from": "ansi-styles@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz" }, "strip-ansi": { "version": "0.1.1", - "from": "strip-ansi@~0.1.0", + "from": "strip-ansi@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz" } } @@ -68,7 +68,7 @@ }, "JSV": { "version": "4.0.2", - "from": "JSV@>= 4.0.x", + "from": "JSV@>=4.0.0", "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz" } } @@ -92,12 +92,12 @@ "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "wordwrap@~0.0.2", + "from": "wordwrap@>=0.0.2 <0.1.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" }, "minimist": { "version": "0.0.10", - "from": "minimist@~0.0.1", + "from": "minimist@>=0.0.1 <0.1.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" } } @@ -114,17 +114,17 @@ "dependencies": { "through": { "version": "2.3.8", - "from": "through@~2.3.4", + "from": "through@>=2.3.4 <2.4.0", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz" }, "redeyed": { "version": "0.4.4", - "from": "redeyed@~0.4.2", + "from": "redeyed@>=0.4.2 <0.5.0", "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz", "dependencies": { "esprima": { "version": "1.0.4", - "from": "esprima@~1.0.4", + "from": "esprima@>=1.0.4 <1.1.0", "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz" } } @@ -155,7 +155,7 @@ "dependencies": { "iconv-lite": { "version": "0.4.13", - "from": "iconv-lite@0.4.13", + "from": "iconv-lite@>=0.4.4 <0.5.0", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" } } @@ -174,17 +174,17 @@ "dependencies": { "inherits": { "version": "2.0.1", - "from": "inherits@^2.0.1", + "from": "inherits@>=2.0.1 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "minimalistic-assert": { "version": "1.0.0", - "from": "minimalistic-assert@^1.0.0", + "from": "minimalistic-assert@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz" }, "bn.js": { "version": "1.3.0", - "from": "bn.js@^1.0.0", + "from": "bn.js@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz" } } @@ -412,229 +412,231 @@ }, "joi": { "version": "4.9.0", - "from": "joi@4.9.0", + "from": "joi@>=4.7.0 <5.0.0", "resolved": "https://registry.npmjs.org/joi/-/joi-4.9.0.tgz", "dependencies": { "hoek": { "version": "2.16.3", - "from": "hoek@^2.2.x", + "from": "hoek@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" }, "topo": { "version": "1.1.0", - "from": "topo@1.x.x", + "from": "topo@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz" }, "isemail": { "version": "1.2.0", - "from": "isemail@1.x.x", + "from": "isemail@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz" }, "moment": { "version": "2.10.6", - "from": "moment@2.x.x", + "from": "moment@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz" } } }, "mocha": { - "version": "2.2.5", - "from": "https://registry.npmjs.org/mocha/-/mocha-2.2.5.tgz", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.2.5.tgz", + "version": "2.3.3", + "from": "mocha@>=1.20.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.3.3.tgz", "dependencies": { "commander": { "version": "2.3.0", - "from": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz", + "from": "commander@2.3.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz" }, "debug": { "version": "2.0.0", - "from": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz", + "from": "debug@2.0.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz", "dependencies": { "ms": { "version": "0.6.2", - "from": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz", + "from": "ms@0.6.2", "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz" } } }, "diff": { "version": "1.4.0", - "from": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz", + "from": "diff@1.4.0", "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz" }, "escape-string-regexp": { "version": "1.0.2", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz", + "from": "escape-string-regexp@1.0.2", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz" }, "glob": { "version": "3.2.3", - "from": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", + "from": "glob@3.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz", "dependencies": { "minimatch": { "version": "0.2.14", - "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "from": "minimatch@>=0.2.11 <0.3.0", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", "dependencies": { "lru-cache": { - "version": "2.6.4", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz" + "version": "2.7.0", + "from": "lru-cache@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz" }, "sigmund": { "version": "1.0.1", - "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "from": "sigmund@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" } } }, "graceful-fs": { "version": "2.0.3", - "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz", + "from": "graceful-fs@>=2.0.0 <2.1.0", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz" }, "inherits": { "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "growl": { "version": "1.8.1", - "from": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz", + "from": "growl@1.8.1", "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz" }, "jade": { "version": "0.26.3", - "from": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", + "from": "jade@0.26.3", "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz", "dependencies": { "commander": { "version": "0.6.1", - "from": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz", + "from": "commander@0.6.1", "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz" }, "mkdirp": { "version": "0.3.0", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "from": "mkdirp@0.3.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" } } }, "mkdirp": { "version": "0.5.0", - "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", + "from": "mkdirp@0.5.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", "dependencies": { "minimist": { "version": "0.0.8", - "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "from": "minimist@0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "supports-color": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz" + "version": "1.2.0", + "from": "supports-color@1.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz" } } }, "mozlog": { "version": "2.0.2", - "from": "mozlog@2.0.2", + "from": "mozlog@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/mozlog/-/mozlog-2.0.2.tgz", "dependencies": { "intel": { "version": "1.0.2", - "from": "intel@^1.0.0", + "from": "intel@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/intel/-/intel-1.0.2.tgz", "dependencies": { "chalk": { "version": "1.1.1", - "from": "chalk@~1.1.0", + "from": "chalk@1.1.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", "dependencies": { "ansi-styles": { "version": "2.1.0", - "from": "ansi-styles@^2.1.0", + "from": "ansi-styles@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" }, "escape-string-regexp": { "version": "1.0.3", - "from": "escape-string-regexp@^1.0.2", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, "has-ansi": { "version": "2.0.0", - "from": "has-ansi@^2.0.0", + "from": "has-ansi@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "ansi-regex@^2.0.0", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "strip-ansi": { "version": "3.0.0", - "from": "strip-ansi@^3.0.0", + "from": "strip-ansi@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "ansi-regex@^2.0.0", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "supports-color": { "version": "2.0.0", - "from": "supports-color@^2.0.0", + "from": "supports-color@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" } } }, "dbug": { "version": "0.4.2", - "from": "dbug@~0.4.2", + "from": "dbug@>=0.4.2 <0.5.0", "resolved": "https://registry.npmjs.org/dbug/-/dbug-0.4.2.tgz" }, "stack-trace": { "version": "0.0.9", - "from": "stack-trace@~0.0.9", + "from": "stack-trace@>=0.0.9 <0.1.0", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz" }, "strftime": { "version": "0.9.2", - "from": "strftime@~0.9.2", + "from": "strftime@>=0.9.2 <0.10.0", "resolved": "https://registry.npmjs.org/strftime/-/strftime-0.9.2.tgz" }, "symbol": { "version": "0.2.1", - "from": "symbol@~0.2.0", + "from": "symbol@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/symbol/-/symbol-0.2.1.tgz" }, "utcstring": { "version": "0.1.0", - "from": "utcstring@~0.1.0", + "from": "utcstring@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/utcstring/-/utcstring-0.1.0.tgz" } } }, "merge": { "version": "1.2.0", - "from": "merge@^1.2.0", + "from": "merge@>=1.2.0 <2.0.0", "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz" } } }, "mysql": { "version": "2.9.0", - "from": "mysql@2.9.0", + "from": "mysql@>=2.5.5 <3.0.0", "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.9.0.tgz", "dependencies": { "bignumber.js": { @@ -644,12 +646,12 @@ }, "readable-stream": { "version": "1.1.13", - "from": "readable-stream@~1.1.13", + "from": "readable-stream@>=1.1.13 <1.2.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@~1.0.0", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { @@ -659,12 +661,12 @@ }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@~0.10.x", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "inherits@~2.0.1", + "from": "inherits@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -678,17 +680,12 @@ "dependencies": { "async": { "version": "0.9.2", - "from": "async@0.9.2", + "from": "async@>=0.9.0 <0.10.0", "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz" }, - "bluebird": { - "version": "2.10.2", - "from": "bluebird@2.10.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz" - }, "clone": { "version": "0.1.19", - "from": "clone@0.1.19", + "from": "clone@>=0.1.18 <0.2.0", "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz" }, "glob": { @@ -698,35 +695,35 @@ "dependencies": { "inflight": { "version": "1.0.4", - "from": "inflight@^1.0.4", + "from": "inflight@>=1.0.4 <2.0.0", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", "dependencies": { "wrappy": { "version": "1.0.1", - "from": "wrappy@1", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" } } }, "inherits": { "version": "2.0.1", - "from": "inherits@2", + "from": "inherits@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "minimatch": { "version": "3.0.0", - "from": "minimatch@2 || 3", + "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz", "dependencies": { "brace-expansion": { "version": "1.1.1", - "from": "brace-expansion@^1.0.0", + "from": "brace-expansion@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz", "dependencies": { "balanced-match": { - "version": "0.2.0", - "from": "balanced-match@^0.2.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz" + "version": "0.2.1", + "from": "balanced-match@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz" }, "concat-map": { "version": "0.0.1", @@ -739,53 +736,53 @@ }, "once": { "version": "1.3.2", - "from": "once@^1.3.0", + "from": "once@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", "dependencies": { "wrappy": { "version": "1.0.1", - "from": "wrappy@1", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" } } }, "path-is-absolute": { "version": "1.0.0", - "from": "path-is-absolute@^1.0.0", + "from": "path-is-absolute@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" } } }, "xtend": { - "version": "4.0.0", - "from": "xtend@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz" + "version": "4.0.1", + "from": "xtend@4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, "request": { "version": "2.65.0", - "from": "request@2.65.0", + "from": "request@>=2.54.0 <3.0.0", "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz", "dependencies": { "bl": { "version": "1.0.0", - "from": "bl@~1.0.0", + "from": "bl@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz", "dependencies": { "readable-stream": { - "version": "2.0.2", - "from": "readable-stream@~2.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", + "version": "2.0.4", + "from": "readable-stream@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@~1.0.0", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "inherits": { "version": "2.0.1", - "from": "inherits@~2.0.1", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { @@ -795,17 +792,17 @@ }, "process-nextick-args": { "version": "1.0.3", - "from": "process-nextick-args@~1.0.0", + "from": "process-nextick-args@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz" }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@~0.10.x", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "util-deprecate": { "version": "1.0.2", - "from": "util-deprecate@~1.0.1", + "from": "util-deprecate@>=1.0.1 <1.1.0", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" } } @@ -814,76 +811,76 @@ }, "caseless": { "version": "0.11.0", - "from": "caseless@~0.11.0", + "from": "caseless@>=0.11.0 <0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" }, "extend": { "version": "3.0.0", - "from": "extend@~3.0.0", + "from": "extend@>=3.0.0 <3.1.0", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" }, "forever-agent": { "version": "0.6.1", - "from": "forever-agent@~0.6.1", + "from": "forever-agent@>=0.6.1 <0.7.0", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" }, "form-data": { "version": "1.0.0-rc3", - "from": "form-data@~1.0.0-rc3", + "from": "form-data@>=1.0.0-rc3 <1.1.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz", "dependencies": { "async": { - "version": "1.4.2", - "from": "async@^1.4.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz" + "version": "1.5.0", + "from": "async@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz" } } }, "json-stringify-safe": { "version": "5.0.1", - "from": "json-stringify-safe@~5.0.1", + "from": "json-stringify-safe@>=5.0.1 <5.1.0", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, "mime-types": { "version": "2.1.7", - "from": "mime-types@~2.1.7", + "from": "mime-types@>=2.1.7 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz", "dependencies": { "mime-db": { "version": "1.19.0", - "from": "mime-db@~1.19.0", + "from": "mime-db@>=1.19.0 <1.20.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz" } } }, "node-uuid": { "version": "1.4.3", - "from": "node-uuid@~1.4.3", + "from": "node-uuid@>=1.4.3 <1.5.0", "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz" }, "qs": { "version": "5.2.0", - "from": "qs@~5.2.0", + "from": "qs@>=5.2.0 <5.3.0", "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz" }, "tunnel-agent": { "version": "0.4.1", - "from": "tunnel-agent@~0.4.1", + "from": "tunnel-agent@>=0.4.1 <0.5.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz" }, "tough-cookie": { "version": "2.2.0", - "from": "tough-cookie@~2.2.0", + "from": "tough-cookie@>=2.2.0 <2.3.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz" }, "http-signature": { "version": "0.11.0", - "from": "http-signature@~0.11.0", + "from": "http-signature@>=0.11.0 <0.12.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz", "dependencies": { "assert-plus": { "version": "0.1.5", - "from": "assert-plus@^0.1.5", + "from": "assert-plus@>=0.1.5 <0.2.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz" }, "asn1": { @@ -900,144 +897,144 @@ }, "oauth-sign": { "version": "0.8.0", - "from": "oauth-sign@~0.8.0", + "from": "oauth-sign@>=0.8.0 <0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz" }, "hawk": { - "version": "3.1.0", - "from": "hawk@~3.1.0", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz", + "version": "3.1.1", + "from": "hawk@>=3.1.0 <3.2.0", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.1.tgz", "dependencies": { "hoek": { "version": "2.16.3", - "from": "hoek@2.x.x", + "from": "hoek@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" }, "boom": { - "version": "2.9.0", - "from": "boom@^2.8.x", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz" + "version": "2.10.1", + "from": "boom@>=2.8.0 <3.0.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" }, "cryptiles": { "version": "2.0.5", - "from": "cryptiles@2.x.x", + "from": "cryptiles@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" }, "sntp": { "version": "1.0.9", - "from": "sntp@1.x.x", + "from": "sntp@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" } } }, "aws-sign2": { "version": "0.6.0", - "from": "aws-sign2@~0.6.0", + "from": "aws-sign2@>=0.6.0 <0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, "stringstream": { - "version": "0.0.4", - "from": "stringstream@~0.0.4", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz" + "version": "0.0.5", + "from": "stringstream@>=0.0.4 <0.1.0", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" }, "combined-stream": { "version": "1.0.5", - "from": "combined-stream@~1.0.5", + "from": "combined-stream@>=1.0.5 <1.1.0", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "dependencies": { "delayed-stream": { "version": "1.0.0", - "from": "delayed-stream@~1.0.0", + "from": "delayed-stream@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" } } }, "isstream": { "version": "0.1.2", - "from": "isstream@~0.1.2", + "from": "isstream@>=0.1.2 <0.2.0", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" }, "har-validator": { "version": "2.0.2", - "from": "har-validator@~2.0.2", + "from": "har-validator@>=2.0.2 <2.1.0", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.2.tgz", "dependencies": { "chalk": { "version": "1.1.1", - "from": "chalk@^1.1.1", + "from": "chalk@1.1.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz", "dependencies": { "ansi-styles": { "version": "2.1.0", - "from": "ansi-styles@^2.1.0", + "from": "ansi-styles@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" }, "escape-string-regexp": { "version": "1.0.3", - "from": "escape-string-regexp@^1.0.2", + "from": "escape-string-regexp@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, "has-ansi": { "version": "2.0.0", - "from": "has-ansi@^2.0.0", + "from": "has-ansi@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "ansi-regex@^2.0.0", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "strip-ansi": { "version": "3.0.0", - "from": "strip-ansi@^3.0.0", + "from": "strip-ansi@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", - "from": "ansi-regex@^2.0.0", + "from": "ansi-regex@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "supports-color": { "version": "2.0.0", - "from": "supports-color@^2.0.0", + "from": "supports-color@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" } } }, "commander": { "version": "2.9.0", - "from": "commander@^2.8.1", + "from": "commander@>=2.8.1 <3.0.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", "dependencies": { "graceful-readlink": { "version": "1.0.1", - "from": "graceful-readlink@>= 1.0.0", + "from": "graceful-readlink@>=1.0.0", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" } } }, "is-my-json-valid": { - "version": "2.12.2", - "from": "is-my-json-valid@^2.12.2", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz", + "version": "2.12.3", + "from": "is-my-json-valid@>=2.12.2 <3.0.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz", "dependencies": { "generate-function": { "version": "2.0.0", - "from": "generate-function@^2.0.0", + "from": "generate-function@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" }, "generate-object-property": { "version": "1.2.0", - "from": "generate-object-property@^1.1.0", + "from": "generate-object-property@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", "dependencies": { "is-property": { "version": "1.0.2", - "from": "is-property@^1.0.0", + "from": "is-property@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" } } @@ -1048,20 +1045,20 @@ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" }, "xtend": { - "version": "4.0.0", - "from": "xtend@^4.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz" + "version": "4.0.1", + "from": "xtend@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } }, "pinkie-promise": { "version": "1.0.0", - "from": "pinkie-promise@^1.0.0", + "from": "pinkie-promise@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", "dependencies": { "pinkie": { "version": "1.0.0", - "from": "pinkie@^1.0.0", + "from": "pinkie@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz" } } diff --git a/package.json b/package.json index d911ec9f2..df4e942d9 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "awsbox": "^0.7.0", - "blanket": "^1.1.6", + "blanket": "^1.1.9", "eslint-config-fxa": "^1.8.0", "generate-rsa-keypair": "^0.1.0", "grunt": "^0.4.5", @@ -49,7 +49,7 @@ "grunt-jscs": "^1.5.0", "grunt-mocha-test": "^0.12.2", "grunt-nodemon": "^0.4.0", - "grunt-nsp-shrinkwrap": "^0.0.3", + "grunt-nsp": "2.1.2", "insist": "0.x", "load-grunt-tasks": "^3.1.0", "mocha-text-cov": "^0.1.0",