From ebae218219b183bed635c67561518309499f4d71 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 5 Jun 2015 13:37:49 -0400 Subject: [PATCH] Use windshaft branch with unified error reponses format --- npm-shrinkwrap.json | 22 ++++++++++++++++------ package.json | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 73339ccd..3e94d8aa 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -314,7 +314,7 @@ "dependencies": { "ansi-regex": { "version": "1.1.1", - "from": "ansi-regex@1.1.1", + "from": "ansi-regex@^1.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" } } @@ -379,7 +379,7 @@ } }, "log4js": { - "version": "0.6.21", + "version": "0.6.25", "from": "https://github.com/CartoDB/log4js-node/tarball/cdb", "resolved": "https://github.com/CartoDB/log4js-node/tarball/cdb", "dependencies": { @@ -413,6 +413,16 @@ "from": "inherits@~2.0.1" } } + }, + "semver": { + "version": "4.3.6", + "from": "semver@~4.3.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz" + }, + "underscore": { + "version": "1.8.2", + "from": "underscore@1.8.2", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz" } } }, @@ -476,9 +486,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "0.44.1", - "from": "windshaft@0.44.1", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.44.1.tgz", + "version": "0.45.0", + "from": "https://github.com/CartoDB/Windshaft/tarball/issue-351", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/issue-351", "dependencies": { "chronograph": { "version": "0.1.0", @@ -2329,7 +2339,7 @@ }, "mime": { "version": "1.2.11", - "from": "mime@~1.2.9", + "from": "mime@~1.2.11", "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" } } diff --git a/package.json b/package.json index 16647e98..837300aa 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "0.44.1", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/issue-351", "step": "~0.0.5", "queue-async": "~1.0.7", "request": "~2.9.203",