diff --git a/NEWS.md b/NEWS.md index acba8731..ae9f93c6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,9 @@ Released 2016-mm-dd +Announcements: + - Upgrades windshaft to [1.13.2](https://github.com/CartoDB/Windshaft/releases/tag/1.13.2) + ## 2.26.1 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index cd12953c..ba0f806e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -257,7 +257,7 @@ "dependencies": { "unpipe": { "version": "1.0.0", - "from": "unpipe@>=1.0.0 <1.1.0", + "from": "unpipe@1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" } } @@ -372,7 +372,7 @@ }, "type-is": { "version": "1.6.11", - "from": "type-is@>=1.6.6 <1.7.0", + "from": "type-is@>=1.6.10 <1.7.0", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.11.tgz", "dependencies": { "media-typer": { @@ -585,7 +585,7 @@ "dependencies": { "async": { "version": "1.5.2", - "from": "async@>=1.4.0 <2.0.0", + "from": "async@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } @@ -837,9 +837,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.13.1", - "from": "windshaft@1.13.1", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.1.tgz", + "version": "1.13.2", + "from": "windshaft@1.13.2", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.2.tgz", "dependencies": { "abaculus": { "version": "1.1.0-cdb4", @@ -4160,9 +4160,9 @@ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" }, "tweetnacl": { - "version": "0.14.0", + "version": "0.14.1", "from": "tweetnacl@>=0.13.0 <1.0.0", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.0.tgz" + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz" }, "jodid25519": { "version": "1.0.2", diff --git a/package.json b/package.json index c8037eef..f149a307 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "1.13.1", + "windshaft": "1.13.2", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 4d7d77b7..544aea6c 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -70,7 +70,8 @@ describe('tests from old api translated to multilayer', function() { }, function(res) { var parsed = JSON.parse(res.body); - assert.ok(parsed.errors[0].match(/:1:1: Unclosed block/)); + assert.ok(parsed.errors[0].match(/^style0/)); + assert.ok(parsed.errors[0].match(/missing closing/)); done(); } );