From 3f726dc4c53601e47c4cf43d54df3bbedb1fdcbb Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 18 Aug 2014 14:41:29 +0200 Subject: [PATCH] Upgrades windshaft --- npm-shrinkwrap.json | 229 ++++++++++++++++++++++++++------------------ package.json | 8 +- 2 files changed, 139 insertions(+), 98 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6c596523..50d290f5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -10,13 +10,9 @@ "version": "1.6.0" }, "windshaft": { - "version": "0.24.1", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.24.1", + "version": "0.25.0", + "from": "https://github.com/CartoDB/Windshaft/tarball/0.25.0", "dependencies": { - "mapnik": { - "version": "0.7.26", - "from": "http://github.com/Vizzuality/node-mapnik/tarball/0.7.26-cdb1" - }, "grainstore": { "version": "0.20.0", "from": "git://github.com/CartoDB/grainstore.git#0.20.0", @@ -55,8 +51,8 @@ "millstone": { "version": "0.6.14", "dependencies": { - "underscore": { - "version": "1.6.0" + "generic-pool": { + "version": "2.0.4" }, "request": { "version": "2.34.0", @@ -77,7 +73,7 @@ "version": "0.12.1", "dependencies": { "punycode": { - "version": "1.2.4" + "version": "1.3.1" } } }, @@ -373,16 +369,19 @@ } }, "zipfile": { - "version": "0.5.2", + "version": "0.5.3", "dependencies": { + "nan": { + "version": "1.2.0" + }, "node-pre-gyp": { - "version": "0.5.8", + "version": "0.5.19", "dependencies": { "nopt": { - "version": "2.2.0", + "version": "2.2.1", "dependencies": { "abbrev": { - "version": "1.0.4" + "version": "1.0.5" } } }, @@ -395,7 +394,7 @@ } }, "request": { - "version": "2.34.0", + "version": "2.36.0", "dependencies": { "qs": { "version": "0.6.6" @@ -403,15 +402,15 @@ "json-stringify-safe": { "version": "5.0.0" }, + "mime": { + "version": "1.2.11" + }, "forever-agent": { "version": "0.5.2" }, "node-uuid": { "version": "1.4.1" }, - "mime": { - "version": "1.2.11" - }, "tough-cookie": { "version": "0.12.1", "dependencies": { @@ -437,7 +436,7 @@ } }, "tunnel-agent": { - "version": "0.3.0" + "version": "0.4.0" }, "http-signature": { "version": "0.10.0", @@ -479,7 +478,7 @@ } }, "semver": { - "version": "2.2.1" + "version": "2.3.0" }, "tar": { "version": "0.1.19", @@ -493,6 +492,9 @@ "fstream": { "version": "0.1.25", "dependencies": { + "mkdirp": { + "version": "0.3.5" + }, "graceful-fs": { "version": "2.0.3" } @@ -515,6 +517,9 @@ "fstream": { "version": "0.1.25", "dependencies": { + "mkdirp": { + "version": "0.3.5" + }, "graceful-fs": { "version": "2.0.3" }, @@ -543,7 +548,7 @@ } }, "readable-stream": { - "version": "1.0.26-4", + "version": "1.0.27-1", "dependencies": { "core-util-is": { "version": "1.0.1" @@ -565,16 +570,24 @@ } }, "mkdirp": { - "version": "0.3.5" - }, - "rc": { - "version": "0.3.4", + "version": "0.5.0", "dependencies": { "minimist": { "version": "0.0.8" + } + } + }, + "rc": { + "version": "0.4.0", + "dependencies": { + "minimist": { + "version": "0.0.10" }, "deep-extend": { - "version": "0.2.8" + "version": "0.2.10" + }, + "strip-json-comments": { + "version": "0.1.3" }, "ini": { "version": "1.1.0" @@ -582,36 +595,39 @@ } }, "rimraf": { - "version": "2.2.6" + "version": "2.2.8" } } } } }, "sqlite3": { - "version": "2.2.3", + "version": "2.2.7", "dependencies": { + "nan": { + "version": "1.1.2" + }, "node-pre-gyp": { - "version": "0.5.9", + "version": "0.5.22", "dependencies": { "nopt": { - "version": "2.2.0", + "version": "3.0.1", "dependencies": { "abbrev": { - "version": "1.0.4" + "version": "1.0.5" } } }, "npmlog": { - "version": "0.0.6", + "version": "0.1.1", "dependencies": { "ansi": { - "version": "0.2.1" + "version": "0.3.0" } } }, "request": { - "version": "2.34.0", + "version": "2.39.0", "dependencies": { "qs": { "version": "0.6.6" @@ -619,41 +635,44 @@ "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" }, - "mime": { - "version": "1.2.11" - }, "tough-cookie": { "version": "0.12.1", "dependencies": { "punycode": { - "version": "1.2.4" + "version": "1.3.0" } } }, "form-data": { - "version": "0.1.2", + "version": "0.1.4", "dependencies": { "combined-stream": { - "version": "0.0.4", + "version": "0.0.5", "dependencies": { "delayed-stream": { "version": "0.0.5" } } }, + "mime": { + "version": "1.2.11" + }, "async": { - "version": "0.2.10" + "version": "0.9.0" } } }, "tunnel-agent": { - "version": "0.3.0" + "version": "0.4.0" }, "http-signature": { "version": "0.10.0", @@ -673,7 +692,7 @@ "version": "0.3.0" }, "hawk": { - "version": "1.0.0", + "version": "1.1.1", "dependencies": { "hoek": { "version": "0.9.1" @@ -691,28 +710,31 @@ }, "aws-sign2": { "version": "0.5.0" + }, + "stringstream": { + "version": "0.0.4" } } }, "semver": { - "version": "2.2.1" + "version": "3.0.1" }, "tar": { - "version": "0.1.19", + "version": "1.0.0", "dependencies": { - "inherits": { - "version": "2.0.1" - }, "block-stream": { "version": "0.0.7" }, "fstream": { - "version": "0.1.25", + "version": "1.0.1", "dependencies": { "graceful-fs": { - "version": "2.0.3" + "version": "3.0.2" } } + }, + "inherits": { + "version": "2.0.1" } } }, @@ -729,10 +751,21 @@ "version": "0.7.4" }, "fstream": { - "version": "0.1.25", + "version": "0.1.31", "dependencies": { "graceful-fs": { - "version": "2.0.3" + "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" @@ -759,7 +792,7 @@ } }, "readable-stream": { - "version": "1.0.26-4", + "version": "1.0.27-1", "dependencies": { "core-util-is": { "version": "1.0.1" @@ -781,16 +814,24 @@ } }, "mkdirp": { - "version": "0.3.5" - }, - "rc": { - "version": "0.3.4", + "version": "0.5.0", "dependencies": { "minimist": { "version": "0.0.8" + } + } + }, + "rc": { + "version": "0.5.0", + "dependencies": { + "minimist": { + "version": "0.0.10" }, "deep-extend": { - "version": "0.2.8" + "version": "0.2.11" + }, + "strip-json-comments": { + "version": "0.1.3" }, "ini": { "version": "1.1.0" @@ -798,9 +839,12 @@ } }, "rimraf": { - "version": "2.2.6" + "version": "2.2.8" } } + }, + "set-immediate": { + "version": "0.1.1" } } }, @@ -825,9 +869,6 @@ } } }, - "generic-pool": { - "version": "2.0.4" - }, "express": { "version": "2.5.11", "dependencies": { @@ -863,12 +904,21 @@ }, "sphericalmercator": { "version": "1.0.2" + }, + "underscore": { + "version": "1.3.3" } } }, "tilelive-mapnik": { "version": "0.6.9", "dependencies": { + "underscore": { + "version": "1.3.3" + }, + "generic-pool": { + "version": "2.0.4" + }, "mime": { "version": "1.2.11" }, @@ -877,6 +927,10 @@ } } }, + "mapnik": { + "version": "0.7.26-cdb1", + "from": "http://github.com/Vizzuality/node-mapnik/tarball/0.7.26-cdb1" + }, "carto": { "version": "0.9.5-cdb3", "from": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb3", @@ -912,17 +966,6 @@ "version": "0.1.0", "from": "git://github.com/CartoDB/node-step-profiler.git#0.1.0" }, - "pg": { - "version": "2.6.2", - "dependencies": { - "generic-pool": { - "version": "2.0.3" - }, - "buffer-writer": { - "version": "1.0.0" - } - } - }, "torque.js": { "version": "2.2.0" }, @@ -935,7 +978,7 @@ "version": "0.0.5" }, "request": { - "version": "2.9.202" + "version": "2.9.203" }, "cartodb-redis": { "version": "0.9.0", @@ -945,23 +988,18 @@ "version": "0.4.0", "from": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0", "dependencies": { - "pg": { - "version": "2.6.2", - "dependencies": { - "generic-pool": { - "version": "2.0.3" - }, - "buffer-writer": { - "version": "1.0.0" - } - } - }, - "step": { - "version": "0.0.5" - }, - "underscore": { - "version": "1.6.0" + "pg": { + "version": "2.6.2-cdb1", + "from": "git://github.com/CartoDB/node-postgres.git#2.6.2-cdb1", + "dependencies": { + "generic-pool": { + "version": "2.0.3" + }, + "buffer-writer": { + "version": "1.0.0" + } } + } } }, "redis-mpool": { @@ -969,13 +1007,16 @@ "from": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", "dependencies": { "generic-pool": { - "version": "2.0.4" + "version": "2.1.1" + }, + "redis": { + "version": "0.12.1" }, "hiredis": { "version": "0.1.17", "dependencies": { "bindings": { - "version": "1.2.0" + "version": "1.2.1" }, "nan": { "version": "1.1.2" @@ -988,7 +1029,7 @@ "version": "1.3.7" }, "log4js": { - "version": "0.6.16", + "version": "0.6.17", "dependencies": { "async": { "version": "0.1.15" @@ -1013,7 +1054,7 @@ } }, "rollbar": { - "version": "0.3.12", + "version": "0.3.13", "dependencies": { "node-uuid": { "version": "1.4.1" @@ -1059,7 +1100,7 @@ "version": "1.0.7" }, "debug": { - "version": "1.0.2", + "version": "1.0.4", "dependencies": { "ms": { "version": "0.6.2" diff --git a/package.json b/package.json index 0baf025e..12133b7d 100644 --- a/package.json +++ b/package.json @@ -24,15 +24,15 @@ "dependencies": { "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.6.0", - "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.24.1", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.25.0", "step": "~0.0.5", - "request": "~2.9.202", + "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.9.0", "cartodb-psql": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0", "redis-mpool": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0", "lzma": "~1.3.7", - "log4js": "~0.6.16", - "rollbar": "~0.3.12" + "log4js": "~0.6.17", + "rollbar": "~0.3.13" }, "devDependencies": { "mocha": "1.14.0",