From 412c4af7b0ae166d0bec53cc6950b936b6925cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Mart=C3=ADn?= <oleurud@gmail.com>
Date: Tue, 25 Jun 2019 11:01:02 +0200
Subject: [PATCH] Upgrade windshaft to version 5.4.0

---
 NEWS.md           |  1 +
 package-lock.json | 12 +++++++-----
 package.json      |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 9f0ff97c..188102fc 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -10,6 +10,7 @@ Announcements:
     - Update @carto/mapnik to [`3.6.2-carto.15`](https://github.com/CartoDB/node-mapnik/blob/v3.6.2-carto.15/CHANGELOG.carto.md#362-carto15).
     - Update turbo-carto to [`0.21.2`](https://github.com/CartoDB/turbo-carto/releases/tag/0.21.2)
     - Upgrade `@carto/cartonik` to version [0.6.0](https://github.com/CartoDB/cartonik/blob/v0.6.0/CHANGELOG.md#v060-2019-06-17).
+    - Upgrade `windshaft` to version [5.4.0](https://github.com/CartoDB/Windshaft/releases/tag/5.4.0)
 
 ## 7.1.0
 Released 2019-05-06
diff --git a/package-lock.json b/package-lock.json
index d3158cb7..1339f77c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3921,8 +3921,9 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "torque.js": {
-      "version": "github:cartodb/torque#62bc50b129760cc7e9a00477cb82c9549fef0f99",
-      "from": "github:cartodb/torque#306-fix-cannot-read-undefined-layer",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-3.1.1.tgz",
+      "integrity": "sha512-kfIrmI7TGqJT/J9DH8Mgvd9VEwcvAtnvyYyqymSN6WZ5L4BaVQEQ+zu5FgLChNAqCaRkqGc7bKp0Hj9A0rempA==",
       "requires": {
         "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
         "d3": "3.5.17",
@@ -4108,8 +4109,9 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "github:cartodb/Windshaft#c8b11a87493c92beb0afe1a4444f1453dd45e338",
-      "from": "github:cartodb/Windshaft#test-torque-cartocss-fix",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.4.0.tgz",
+      "integrity": "sha512-gqEZyNqD99ErfpORWuxz7AmNnN0hDBimJD4ZCJUq4tSjIbLQT02P6WLw+uyijktqP3ZuZK+33CES+9JL3MMasQ==",
       "requires": {
         "@carto/cartonik": "^0.6.0",
         "@carto/mapnik": "3.6.2-carto.15",
@@ -4122,7 +4124,7 @@
         "redis-mpool": "0.7.0",
         "request": "2.87.0",
         "semver": "5.5.0",
-        "torque.js": "github:cartodb/torque#62bc50b129760cc7e9a00477cb82c9549fef0f99",
+        "torque.js": "3.1.1",
         "underscore": "1.6.0"
       }
     },
diff --git a/package.json b/package.json
index 17c00338..374b1923 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "step-profiler": "0.3.0",
     "turbo-carto": "0.21.2",
     "underscore": "1.6.0",
-    "windshaft": "github:cartodb/Windshaft#test-torque-cartocss-fix",
+    "windshaft": "5.4.0",
     "yargs": "11.1.0"
   },
   "devDependencies": {