From 382ff2416f8acab60488ffac7b653fcd6ad8277a Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 8 Jun 2016 19:14:48 +0200 Subject: [PATCH] Upgrades windshaft to 2.3.0 --- NEWS.md | 2 +- npm-shrinkwrap.json | 74 ++++++++++++++++++++++----------------------- package.json | 2 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/NEWS.md b/NEWS.md index 9480aea4..492d5722 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,7 +9,7 @@ Improvements: - Warn on application start about non-matching dependencies Announcements: - - Upgrades windshaft to [2.2.0](https://github.com/CartoDB/camshaft/releases/tag/2.2.0) + - Upgrades windshaft to [2.3.0](https://github.com/CartoDB/camshaft/releases/tag/2.3.0) - Upgrades camshaft to [0.13.0](https://github.com/CartoDB/camshaft/releases/tag/0.13.0) - Upgrades turbo-carto to [0.11.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.11.0) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 836d275d..b6e05cd5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -146,7 +146,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@>=2.0.1 <2.1.0", + "from": "inherits@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { @@ -1017,7 +1017,7 @@ "dependencies": { "async": { "version": "1.5.2", - "from": "async@>=1.0.0 <2.0.0", + "from": "async@>=1.5.2 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } @@ -1029,7 +1029,7 @@ }, "mime-types": { "version": "2.1.11", - "from": "mime-types@>=2.1.11 <2.2.0", + "from": "mime-types@>=2.1.2 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", "dependencies": { "mime-db": { @@ -1318,9 +1318,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "2.2.0", - "from": "windshaft@2.2.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.2.0.tgz", + "version": "2.3.0", + "from": "windshaft@2.3.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.3.0.tgz", "dependencies": { "abaculus": { "version": "1.1.0-cdb5", @@ -3136,16 +3136,16 @@ "from": "gauge@>=1.2.5 <1.3.0", "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz" }, - "generate-function": { - "version": "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 <2.0.0", "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" }, + "generate-function": { + "version": "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" + }, "glob": { "version": "7.0.3", "from": "glob@>=7.0.0 <8.0.0", @@ -3236,16 +3236,16 @@ "from": "jodid25519@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" }, - "jsbn": { - "version": "0.1.0", - "from": "jsbn@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" - }, "json-schema": { "version": "0.2.2", "from": "json-schema@0.2.2", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz" }, + "jsbn": { + "version": "0.1.0", + "from": "jsbn@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" + }, "json-stringify-safe": { "version": "5.0.1", "from": "json-stringify-safe@>=5.0.1 <5.1.0", @@ -3416,20 +3416,15 @@ "from": "strip-json-comments@>=1.0.4 <1.1.0", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" }, - "supports-color": { - "version": "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" - }, "tar": { "version": "2.2.1", "from": "tar@>=2.2.0 <2.3.0", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz" }, - "tunnel-agent": { - "version": "0.4.3", - "from": "tunnel-agent@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" + "supports-color": { + "version": "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" }, "tough-cookie": { "version": "2.2.2", @@ -3441,6 +3436,11 @@ "from": "tweetnacl@>=0.13.0 <0.14.0", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" }, + "tunnel-agent": { + "version": "0.4.3", + "from": "tunnel-agent@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" + }, "uid-number": { "version": "0.0.6", "from": "uid-number@>=0.0.6 <0.1.0", @@ -3490,18 +3490,6 @@ } } }, - "getpass": { - "version": "0.1.6", - "from": "getpass@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "from": "assert-plus@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" - } - } - }, "rc": { "version": "1.1.6", "from": "rc@>=1.1.0 <1.2.0", @@ -3514,6 +3502,18 @@ } } }, + "getpass": { + "version": "0.1.6", + "from": "getpass@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, "sshpk": { "version": "1.8.3", "from": "sshpk@>=1.7.0 <2.0.0", diff --git a/package.json b/package.json index e5a494ad..58a94753 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "step-profiler": "~0.3.0", "turbo-carto": "0.11.0", "underscore": "~1.6.0", - "windshaft": "2.2.0" + "windshaft": "2.3.0" }, "devDependencies": { "istanbul": "~0.4.3",