From bf53a905a26667d6ebbb2914528c6ce63df03e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 19 Mar 2019 13:41:07 +0100 Subject: [PATCH] Upgrade windshaft to version 4.13.4 --- package-lock.json | 17 +++++++++-------- package.json | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fe4eb68..af0db023 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,8 +27,8 @@ } }, "@carto/tilelive-bridge": { - "version": "github:cartodb/tilelive-bridge#5bdd15082ac3ad3f7c25d6247d896d0c8839eeb7", - "from": "github:cartodb/tilelive-bridge#cartofy", + "version": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9", + "from": "github:cartodb/tilelive-bridge#2.5.1-cdb12", "requires": { "@carto/mapnik": "3.6.2-carto.11", "generic-pool": "^3.6.1" @@ -3922,8 +3922,8 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#194806841783c39e19681460c1965c09b72f6d44", - "from": "github:cartodb/tilelive-mapnik#cartofy", + "version": "github:cartodb/tilelive-mapnik#b5f37585a0a9d4e98bdbdcbbd083df24e64bfd7a", + "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb19", "requires": { "@carto/mapnik": "3.6.2-carto.11", "generic-pool": "^3.6.1", @@ -4139,11 +4139,12 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#a29141842794f18a65abda1cb8d2ad3a9c5656c4", - "from": "github:cartodb/windshaft#cartofy", + "version": "4.13.4", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.4.tgz", + "integrity": "sha512-9PI06KMC6SBaQX0FLlOmWk9HtKvPa6t09RdVwWJojEnDmmMtzzw1Rvw5gCp8h5DIcgs65fT6cU/gWAZRL+lOQQ==", "requires": { "@carto/mapnik": "3.6.2-carto.11", - "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#5bdd15082ac3ad3f7c25d6247d896d0c8839eeb7", + "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9", "abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8", "canvas": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d", "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", @@ -4157,7 +4158,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#194806841783c39e19681460c1965c09b72f6d44", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#b5f37585a0a9d4e98bdbdcbbd083df24e64bfd7a", "torque.js": "2.17.1", "underscore": "1.6.0" } diff --git a/package.json b/package.json index 98234fad..eb3eb717 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "github:cartodb/windshaft#cartofy", + "windshaft": "4.13.4", "yargs": "11.1.0" }, "devDependencies": {