diff --git a/NEWS.md b/NEWS.md index d66ddc98..8fc009d9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,9 @@ 1.17.3 -- 2014-mm-dd -------------------- +Announcements: + - Comes back to use mapnik 2.3.x based on cartodb/node-mapnik@1.4.15-cdb from windshaft@0.28.0 + 1.17.2 -- 2014-10-01 -------------------- diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 589109fd..ace7247a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -13,8 +13,8 @@ "version": "1.0.2" }, "windshaft": { - "version": "0.27.2", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.27.2", + "version": "0.28.1", + "from": "https://github.com/CartoDB/Windshaft/tarball/0.28.0", "dependencies": { "chronograph": { "version": "0.1.0", @@ -899,8 +899,252 @@ } }, "mapnik": { - "version": "0.7.26-cdb1", - "from": "http://github.com/Vizzuality/node-mapnik/tarball/0.7.26-cdb1" + "version": "1.4.15", + "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb", + "dependencies": { + "nan": { + "version": "1.2.0" + }, + "mapnik-vector-tile": { + "version": "0.5.5" + }, + "node-pre-gyp": { + "version": "0.5.25", + "dependencies": { + "nopt": { + "version": "3.0.1", + "dependencies": { + "abbrev": { + "version": "1.0.5" + } + } + }, + "npmlog": { + "version": "0.1.1", + "dependencies": { + "ansi": { + "version": "0.3.0" + } + } + }, + "request": { + "version": "2.40.0", + "dependencies": { + "qs": { + "version": "1.0.2" + }, + "json-stringify-safe": { + "version": "5.0.0" + }, + "mime-types": { + "version": "1.0.2" + }, + "forever-agent": { + "version": "0.5.2" + }, + "node-uuid": { + "version": "1.4.1" + }, + "tough-cookie": { + "version": "0.12.1", + "dependencies": { + "punycode": { + "version": "1.3.1" + } + } + }, + "form-data": { + "version": "0.1.4", + "dependencies": { + "combined-stream": { + "version": "0.0.5", + "dependencies": { + "delayed-stream": { + "version": "0.0.5" + } + } + }, + "mime": { + "version": "1.2.11" + }, + "async": { + "version": "0.9.0" + } + } + }, + "tunnel-agent": { + "version": "0.4.0" + }, + "http-signature": { + "version": "0.10.0", + "dependencies": { + "assert-plus": { + "version": "0.1.2" + }, + "asn1": { + "version": "0.1.11" + }, + "ctype": { + "version": "0.5.2" + } + } + }, + "oauth-sign": { + "version": "0.3.0" + }, + "hawk": { + "version": "1.1.1", + "dependencies": { + "hoek": { + "version": "0.9.1" + }, + "boom": { + "version": "0.4.2" + }, + "cryptiles": { + "version": "0.2.2" + }, + "sntp": { + "version": "0.2.4" + } + } + }, + "aws-sign2": { + "version": "0.5.0" + }, + "stringstream": { + "version": "0.0.4" + } + } + }, + "semver": { + "version": "3.0.1" + }, + "tar": { + "version": "1.0.1", + "dependencies": { + "block-stream": { + "version": "0.0.7" + }, + "fstream": { + "version": "1.0.2", + "dependencies": { + "graceful-fs": { + "version": "3.0.2" + } + } + }, + "inherits": { + "version": "2.0.1" + } + } + }, + "tar-pack": { + "version": "2.0.0", + "dependencies": { + "uid-number": { + "version": "0.0.3" + }, + "once": { + "version": "1.1.1" + }, + "debug": { + "version": "0.7.4" + }, + "fstream": { + "version": "0.1.31", + "dependencies": { + "graceful-fs": { + "version": "3.0.2" + }, + "inherits": { + "version": "2.0.1" + } + } + }, + "tar": { + "version": "0.1.20", + "dependencies": { + "block-stream": { + "version": "0.0.7" + }, + "inherits": { + "version": "2.0.1" + } + } + }, + "fstream-ignore": { + "version": "0.0.7", + "dependencies": { + "minimatch": { + "version": "0.2.14", + "dependencies": { + "lru-cache": { + "version": "2.5.0" + }, + "sigmund": { + "version": "1.0.0" + } + } + }, + "inherits": { + "version": "2.0.1" + } + } + }, + "readable-stream": { + "version": "1.0.31", + "dependencies": { + "core-util-is": { + "version": "1.0.1" + }, + "isarray": { + "version": "0.0.1" + }, + "string_decoder": { + "version": "0.10.31" + }, + "inherits": { + "version": "2.0.1" + } + } + }, + "graceful-fs": { + "version": "1.2.3" + } + } + }, + "mkdirp": { + "version": "0.5.0", + "dependencies": { + "minimist": { + "version": "0.0.8" + } + } + }, + "rc": { + "version": "0.5.1", + "dependencies": { + "minimist": { + "version": "0.0.10" + }, + "deep-extend": { + "version": "0.2.11" + }, + "strip-json-comments": { + "version": "0.1.3" + }, + "ini": { + "version": "1.1.0" + } + } + }, + "rimraf": { + "version": "2.2.8" + } + } + } + } }, "tilelive": { "version": "4.5.3", diff --git a/package.json b/package.json index 0230c06a..8004835e 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.27.2", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.28.0", "step": "~0.0.5", "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",