From c280ee313f13d837c26559e8f2751c82dcd0abae Mon Sep 17 00:00:00 2001 From: Vitor Baptista Date: Tue, 4 Jul 2017 16:44:13 +0100 Subject: [PATCH] Upgrade os-types to fix the tests The problem is that the previous version used jsontableschema as a Git dependency, which npm-shrinkwrap didn't handle well. --- npm-shrinkwrap.json | 160 ++++++-------------------------------------- package.json | 2 +- 2 files changed, 22 insertions(+), 140 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6518245..8b4ee9f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -17,11 +17,6 @@ "from": "https://registry.npmjs.org/angular-route/-/angular-route-1.6.4.tgz", "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.6.4.tgz" }, - "async": { - "version": "1.5.2", - "from": "async@>=1.4.0 <2.0.0", - "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz" - }, "base64-js": { "version": "1.1.1", "from": "base64-js@1.1.1", @@ -1169,51 +1164,16 @@ } } }, - "combined-stream": { - "version": "1.0.5", - "from": "combined-stream@>=1.0.5 <2.0.0", - "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz" - }, - "component-emitter": { - "version": "1.2.1", - "from": "component-emitter@>=1.2.0 <1.3.0", - "resolved": "http://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz" - }, - "cookiejar": { - "version": "2.0.6", - "from": "cookiejar@2.0.6", - "resolved": "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz" - }, - "core-util-is": { - "version": "1.0.2", - "from": "core-util-is@>=1.0.0 <1.1.0", - "resolved": "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, "crypto-js": { "version": "3.1.8", "from": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz" }, - "csv": { - "version": "0.4.6", - "from": "csv@>=0.4.2 <0.5.0", - "resolved": "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz" - }, - "csv-generate": { - "version": "0.0.6", - "from": "csv-generate@>=0.0.6 <0.0.7", - "resolved": "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz" - }, "csv-parse": { "version": "1.2.0", "from": "csv-parse@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz" }, - "csv-stringify": { - "version": "0.0.8", - "from": "csv-stringify@>=0.0.8 <0.0.9", - "resolved": "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz" - }, "d3-time": { "version": "0.2.6", "from": "d3-time@>=0.2.0 <0.3.0", @@ -1275,16 +1235,6 @@ } } }, - "debug": { - "version": "2.6.8", - "from": "debug@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz" - }, - "delayed-stream": { - "version": "1.0.0", - "from": "delayed-stream@>=1.0.0 <1.1.0", - "resolved": "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" - }, "es6-promise": { "version": "3.3.1", "from": "es6-promise@>=3.0.2 <4.0.0", @@ -1536,26 +1486,11 @@ } } }, - "extend": { - "version": "3.0.0", - "from": "extend@3.0.0", - "resolved": "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz" - }, "font-awesome": { "version": "4.7.0", "from": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz" }, - "form-data": { - "version": "1.0.0-rc3", - "from": "form-data@1.0.0-rc3", - "resolved": "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz" - }, - "formidable": { - "version": "1.0.17", - "from": "formidable@>=1.0.14 <1.1.0", - "resolved": "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz" - }, "goodtables": { "version": "0.4.1", "from": "akariv/goodtables-js", @@ -5958,16 +5893,6 @@ "from": "https://registry.npmjs.org/inflected/-/inflected-1.1.7.tgz", "resolved": "https://registry.npmjs.org/inflected/-/inflected-1.1.7.tgz" }, - "inherits": { - "version": "2.0.3", - "from": "inherits@>=2.0.1 <2.1.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "isarray@0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, "isomorphic-fetch": { "version": "2.2.1", "from": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", @@ -7644,26 +7569,6 @@ "from": "http://registry.npmjs.org/marked/-/marked-0.3.6.tgz", "resolved": "http://registry.npmjs.org/marked/-/marked-0.3.6.tgz" }, - "methods": { - "version": "1.1.2", - "from": "methods@>=1.1.1 <1.2.0", - "resolved": "http://registry.npmjs.org/methods/-/methods-1.1.2.tgz" - }, - "mime": { - "version": "1.3.4", - "from": "mime@1.3.4", - "resolved": "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz" - }, - "mime-db": { - "version": "1.27.0", - "from": "mime-db@>=1.27.0 <1.28.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz" - }, - "mime-types": { - "version": "2.1.15", - "from": "mime-types@>=2.1.3 <3.0.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz" - }, "mocha": { "version": "2.5.3", "from": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz", @@ -7775,11 +7680,6 @@ "from": "moment@>=2.13.0 <3.0.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz" }, - "ms": { - "version": "2.0.0", - "from": "ms@2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" - }, "nconf": { "version": "0.8.4", "from": "https://registry.npmjs.org/nconf/-/nconf-0.8.4.tgz", @@ -8397,34 +8297,41 @@ "resolved": "git://github.com/openspending/os-bootstrap.git#a0436a4cc0117a0c85b0ec10ed099d4f71e12a9f" }, "os-types": { - "version": "1.10.6", - "from": "https://registry.npmjs.org/os-types/-/os-types-1.10.6.tgz", - "resolved": "https://registry.npmjs.org/os-types/-/os-types-1.10.6.tgz", + "version": "1.14.0", + "from": "os-types@>=1.14.0 <1.15.0", + "resolved": "https://registry.npmjs.org/os-types/-/os-types-1.14.0.tgz", "dependencies": { "jsontableschema": { - "version": "0.1.0", - "from": "git+http://github.com/akariv/jsontableschema-js#fix/handle-percent-signs", - "resolved": "git+ssh://git@github.com/akariv/jsontableschema-js.git#ae343a039c67d00160724900bad171db58f922e6" + "version": "0.2.3", + "from": "jsontableschema@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/jsontableschema/-/jsontableschema-0.2.3.tgz", + "dependencies": { + "lodash": { + "version": "4.17.4", + "from": "lodash@>=4.13.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "tv4": { + "version": "1.3.0", + "from": "tv4@>=1.2.7 <2.0.0", + "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz" + } + } }, "lodash": { "version": "4.10.0", - "from": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz", + "from": "lodash@4.10.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz" }, "lodash-addons": { "version": "0.3.1", - "from": "https://registry.npmjs.org/lodash-addons/-/lodash-addons-0.3.1.tgz", + "from": "lodash-addons@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/lodash-addons/-/lodash-addons-0.3.1.tgz" }, "requirejs": { "version": "2.3.3", - "from": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.3.tgz", + "from": "requirejs@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.3.tgz" - }, - "bluebird": { - "version": "2.11.0", - "from": "bluebird@^2.9.30", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz" } } }, @@ -8433,21 +8340,6 @@ "from": "kravets-levko/PapaParse", "resolved": "git://github.com/kravets-levko/PapaParse.git#cdd76a97d9a2a83b8c65a660289db7413d4e51f8" }, - "qs": { - "version": "2.3.3", - "from": "qs@2.3.3", - "resolved": "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz" - }, - "readable-stream": { - "version": "1.0.27-1", - "from": "readable-stream@1.0.27-1", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz" - }, - "reduce-component": { - "version": "1.0.1", - "from": "reduce-component@1.0.1", - "resolved": "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz" - }, "request": { "version": "2.81.0", "from": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", @@ -8744,11 +8636,6 @@ "from": "stream-transform@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz" }, - "string_decoder": { - "version": "0.10.31", - "from": "string_decoder@>=0.10.0 <0.11.0", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, "stringify": { "version": "5.1.0", "from": "https://registry.npmjs.org/stringify/-/stringify-5.1.0.tgz", @@ -9188,11 +9075,6 @@ } } }, - "superagent": { - "version": "1.8.5", - "from": "superagent@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz" - }, "typeahead.js": { "version": "0.11.1", "from": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz", diff --git a/package.json b/package.json index d4858bf..9d91c21 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "marked": "^0.3.5", "nconf": "^0.8.2", "nunjucks": "^2.1.0", - "os-types": "~1.10.0", + "os-types": "~1.14.0", "papaparse": "kravets-levko/PapaParse.git", "request": "^2.65.0", "typeahead.js": "^0.11.1",