Update windshaft devel branch

2019-03-29 18:20:48 +01:00
parent 4ffbcea819
commit c0a305babf
2 changed files with 54 additions and 8 deletions
@@ -327,10 +327,57 @@
      }
    },
    "canvas": {
-      "version": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d",
-      "from": "github:cartodb/node-canvas#1.6.2-cdb3",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.4.1.tgz",
+      "integrity": "sha512-SaFomFqDuuuSTScTHQ7nXc5ea71Ieb8ctvwXjR7vzLsBMfp3euTv2xsTY70zIoC5r4sSQZYXv6tiHiORJ4y1vg==",
      "requires": {
-        "nan": "^2.4.0"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.11.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "nan": {
+          "version": "2.13.2",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
+          "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
+        },
+        "node-pre-gyp": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
+          "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
      }
    },
    "carto": {
@@ -4139,14 +4186,13 @@
      "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
    },
    "windshaft": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.0.0.tgz",
-      "integrity": "sha512-OMjOhiJa7tA8Pty41bTAXf9d6uIlMU3aCyzS2/cZ620MfRF6RhORnOMiTa/iV856KAiqWFjl7U1MJnIs2xe0MQ==",
+      "version": "github:cartodb/windshaft#b483d1c12642313dbb0646ddbaa0212c60dfc282",
+      "from": "github:cartodb/windshaft#update-node-canvas",
      "requires": {
        "@carto/mapnik": "3.6.2-carto.11",
        "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9",
        "abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8",
-        "canvas": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d",
+        "canvas": "^2.4.1",
        "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
        "cartodb-psql": "0.13.1",
        "debug": "3.1.0",
@@ -49,7 +49,7 @@
    "step-profiler": "0.3.0",
    "turbo-carto": "0.21.0",
    "underscore": "1.6.0",
-    "windshaft": "^5.0.0",
+    "windshaft": "github:cartodb/windshaft#update-node-canvas",
    "yargs": "11.1.0"
  },
  "devDependencies": {