From ff3efd7d56ea46ccd4d9614581889d936d2b5648 Mon Sep 17 00:00:00 2001 From: Raul Marin Date: Tue, 17 Apr 2018 10:31:32 +0200 Subject: [PATCH] Update Windshaft to 4.7.1 --- package.json | 2 +- yarn.lock | 91 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 56 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 7bd0d1b6..fce46f9d 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "step-profiler": "~0.3.0", "turbo-carto": "0.20.2", "underscore": "~1.6.0", - "windshaft": "4.7.0", + "windshaft": "4.7.1", "yargs": "~5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 397eba60..357b8175 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,20 +2,20 @@ # yarn lockfile v1 -"@carto/mapnik@3.6.2-carto.7": - version "3.6.2-carto.7" - resolved "https://registry.yarnpkg.com/@carto/mapnik/-/mapnik-3.6.2-carto.7.tgz#ef057b0a379fec03bce92362a46f8d1729c950d9" +"@carto/mapnik@3.6.2-carto.8": + version "3.6.2-carto.8" + resolved "https://registry.yarnpkg.com/@carto/mapnik/-/mapnik-3.6.2-carto.8.tgz#70448689d9b14d644bebd079f5714871c458a46d" dependencies: - mapnik-vector-tile "1.5.0" - nan "~2.7.0" - node-pre-gyp "~0.6.30" + mapnik-vector-tile cartodb/mapnik-vector-tile#v1.6.1-carto.1 + nan "2.10.0" + node-pre-gyp "0.7.0" protozero "1.5.1" -"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb6": - version "2.5.1-cdb6" - resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/1d71bc845f257d635f54047f1d2be858341cd552" +"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb7": + version "2.5.1-cdb7" + resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/ec881cb9ac52113f895f23857430e2d434bb99a6" dependencies: - "@carto/mapnik" "3.6.2-carto.7" + "@carto/mapnik" "3.6.2-carto.8" "@mapbox/sphericalmercator" "~1.0.1" mapnik-pool "~0.1.3" @@ -23,11 +23,11 @@ version "1.0.5" resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2" -abaculus@cartodb/abaculus#2.0.3-cdb7: - version "2.0.3-cdb7" - resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/fcdefbf39956c1c86ce3d39547b903857796657f" +"abaculus@github:cartodb/abaculus#2.0.3-cdb8": + version "2.0.3-cdb8" + resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/31c03f2442943d4c47740fa154cda753b5cccd8a" dependencies: - "@carto/mapnik" "3.6.2-carto.7" + "@carto/mapnik" "3.6.2-carto.8" d3-queue "^2.0.2" sphericalmercator "1.0.x" @@ -249,7 +249,7 @@ camshaft@0.61.8: 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: @@ -275,7 +275,7 @@ carto@CartoDB/carto#0.15.1-cdb1: optimist "~0.6.0" underscore "~1.6.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: @@ -1292,9 +1292,9 @@ mapnik-reference@~8.5.3: dependencies: semver "^5.1.0" -mapnik-vector-tile@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/mapnik-vector-tile/-/mapnik-vector-tile-1.5.0.tgz#c647bfb8027e9dc40db583505a436f35e2101407" +"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" media-typer@0.3.0: version "0.3.0" @@ -1405,6 +1405,10 @@ mv@~2: ncp "~2.0.0" rimraf "~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.0.8, nan@^2.3.4, nan@^2.4.0: version "2.8.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" @@ -1440,6 +1444,21 @@ nock@~2.11.0: mkdirp "^0.5.0" propagate "0.3.x" +node-pre-gyp@0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.7.0.tgz#55aeffbaed93b50d0a4657d469198cd80ac9df36" + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.0.2" + rc "^1.1.7" + request "2.83.0" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^2.2.1" + tar-pack "^3.4.0" + node-pre-gyp@~0.6.30, node-pre-gyp@~0.6.36, 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" @@ -1885,9 +1904,9 @@ request@2.81.0: tunnel-agent "^0.6.0" uuid "^3.0.0" -request@2.85.0: - version "2.85.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" +request@2.83.0, request@2.x, request@^2.55.0: + version "2.83.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" dependencies: aws-sign2 "~0.7.0" aws4 "^1.6.0" @@ -1912,9 +1931,9 @@ request@2.85.0: tunnel-agent "^0.6.0" uuid "^3.1.0" -request@2.x, request@^2.55.0: - version "2.83.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" +request@2.85.0: + version "2.85.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" dependencies: aws-sign2 "~0.7.0" aws4 "^1.6.0" @@ -2239,11 +2258,11 @@ 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-cdb11: - version "0.6.18-cdb11" - resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/90b7a2d4a7032b72c15b0d3ea1a6ec8258a4a250" +"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb12": + version "0.6.18-cdb12" + resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/e3c0d80e604ca4a5dfad648ee6f6fb355d415a88" dependencies: - "@carto/mapnik" "3.6.2-carto.7" + "@carto/mapnik" "3.6.2-carto.8" generic-pool "~2.4.0" mime "~1.6.0" sphericalmercator "~1.0.4" @@ -2400,13 +2419,13 @@ 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.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.7.0.tgz#6fdee3c8c9b28b15835981d1ef565a52884e951c" +windshaft@4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.7.1.tgz#2b92753b2f6e97b239e15e1576ec312cc7dfeb13" dependencies: - "@carto/mapnik" "3.6.2-carto.7" - "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb6 - abaculus cartodb/abaculus#2.0.3-cdb7 + "@carto/mapnik" "3.6.2-carto.8" + "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb7 + abaculus cartodb/abaculus#2.0.3-cdb8 canvas cartodb/node-canvas#1.6.2-cdb2 carto cartodb/carto#0.15.1-cdb3 cartodb-psql "^0.10.1" @@ -2420,7 +2439,7 @@ windshaft@4.7.0: sphericalmercator "1.0.4" step "~0.0.6" tilelive "5.12.2" - tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb11 + tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb12 torque.js "~2.11.0" underscore "~1.6.0"