From 219caf7eab69456e129c8b1180113d5b8961f52c Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 11 Feb 2013 16:39:21 +0100 Subject: [PATCH] Require windshaft 0.8.5 with some stability issue fixed Additionally we can now control renderer cache time to live and metatiling --- NEWS.md | 1 + npm-shrinkwrap.json | 240 ++++++++++++++++++++++++++++++-------------- 2 files changed, 168 insertions(+), 73 deletions(-) diff --git a/NEWS.md b/NEWS.md index 2d03a1bb..24ac6b3d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,6 @@ 1.1.6 ----- +* Require windshaft 0.8.5, fixing some stability issues * Require grainstore 0.10.9, fixing an issue with multi-geom markers * Enhance run_tests.sh to allow running single tests and skipping preparation * Fix async throws in getGeometryType, getInfoWindow and getMapMetadata diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 733a29dc..c3768764 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,44 +1,54 @@ { "name": "windshaft-cartodb", - "version": "1.1.5", + "version": "1.1.6", "dependencies": { "cluster2": { "version": "0.3.5-cdb02", - "from": "git://github.com/CartoDB/cluster2.git#cdb_production", + "from": "cluster2@git://github.com/CartoDB/cluster2.git#cdb_production", "dependencies": { "express": { "version": "2.5.11", + "from": "express@2.5.11", "dependencies": { "connect": { "version": "1.9.2", + "from": "connect@1.x", "dependencies": { "formidable": { - "version": "1.0.11" + "version": "1.0.11", + "from": "formidable@1.0.x" } } }, "mime": { - "version": "1.2.4" + "version": "1.2.4", + "from": "mime@1.2.4" }, "qs": { - "version": "0.4.2" + "version": "0.4.2", + "from": "qs@0.4.x" }, "mkdirp": { - "version": "0.3.0" + "version": "0.3.0", + "from": "mkdirp@0.3.0" } } }, "ejs": { - "version": "0.8.3" + "version": "0.8.3", + "from": "ejs@" }, "npm": { "version": "1.1.69", + "from": "npm@", "dependencies": { "semver": { - "version": "1.1.1" + "version": "1.1.1", + "from": "semver@~1.1.0" }, "ini": { - "version": "1.0.5" + "version": "1.0.5", + "from": "ini@latest" }, "slide": { "version": "1.1.3" @@ -47,157 +57,198 @@ "version": "1.0.3" }, "graceful-fs": { - "version": "1.1.14" + "version": "1.1.14", + "from": "graceful-fs@~1.1.1" }, "minimatch": { "version": "0.2.9", + "from": "minimatch@~0.2.8", "dependencies": { "sigmund": { - "version": "1.0.0" + "version": "1.0.0", + "from": "sigmund@~1.0.0" } } }, "nopt": { - "version": "2.0.0" + "version": "2.0.0", + "from": "nopt@latest" }, "rimraf": { - "version": "2.0.2" + "version": "2.0.2", + "from": "rimraf@2" }, "request": { "version": "2.9.203", "from": "git://github.com/isaacs/request" }, "which": { - "version": "1.0.5" + "version": "1.0.5", + "from": "which@1" }, "tar": { - "version": "0.1.14" + "version": "0.1.14", + "from": "tar@~0.1.12" }, "fstream": { - "version": "0.1.19" + "version": "0.1.19", + "from": "../fstream" }, "block-stream": { - "version": "0.0.6" + "version": "0.0.6", + "from": "block-stream@*" }, "inherits": { "version": "1.0.0", "from": "git://github.com/isaacs/inherits" }, "mkdirp": { - "version": "0.3.4" + "version": "0.3.4", + "from": "mkdirp@~0.3.3" }, "read": { "version": "1.0.4", + "from": "read@~1.0.3", "dependencies": { "mute-stream": { - "version": "0.0.3" + "version": "0.0.3", + "from": "mute-stream@~0.0.2" } } }, "lru-cache": { - "version": "2.0.4" + "version": "2.0.4", + "from": "lru-cache@~2.0.0" }, "node-gyp": { - "version": "0.7.3" + "version": "0.7.3", + "from": "node-gyp@~0.7.1" }, "fstream-npm": { "version": "0.1.3", + "from": "fstream-npm@latest", "dependencies": { "fstream-ignore": { - "version": "0.0.5" + "version": "0.0.5", + "from": "fstream-ignore@~0.0.5" } } }, "uid-number": { - "version": "0.0.3" + "version": "0.0.3", + "from": "../uid-number" }, "archy": { - "version": "0.0.2" + "version": "0.0.2", + "from": "archy@0.0.2" }, "chownr": { - "version": "0.0.1" + "version": "0.0.1", + "from": "../chownr" }, "npmlog": { - "version": "0.0.2" + "version": "0.0.2", + "from": "npmlog@0" }, "ansi": { - "version": "0.1.2" + "version": "0.1.2", + "from": "ansi@~0.1.2" }, "npm-registry-client": { "version": "0.2.10", + "from": "npm-registry-client@latest", "dependencies": { "couch-login": { - "version": "0.1.15" + "version": "0.1.15", + "from": "couch-login@~0.1.15" } } }, "read-package-json": { - "version": "0.1.11" + "version": "0.1.11", + "from": "read-package-json@~0.1.8" }, "read-installed": { - "version": "0.0.3" + "version": "0.0.3", + "from": "read-installed@0" }, "glob": { - "version": "3.1.14" + "version": "3.1.14", + "from": "glob@3.1.14" }, "init-package-json": { "version": "0.0.6", + "from": "init-package-json@0.0.6", "dependencies": { "promzard": { - "version": "0.2.0" + "version": "0.2.0", + "from": "promzard@~0.2.0" } } }, "osenv": { - "version": "0.0.3" + "version": "0.0.3", + "from": "osenv@latest" }, "lockfile": { - "version": "0.2.1" + "version": "0.2.1", + "from": "lockfile@>=0.2" }, "retry": { - "version": "0.6.0" + "version": "0.6.0", + "from": "retry" }, "once": { - "version": "1.1.1" + "version": "1.1.1", + "from": "once" }, "npmconf": { "version": "0.0.16", + "from": "npmconf@0", "dependencies": { "config-chain": { "version": "1.1.3", + "from": "config-chain@~1.1.1", "dependencies": { "proto-list": { - "version": "1.2.2" + "version": "1.2.2", + "from": "proto-list@~1.2.1" } } } } }, "opener": { - "version": "1.3.0" + "version": "1.3.0", + "from": "opener@latest" } } } } }, "node-varnish": { - "version": "0.1.1" + "version": "0.1.1", + "from": "node-varnish@0.1.1" }, "underscore": { - "version": "1.3.3" + "version": "1.3.3", + "from": "underscore@~1.3.3" }, "grainstore": { "version": "0.10.10", + "from": "grainstore@0.10.10", "dependencies": { "carto": { "version": "0.9.3-cdb2", - "from": "git://github.com/CartoDB/carto.git#cdb-0.9", + "from": "carto@git://github.com/CartoDB/carto.git#cdb-0.9", "dependencies": { "xml2js": { "version": "0.1.14", + "from": "xml2js@0.1.14", "dependencies": { "sax": { - "version": "0.4.2" + "version": "0.4.2", + "from": "sax@0.4.2" } } } @@ -205,152 +256,195 @@ }, "mapnik-reference": { "version": "5.0.0-cdb1", - "from": "git://github.com/CartoDB/mapnik-reference.git#cdb-5.0" + "from": "mapnik-reference@git://github.com/CartoDB/mapnik-reference.git#cdb-5.0" }, "millstone": { "version": "0.5.13", + "from": "millstone@0.5.13", "dependencies": { "request": { "version": "2.11.4", + "from": "request@2.11.4", "dependencies": { "form-data": { "version": "0.0.3", + "from": "form-data", "dependencies": { "combined-stream": { "version": "0.0.3", + "from": "combined-stream@0.0.3", "dependencies": { "delayed-stream": { - "version": "0.0.5" + "version": "0.0.5", + "from": "delayed-stream@0.0.5" } } }, "async": { - "version": "0.1.9" + "version": "0.1.9", + "from": "async@0.1.9" } } }, "mime": { - "version": "1.2.7" + "version": "1.2.7", + "from": "mime" } } }, "srs": { - "version": "0.2.18" + "version": "0.2.18", + "from": "srs@0.2.18" }, "zipfile": { - "version": "0.3.3" + "version": "0.3.3", + "from": "zipfile@0.3.3" }, "sqlite3": { - "version": "2.1.5" + "version": "2.1.5", + "from": "sqlite3@2.1.5" }, "mime": { - "version": "1.2.7" + "version": "1.2.7", + "from": "mime@1.2.7" }, "mkdirp": { - "version": "0.3.4" + "version": "0.3.4", + "from": "mkdirp@0.3.4" } } } } }, "windshaft": { - "version": "0.8.4", + "version": "0.8.5", + "from": "windshaft@~0.8.4", "dependencies": { "express": { "version": "2.5.11", + "from": "express@2.5.11", + "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz", "dependencies": { "connect": { "version": "1.9.2", + "from": "connect@1.x", "dependencies": { "formidable": { - "version": "1.0.11" + "version": "1.0.11", + "from": "formidable@1.0.x" } } }, "mime": { - "version": "1.2.4" + "version": "1.2.4", + "from": "mime@1.2.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz" }, "qs": { - "version": "0.4.2" + "version": "0.4.2", + "from": "qs@0.4.x" }, "mkdirp": { - "version": "0.3.0" + "version": "0.3.0", + "from": "mkdirp@0.3.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" } } }, "tilelive": { "version": "4.3.3", + "from": "tilelive@~4.3.1", "dependencies": { "optimist": { "version": "0.3.5", + "from": "optimist@~0.3.1", "dependencies": { "wordwrap": { - "version": "0.0.2" + "version": "0.0.2", + "from": "wordwrap@~0.0.2" } } }, "sphericalmercator": { - "version": "1.0.2" + "version": "1.0.2", + "from": "sphericalmercator@~1.0.1" } } }, "tilelive-mapnik": { "version": "0.3.3-cdb2", - "from": "git://github.com/Vizzuality/tilelive-mapnik.git#6061c65a", + "from": "tilelive-mapnik@git://github.com/Vizzuality/tilelive-mapnik.git#6061c65a", + "resolved": "git://github.com/Vizzuality/tilelive-mapnik.git#6061c65a6002ba10fe2d48172ab63199d7060832", "dependencies": { "eio": { - "version": "0.1.0" + "version": "0.1.0", + "from": "eio@~0.1.0" }, "sphericalmercator": { - "version": "1.0.2" + "version": "1.0.2", + "from": "sphericalmercator@~1.0.1" } } } } }, "step": { - "version": "0.0.5" + "version": "0.0.5", + "from": "step@0.0.x" }, "generic-pool": { - "version": "1.0.12" + "version": "1.0.12", + "from": "generic-pool@1.0.x" }, "redis": { - "version": "0.7.2" + "version": "0.7.2", + "from": "redis@0.7.2" }, "hiredis": { - "version": "0.1.14" + "version": "0.1.14", + "from": "hiredis@~0.1.14" }, "request": { - "version": "2.9.202" + "version": "2.9.202", + "from": "request@2.9.202" }, "mapnik": { - "version": "0.7.18" + "version": "0.7.18", + "from": "mapnik@~0.7.14" }, "semver": { - "version": "1.1.1" + "version": "1.1.1", + "from": "semver@~1.1.0" }, "mocha": { "version": "1.2.1", + "from": "mocha@1.2.1", "dependencies": { "commander": { - "version": "0.6.1" + "version": "0.6.1", + "from": "commander@0.6.1" }, "growl": { - "version": "1.5.1" + "version": "1.5.1", + "from": "growl@1.5.x" }, "jade": { "version": "0.26.3", + "from": "jade@0.26.3", "dependencies": { "mkdirp": { - "version": "0.3.0" + "version": "0.3.0", + "from": "mkdirp@0.3.0" } } }, "diff": { - "version": "1.0.2" + "version": "1.0.2", + "from": "diff@1.0.2" }, "debug": { - "version": "0.7.0" + "version": "0.7.0", + "from": "debug@*" } } }