From f9d1e39b7b7462a1b45ffa68e1bf5bba56dc9d53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Wed, 21 Nov 2018 13:19:29 +0100
Subject: [PATCH] Update windshaft@4.12.0

---
 package-lock.json | 43 ++++++++-----------------------------------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f136d4b..d81e482e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2720,7 +2720,7 @@
     },
     "os-homedir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
@@ -2733,7 +2733,7 @@
     },
     "os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
@@ -3538,9 +3538,9 @@
       }
     },
     "tar": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.7.tgz",
-      "integrity": "sha512-mR3MzsCdN0IEWjZRuF/J9gaWHnTwOvzjqPTcvi1xXgfKTDQRp39gRETPQEfPByAdEOGmZfx1HrRsn8estaEvtA==",
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+      "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
       "requires": {
         "chownr": "^1.1.1",
         "fs-minipass": "^1.2.5",
@@ -3856,8 +3856,9 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "github:cartodb/windshaft#042d1f3986a70d8d9f530a37643efa92535a7163",
-      "from": "github:cartodb/windshaft#nodejs-10",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.12.0.tgz",
+      "integrity": "sha512-8hfFMXGA8L3RR21wOoayoIVFCWVWESdJZNzYxaXEqJBqa4qxZgZXmVv4j4qu2EUsV2rUGbDbNpeEm/RUGUMGGg==",
       "requires": {
         "@carto/mapnik": "3.6.2-carto.11",
         "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664",
@@ -3877,34 +3878,6 @@
         "tilelive-mapnik": "github:cartodb/tilelive-mapnik#30b5d9f4f6b774d084bc6dc67a7a01d51e129bb5",
         "torque.js": "2.17.0",
         "underscore": "1.6.0"
-      },
-      "dependencies": {
-        "cartodb-psql": {
-          "version": "0.13.0",
-          "resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.13.0.tgz",
-          "integrity": "sha512-+MBxpgijBgSgXciuwUMGedVB1lABToySoxipODB8YasRc3X15oVSSku9WcMYICnZZg1x2b2Sq4POazBAYoVHxA==",
-          "requires": {
-            "debug": "^3.1.0",
-            "pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6",
-            "underscore": "~1.6.0"
-          }
-        },
-        "generic-pool": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz",
-          "integrity": "sha1-rwTcLDJc/Ll1Aj+lK/zpYXp0Nf0="
-        },
-        "redis-mpool": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.7.0.tgz",
-          "integrity": "sha512-+Tk3LXK5YkmseZjsz6Bx6/uRHy0CBGVvl6GU5tlzugYRn1qArlxK9wSEhadIfWh96Qx9yngvtacb7g8GNi78rA==",
-          "requires": {
-            "generic-pool": "~2.1.1",
-            "hiredis": "~0.5.0",
-            "redis": "^2.8.0",
-            "underscore": "~1.6.0"
-          }
-        }
       }
     },
     "wordwrap": {
diff --git a/package.json b/package.json
index b04a27bc..159afef4 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "step-profiler": "0.3.0",
     "turbo-carto": "github:cartodb/turbo-carto#nodejs-10",
     "underscore": "1.6.0",
-    "windshaft": "github:cartodb/windshaft#nodejs-10",
+    "windshaft": "4.12.0",
     "yargs": "11.1.0"
   },
   "devDependencies": {