From 2fa09aee88f95d47bfaaa1a5eb2457730bee168f Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 1 Mar 2013 13:10:12 +0100 Subject: [PATCH] Require Windshaft-0.9.1, to reduce harmfulness of cache_buster param --- NEWS.md | 1 + npm-shrinkwrap.json | 215 ++++++++------------------------------------ package.json | 2 +- 3 files changed, 41 insertions(+), 177 deletions(-) diff --git a/NEWS.md b/NEWS.md index 4d5214d8..57db4db3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,6 @@ 1.1.8 ----- +* Require Windshaft-0.9.1, to reduce harmfulness of cache_buster param 1.1.7 (DD//MM//YY) ----- diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 8c4c348c..3ef03a44 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -13,7 +13,7 @@ "version": "1.9.2", "dependencies": { "formidable": { - "version": "1.0.11" + "version": "1.0.12" } } }, @@ -32,31 +32,36 @@ "version": "0.8.3" }, "npm": { - "version": "1.1.65", + "version": "1.2.12", "dependencies": { "semver": { - "version": "1.1.0" + "version": "1.1.3" }, "ini": { - "version": "1.0.5" + "version": "1.1.0" }, "slide": { "version": "1.1.3" }, "abbrev": { - "version": "1.0.3" + "version": "1.0.4" }, "graceful-fs": { - "version": "1.1.14" + "version": "1.2.0" }, "minimatch": { - "version": "0.2.8" + "version": "0.2.9", + "dependencies": { + "sigmund": { + "version": "1.0.0" + } + } }, "nopt": { - "version": "2.0.0" + "version": "2.1.1" }, "rimraf": { - "version": "2.0.2" + "version": "2.1.4" }, "request": { "version": "2.9.203", @@ -66,10 +71,10 @@ "version": "1.0.5" }, "tar": { - "version": "0.1.13" + "version": "0.1.16" }, "fstream": { - "version": "0.1.19" + "version": "0.1.22" }, "block-stream": { "version": "0.0.6" @@ -93,13 +98,13 @@ "version": "2.0.4" }, "node-gyp": { - "version": "0.7.1" + "version": "0.8.4" }, "fstream-npm": { "version": "0.1.3", "dependencies": { "fstream-ignore": { - "version": "0.0.5" + "version": "0.0.6" } } }, @@ -119,7 +124,7 @@ "version": "0.1.2" }, "npm-registry-client": { - "version": "0.2.10", + "version": "0.2.17", "dependencies": { "couch-login": { "version": "0.1.15" @@ -127,13 +132,13 @@ } }, "read-package-json": { - "version": "0.1.8" + "version": "0.2.0" }, "read-installed": { - "version": "0.0.3" + "version": "0.1.1" }, "glob": { - "version": "3.1.14" + "version": "3.1.20" }, "init-package-json": { "version": "0.0.6", @@ -147,7 +152,7 @@ "version": "0.0.3" }, "lockfile": { - "version": "0.2.1" + "version": "0.3.0" }, "retry": { "version": "0.6.0" @@ -156,10 +161,10 @@ "version": "1.1.1" }, "npmconf": { - "version": "0.0.16", + "version": "0.0.23", "dependencies": { "config-chain": { - "version": "1.1.2", + "version": "1.1.5", "dependencies": { "proto-list": { "version": "1.2.2" @@ -184,27 +189,19 @@ "grainstore": { "version": "0.11.1", "dependencies": { - "underscore": { - "version": "1.3.3" - }, - "step": { - "version": "0.0.5" - }, - "semver": { - "version": "1.1.2" - }, - "generic-pool": { - "version": "1.0.12" - }, "carto": { "version": "0.9.3-cdb2", "from": "git://github.com/CartoDB/carto.git#cdb-0.9", "dependencies": { + "mapnik-reference": { + "version": "5.0.0-cdb1", + "from": "git://github.com/CartoDB/mapnik-reference.git#cdb-5.0" + }, "xml2js": { "version": "0.1.14", "dependencies": { "sax": { - "version": "0.5.1" + "version": "0.5.2" } } } @@ -213,12 +210,6 @@ "mapnik-reference": { "version": "5.0.4" }, - "redis": { - "version": "0.7.3" - }, - "hiredis": { - "version": "0.1.14" - }, "millstone": { "version": "0.5.15", "dependencies": { @@ -259,49 +250,15 @@ "version": "1.2.9" }, "mkdirp": { - "version": "0.3.4" - } - } - }, - "libxmljs": { - "version": "0.5.4" - }, - "mocha": { - "version": "1.2.1", - "dependencies": { - "commander": { - "version": "0.6.1" - }, - "growl": { - "version": "1.5.1" - }, - "jade": { - "version": "0.26.3", - "dependencies": { - "mkdirp": { - "version": "0.3.0" - } - } - }, - "diff": { - "version": "1.0.2" - }, - "debug": { - "version": "0.7.0" + "version": "0.3.5" } } } } }, "windshaft": { - "version": "0.9.0", + "version": "0.9.1", "dependencies": { - "underscore": { - "version": "1.3.3" - }, - "step": { - "version": "0.0.5" - }, "express": { "version": "2.5.11", "dependencies": { @@ -309,7 +266,7 @@ "version": "1.9.2", "dependencies": { "formidable": { - "version": "1.0.11" + "version": "1.0.12" } } }, @@ -325,10 +282,10 @@ } }, "tilelive": { - "version": "4.3.1", + "version": "4.3.3", "dependencies": { "optimist": { - "version": "0.3.4", + "version": "0.3.5", "dependencies": { "wordwrap": { "version": "0.0.2" @@ -342,58 +299,13 @@ }, "tilelive-mapnik": { "version": "0.3.3-cdb2", + "from": "git://github.com/Vizzuality/tilelive-mapnik.git#6061c65a", "dependencies": { - "step": { - "version": "0.0.5" - }, - "underscore": { - "version": "1.3.3" - }, - "generic-pool": { - "version": "1.0.12" - }, "eio": { "version": "0.1.0" }, "sphericalmercator": { "version": "1.0.2" - }, - "expresso": { - "version": "0.9.2" - } - } - }, - "redis": { - "version": "0.7.2" - }, - "hiredis": { - "version": "0.1.14" - }, - "semver": { - "version": "1.1.0" - }, - "mocha": { - "version": "1.2.1", - "dependencies": { - "commander": { - "version": "0.6.1" - }, - "growl": { - "version": "1.5.1" - }, - "jade": { - "version": "0.26.3", - "dependencies": { - "mkdirp": { - "version": "0.3.0" - } - } - }, - "diff": { - "version": "1.0.2" - }, - "debug": { - "version": "0.7.0" } } } @@ -415,59 +327,10 @@ "version": "2.9.202" }, "mapnik": { - "version": "0.7.22", - "dependencies": { - "mocha": { - "version": "1.6.0", - "dependencies": { - "commander": { - "version": "0.6.1" - }, - "growl": { - "version": "1.5.1" - }, - "jade": { - "version": "0.26.3", - "dependencies": { - "mkdirp": { - "version": "0.3.0" - } - } - }, - "diff": { - "version": "1.0.2" - }, - "debug": { - "version": "0.7.0" - }, - "mkdirp": { - "version": "0.3.3" - }, - "ms": { - "version": "0.3.0" - } - } - }, - "jshint": { - "version": "0.5.9", - "dependencies": { - "argsparser": { - "version": "0.0.6" - }, - "minimatch": { - "version": "0.2.7", - "dependencies": { - "lru-cache": { - "version": "2.0.4" - } - } - } - } - } - } + "version": "0.7.22" }, "semver": { - "version": "1.1.1" + "version": "1.1.3" }, "mocha": { "version": "1.2.1", @@ -490,7 +353,7 @@ "version": "1.0.2" }, "debug": { - "version": "0.7.0" + "version": "0.7.2" } } } diff --git a/package.json b/package.json index 4d657428..7400f21b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "node-varnish": "0.1.1", "underscore" : "~1.3.3", "grainstore" : "~0.11.1", - "windshaft" : "~0.9.0", + "windshaft" : "~0.9.1", "step": "0.0.x", "generic-pool": "~1.0.12", "redis": "0.7.2",