From d0dcc027df8c227d15f528b21aca38e9493466dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 8 Nov 2016 18:44:58 +0100 Subject: [PATCH] Upgrade camshaft to version 0.47.0 --- NEWS.md | 5 +- npm-shrinkwrap.json | 108 ++++++++++++++++++++++---------------------- package.json | 4 +- 3 files changed, 60 insertions(+), 57 deletions(-) diff --git a/NEWS.md b/NEWS.md index 0efcdd4d..6dd49b52 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,11 @@ # Changelog -## 2.81.2 +## 2.82.0 Released 2016-mm-dd +Announcements: + - Upgrades camshaft to [0.47.0](https://github.com/CartoDB/camshaft/releases/tag/0.47.0). + ## 2.81.1 Released 2016-11-05 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f8eaf42f..2c312634 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.81.1", + "version": "2.82.0", "dependencies": { "body-parser": { "version": "1.14.2", @@ -105,9 +105,9 @@ } }, "camshaft": { - "version": "0.46.3", - "from": "camshaft@0.46.3", - "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.46.3.tgz", + "version": "0.47.0", + "from": "camshaft@0.47.0", + "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.47.0.tgz", "dependencies": { "async": { "version": "1.5.2", @@ -282,9 +282,9 @@ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" }, "form-data": { - "version": "2.1.1", + "version": "2.1.2", "from": "form-data@>=2.1.1 <2.2.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz", "dependencies": { "asynckit": { "version": "0.4.0", @@ -1390,49 +1390,49 @@ }, "windshaft": { "version": "2.6.2", - "from": "windshaft@2.6.2", + "from": "https://registry.npmjs.org/windshaft/-/windshaft-2.6.2.tgz", "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.6.2.tgz", "dependencies": { "abaculus": { "version": "1.1.0-cdb7", - "from": "cartodb/abaculus#1.1.0-cdb7", + "from": "git://github.com/cartodb/abaculus.git#49e73cf3dbc023af5cb575dffb09384907dc7ed1", "resolved": "git://github.com/cartodb/abaculus.git#49e73cf3dbc023af5cb575dffb09384907dc7ed1" }, "canvas": { "version": "1.2.7-cdb1", - "from": "cartodb/node-canvas#1.2.7-cdb1", + "from": "git://github.com/cartodb/node-canvas.git#f17f99d1bf757c230cda2169f1b4a94fd6eff97d", "resolved": "git://github.com/cartodb/node-canvas.git#f17f99d1bf757c230cda2169f1b4a94fd6eff97d", "dependencies": { "nan": { "version": "1.9.0", - "from": "nan@>=1.8.4 <2.0.0", + "from": "https://registry.npmjs.org/nan/-/nan-1.9.0.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-1.9.0.tgz" } } }, "carto": { "version": "0.15.1-cdb1", - "from": "cartodb/carto#0.15.1-cdb2", + "from": "git://github.com/cartodb/carto.git#673cf381215948269827052afa152e485b01e2f0", "resolved": "git://github.com/cartodb/carto.git#673cf381215948269827052afa152e485b01e2f0", "dependencies": { "mapnik-reference": { "version": "6.0.5", - "from": "mapnik-reference@>=6.0.2 <6.1.0", + "from": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-6.0.5.tgz", "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-6.0.5.tgz" }, "optimist": { "version": "0.6.1", - "from": "optimist@>=0.6.0 <0.7.0", + "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "wordwrap@>=0.0.2 <0.1.0", + "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" }, "minimist": { "version": "0.0.10", - "from": "minimist@>=0.0.1 <0.1.0", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" } } @@ -1441,7 +1441,7 @@ }, "grainstore": { "version": "1.2.0", - "from": "grainstore@1.2.0", + "from": "https://registry.npmjs.org/grainstore/-/grainstore-1.2.0.tgz", "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-1.2.0.tgz", "dependencies": { "carto": { @@ -1451,39 +1451,39 @@ "dependencies": { "underscore": { "version": "1.4.4", - "from": "underscore@>=1.4.3 <1.5.0", + "from": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz" }, "mapnik-reference": { "version": "5.0.9", - "from": "mapnik-reference@>=5.0.7 <5.1.0", + "from": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz", "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz" }, "xml2js": { "version": "0.2.8", - "from": "xml2js@>=0.2.4 <0.3.0", + "from": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz", "dependencies": { "sax": { "version": "0.5.8", - "from": "sax@>=0.5.0 <0.6.0", + "from": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz" } } }, "optimist": { "version": "0.6.1", - "from": "optimist@>=0.6.0 <0.7.0", + "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "wordwrap@>=0.0.2 <0.1.0", + "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" }, "minimist": { "version": "0.0.10", - "from": "minimist@>=0.0.1 <0.1.0", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" } } @@ -1492,22 +1492,22 @@ }, "millstone": { "version": "0.6.16", - "from": "millstone@0.6.16", + "from": "https://registry.npmjs.org/millstone/-/millstone-0.6.16.tgz", "resolved": "https://registry.npmjs.org/millstone/-/millstone-0.6.16.tgz", "dependencies": { "generic-pool": { "version": "2.1.1", - "from": "generic-pool@>=2.1.1 <2.2.0", + "from": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz" }, "srs": { "version": "0.4.9", - "from": "srs@>=0.4.6 <0.5.0", + "from": "https://registry.npmjs.org/srs/-/srs-0.4.9.tgz", "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.9.tgz", "dependencies": { "nan": { "version": "1.8.4", - "from": "nan@>=1.8.4 <1.9.0", + "from": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz" }, "node-pre-gyp": { @@ -2234,12 +2234,12 @@ }, "zipfile": { "version": "0.5.9", - "from": "zipfile@>=0.5.5 <0.6.0", + "from": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.9.tgz", "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.9.tgz", "dependencies": { "nan": { "version": "2.1.0", - "from": "nan@>=2.1.0 <2.2.0", + "from": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz" }, "node-pre-gyp": { @@ -3024,12 +3024,12 @@ }, "sqlite3": { "version": "3.1.8", - "from": "sqlite3@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", + "from": "https://registry.npmjs.org/sqlite3/-/sqlite3-3.1.8.tgz", "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-3.1.8.tgz", "dependencies": { "nan": { "version": "2.4.0", - "from": "nan@>=2.4.0 <2.5.0", + "from": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz" }, "node-pre-gyp": { @@ -3830,34 +3830,34 @@ }, "mime": { "version": "1.2.11", - "from": "mime@>=1.2.11 <1.3.0", + "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz", "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "mkdirp": { "version": "0.5.1", - "from": "mkdirp@>=0.5.0 <0.6.0", + "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "dependencies": { "minimist": { "version": "0.0.8", - "from": "minimist@0.0.8", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" } } }, "optimist": { "version": "0.6.1", - "from": "optimist@>=0.6.1 <0.7.0", + "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "wordwrap@>=0.0.2 <0.1.0", + "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" }, "minimist": { "version": "0.0.10", - "from": "minimist@>=0.0.1 <0.1.0", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" } } @@ -3873,17 +3873,17 @@ "dependencies": { "nan": { "version": "1.2.0", - "from": "nan@>=1.2.0 <1.3.0", + "from": "https://registry.npmjs.org/nan/-/nan-1.2.0.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-1.2.0.tgz" }, "mapnik-vector-tile": { "version": "0.5.5", - "from": "mapnik-vector-tile@0.5.5", + "from": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz", "resolved": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz" }, "node-pre-gyp": { "version": "0.5.25", - "from": "node-pre-gyp@0.5.25", + "from": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.25.tgz", "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.25.tgz", "dependencies": { "nopt": { @@ -4253,32 +4253,32 @@ }, "semver": { "version": "5.0.3", - "from": "semver@>=5.0.3 <5.1.0", + "from": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz" }, "sphericalmercator": { "version": "1.0.3", - "from": "sphericalmercator@1.0.3", + "from": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.3.tgz", "resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.3.tgz" }, "tilelive": { "version": "4.5.3", - "from": "tilelive@>=4.5.3 <4.6.0", + "from": "https://registry.npmjs.org/tilelive/-/tilelive-4.5.3.tgz", "resolved": "https://registry.npmjs.org/tilelive/-/tilelive-4.5.3.tgz", "dependencies": { "optimist": { "version": "0.6.1", - "from": "optimist@>=0.6.0 <0.7.0", + "from": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.3", - "from": "wordwrap@>=0.0.2 <0.1.0", + "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" }, "minimist": { "version": "0.0.10", - "from": "minimist@>=0.0.1 <0.1.0", + "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" } } @@ -4287,22 +4287,22 @@ }, "tilelive-bridge": { "version": "1.3.0-cdb7", - "from": "cartodb/tilelive-bridge#1.3.0-cdb7", + "from": "git://github.com/cartodb/tilelive-bridge.git#36e4dc3b1bd8094ebc1da6446509a6f5334a3cc9", "resolved": "git://github.com/cartodb/tilelive-bridge.git#36e4dc3b1bd8094ebc1da6446509a6f5334a3cc9", "dependencies": { "mapnik-pool": { "version": "0.1.1-cdb7", - "from": "cartodb/mapnik-pool#0.1.1-cdb7", + "from": "git://github.com/cartodb/mapnik-pool.git#2d5c709d1351aa583e6e6138a2a08aba5da287c4", "resolved": "git://github.com/cartodb/mapnik-pool.git#2d5c709d1351aa583e6e6138a2a08aba5da287c4", "dependencies": { "generic-pool": { "version": "2.1.1", - "from": "generic-pool@>=2.1.1 <2.2.0", + "from": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz" }, "xtend": { "version": "3.0.0", - "from": "xtend@>=3.0.0 <3.1.0", + "from": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz" } } @@ -4311,24 +4311,24 @@ }, "tilelive-mapnik": { "version": "0.6.15-cdb9", - "from": "cartodb/tilelive-mapnik#0.6.15-cdb9", + "from": "git://github.com/cartodb/tilelive-mapnik.git#925067ed5537d73b5e6cc6067f2708172a774a42", "resolved": "git://github.com/cartodb/tilelive-mapnik.git#925067ed5537d73b5e6cc6067f2708172a774a42", "dependencies": { "generic-pool": { "version": "2.1.1", - "from": "generic-pool@>=2.1.1 <2.2.0", + "from": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz" }, "mime": { "version": "1.2.11", - "from": "mime@>=1.2.11 <1.3.0", + "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz", "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" } } }, "torque.js": { "version": "2.11.4", - "from": "torque.js@>=2.11.0 <2.12.0", + "from": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.4.tgz", "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.4.tgz" } } diff --git a/package.json b/package.json index 47c02252..71e5ff5a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.81.2", + "version": "2.82.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -20,7 +20,7 @@ ], "dependencies": { "body-parser": "~1.14.0", - "camshaft": "0.46.3", + "camshaft": "0.47.0", "cartodb-psql": "~0.6.1", "cartodb-query-tables": "~0.1.0", "cartodb-redis": "0.13.1",