From cf20728711221ae49a5cd9ad52f83bf3fc0a7de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 17 Jul 2018 17:34:41 +0200 Subject: [PATCH] Upgrade winshaft@4.8.2 --- package.json | 2 +- yarn.lock | 88 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 55 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 3e72750d..eefb1d92 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.20.4", "underscore": "1.6.0", - "windshaft": "4.8.1", + "windshaft": "4.8.2", "yargs": "11.1.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 42ac47d0..1c28059e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15,7 +15,7 @@ node-pre-gyp "0.10.0" protozero "1.5.1" -"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb9": +"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb9": version "2.5.1-cdb9" resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/5129e43223cb55daed31373c7a36c98eb6178fc1" dependencies: @@ -27,7 +27,7 @@ version "1.0.5" resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2" -abaculus@cartodb/abaculus#2.0.3-cdb10: +"abaculus@github:cartodb/abaculus#2.0.3-cdb10": version "2.0.3-cdb10" resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/90d537028bb8af8a35e7a40c46493066dd8a76b3" dependencies: @@ -276,7 +276,7 @@ camshaft@0.61.11: dot "^1.0.3" request "2.85.0" -canvas@cartodb/node-canvas#1.6.2-cdb2: +"canvas@github:cartodb/node-canvas#1.6.2-cdb2": version "1.6.2-cdb2" resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766" dependencies: @@ -294,7 +294,7 @@ carto@0.16.3: semver "^5.1.0" yargs "^4.2.0" -carto@cartodb/carto#0.15.1-cdb3: +"carto@github:cartodb/carto#0.15.1-cdb3": version "0.15.1-cdb3" resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" dependencies: @@ -302,7 +302,7 @@ carto@cartodb/carto#0.15.1-cdb3: optimist "~0.6.0" underscore "1.8.3" -carto@cartodb/carto#master: +"carto@github:cartodb/carto#master": version "0.15.1" resolved "https://codeload.github.com/cartodb/carto/tar.gz/31abb8bee02df605521247b0223d508320f7d4c8" dependencies: @@ -869,11 +869,11 @@ gauge@~2.7.3: wide-align "^1.1.0" gdal@~0.9.2: - version "0.9.6" - resolved "https://registry.yarnpkg.com/gdal/-/gdal-0.9.6.tgz#0cf75d830d35847b4274368b10e04a925321a0ba" + version "0.9.7" + resolved "https://registry.yarnpkg.com/gdal/-/gdal-0.9.7.tgz#7b80973a75a7c7b303e3f7dd543ca2f9ca2579e2" dependencies: - nan "~2.6.2" - node-pre-gyp "~0.6.36" + nan "~2.10.0" + node-pre-gyp "^0.10.2" generic-pool@2.4.3: version "2.4.3" @@ -1061,8 +1061,8 @@ hoek@4.x.x: resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" hosted-git-info@^2.1.4: - version "2.6.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.1.tgz#6e4cee78b01bb849dcf93527708c69fdbee410df" + version "2.7.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" htmlparser2@3.8.x: version "3.8.3" @@ -1429,7 +1429,7 @@ mapnik-reference@~8.5.3: dependencies: semver "^5.1.0" -mapnik-vector-tile@cartodb/mapnik-vector-tile#v1.6.1-carto.1: +"mapnik-vector-tile@github:cartodb/mapnik-vector-tile#v1.6.1-carto.1": version "1.6.1-carto.1" resolved "https://codeload.github.com/cartodb/mapnik-vector-tile/tar.gz/0111f7117946179d62ec7a6eba2f4e9fb355d05e" @@ -1566,18 +1566,10 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" -nan@2.10.0, nan@^2.0.8, nan@^2.3.4, nan@^2.4.0: +nan@2.10.0, nan@^2.0.8, nan@^2.3.4, nan@^2.4.0, nan@~2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" -nan@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.4.0.tgz#fb3c59d45fe4effe215f0b890f8adf6eb32d2232" - -nan@~2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" - nan@~2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" @@ -1586,7 +1578,7 @@ ncp@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" -needle@^2.2.0: +needle@^2.2.0, needle@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d" dependencies: @@ -1627,7 +1619,22 @@ node-pre-gyp@0.10.0: semver "^5.3.0" tar "^4" -node-pre-gyp@~0.6.30, node-pre-gyp@~0.6.36, node-pre-gyp@~0.6.38: +node-pre-gyp@^0.10.2, node-pre-gyp@~0.10.2: + version "0.10.3" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" + dependencies: + 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" + +node-pre-gyp@~0.6.38: version "0.6.39" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: @@ -2044,7 +2051,7 @@ raw-body@2.3.3: iconv-lite "0.4.23" unpipe "1.0.0" -rc@^1.1.7: +rc@^1.1.7, rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" dependencies: @@ -2068,7 +2075,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -readable-stream@1.1, readable-stream@~1.1.9: +readable-stream@1.1: version "1.1.13" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e" dependencies: @@ -2098,6 +2105,15 @@ readable-stream@~1.0.2: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + redis-commands@^1.2.0: version "1.3.5" resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.5.tgz#4495889414f1e886261180b1442e7295602d83a2" @@ -2574,7 +2590,7 @@ through@2: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" -tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb14: +"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb14": version "0.6.18-cdb14" resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/6d06f728833d3e34d1adcd05567b3f4379f547bb" dependencies: @@ -2704,7 +2720,11 @@ utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" -uuid@^3.0.0, uuid@^3.1.0: +uuid@^3.0.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + +uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" @@ -2755,9 +2775,9 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" -windshaft@4.8.1: - version "4.8.1" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.8.1.tgz#7c1ef21e4f885643f6347bc5871274c533fce206" +windshaft@4.8.2: + version "4.8.2" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.8.2.tgz#4ac29d0da4df580a064eb061bbe0be3907e92166" dependencies: "@carto/mapnik" "3.6.2-carto.10" "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb9 @@ -2883,8 +2903,8 @@ yargs@~3.10.0: window-size "0.1.0" zipfile@~0.5.5: - version "0.5.11" - resolved "https://registry.yarnpkg.com/zipfile/-/zipfile-0.5.11.tgz#a46c1b76706138fb9bcf83890193caec679f685e" + version "0.5.12" + resolved "https://registry.yarnpkg.com/zipfile/-/zipfile-0.5.12.tgz#4488ff93dfb8d9089033ba34d8b2cf05358b08b2" dependencies: - nan "~2.4.0" - node-pre-gyp "~0.6.30" + nan "~2.10.0" + node-pre-gyp "~0.10.2"