Point windshaft to specific commit for buffer-size configuration

2017-05-03 17:21:08 +02:00 · 2017-05-03 17:21:08 +02:00 · 05d3b3bf66
commit 05d3b3bf66
parent 567928a7f5
2 changed files with 57 additions and 51 deletions
--- a/package.json
+++ b/package.json
@ -39,7 +39,7 @@
    "step-profiler": "~0.3.0",
    "turbo-carto": "0.19.0",
    "underscore": "~1.6.0",
-    "windshaft": "3.1.1",
+    "windshaft": "cartodb/windshaft#548-vector-buffer-size",
    "yargs": "~5.0.0"
  },
  "devDependencies": {
--- a/yarn.lock
+++ b/yarn.lock
@ -2,7 +2,7 @@
 # yarn lockfile v1


-"abaculus@github:cartodb/abaculus#2.0.3-cdb1":
+abaculus@cartodb/abaculus#2.0.3-cdb1:
  version "2.0.3-cdb1"
  resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/f5f34e1c80cdd8d49edd1d6fe3b2220ab2e23aaf"
  dependencies:
@ -22,8 +22,8 @@ accepts@~1.2.12:
    negotiator "0.5.3"

 ajv@^4.9.1:
-  version "4.11.7"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
  dependencies:
    co "^4.6.0"
    json-stable-stringify "^1.0.1"
@ -205,7 +205,7 @@ camshaft@0.54.1:
    dot "^1.0.3"
    request "^2.69.0"

-"canvas@github:cartodb/node-canvas#1.6.2-cdb2":
+canvas@cartodb/node-canvas#1.6.2-cdb2:
  version "1.6.2-cdb2"
  resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766"
  dependencies:
@ -223,15 +223,7 @@ carto@0.16.3:
    semver "^5.1.0"
    yargs "^4.2.0"

-carto@CartoDB/carto#0.15.1-cdb1:
-  version "0.15.1-cdb1"
-  resolved "https://codeload.github.com/CartoDB/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398"
-  dependencies:
-    mapnik-reference "~6.0.2"
-    optimist "~0.6.0"
-    underscore "~1.6.0"
-
-"carto@github:cartodb/carto#0.15.1-cdb3":
+carto@cartodb/carto#0.15.1-cdb3:
  version "0.15.1-cdb3"
  resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7"
  dependencies:
@ -239,6 +231,14 @@ carto@CartoDB/carto#0.15.1-cdb1:
    optimist "~0.6.0"
    underscore "1.8.3"

+"carto@github:cartodb/carto#0.15.1-cdb1":
+  version "0.15.1-cdb1"
+  resolved "https://codeload.github.com/cartodb/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398"
+  dependencies:
+    mapnik-reference "~6.0.2"
+    optimist "~0.6.0"
+    underscore "~1.6.0"
+
 cartocolor@4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/cartocolor/-/cartocolor-4.0.0.tgz#841a3222d8b5b22718d9d545b1e5b972cb26eb36"
@ -612,8 +612,8 @@ express@~4.13.3:
    vary "~1.0.1"

 extend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"

 extsprintf@1.0.2:
  version "1.0.2"
@ -716,7 +716,7 @@ generate-object-property@^1.1.0:
  dependencies:
    is-property "^1.0.0"

-generic-pool@2.4.3:
+generic-pool@2.4.3, generic-pool@~2.4.0, generic-pool@~2.4.1:
  version "2.4.3"
  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"

@ -728,21 +728,17 @@ generic-pool@~2.2.0, generic-pool@~2.2.1:
  version "2.2.2"
  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.2.2.tgz#7a89f491d575b42f9f069a0e8e2c6dbaa3c241be"

-generic-pool@~2.4.0, generic-pool@~2.4.1:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.6.tgz#f1b55e572167dba2fe75d5aa91ebb1e9f72642d7"
-
 get-caller-file@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"

 getpass@^0.1.1:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
  dependencies:
    assert-plus "^1.0.0"

-glob@3.2.3, "glob@~ 3.2.1":
+glob@3.2.3:
  version "3.2.3"
  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.3.tgz#e313eeb249c7affaa5c475286b0e115b59839467"
  dependencies:
@ -781,6 +777,13 @@ glob@^7.0.5:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

+"glob@~ 3.2.1":
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
+  dependencies:
+    inherits "2"
+    minimatch "0.3"
+
 graceful-fs@^4.1.2:
  version "4.1.11"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@ -812,8 +815,8 @@ growl@1.8.1:
  resolved "https://registry.yarnpkg.com/growl/-/growl-1.8.1.tgz#4b2dec8d907e93db336624dcec0183502f8c9428"

 handlebars@^4.0.1:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7"
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.8.tgz#22b875cd3f0e6cbea30314f144e82bc7a72ff420"
  dependencies:
    async "^1.4.0"
    optimist "^0.6.1"
@ -939,7 +942,7 @@ is-arrayish@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"

-is-buffer@^1.0.2:
+is-buffer@^1.1.5:
  version "1.1.5"
  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"

@ -1084,10 +1087,10 @@ jsprim@^1.2.2:
    verror "1.3.6"

 kind-of@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07"
  dependencies:
-    is-buffer "^1.0.2"
+    is-buffer "^1.1.5"

 lazy-cache@^1.0.3:
  version "1.0.4"
@ -1224,6 +1227,13 @@ mime@~1.2.11:
  version "1.2.11"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"

+minimatch@0.3:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
+  dependencies:
+    lru-cache "2"
+    sigmund "~1.0.0"
+
 minimatch@1.0.x:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-1.0.0.tgz#e0dd2120b49e1b724ce8d714c520822a9438576d"
@ -1393,14 +1403,10 @@ oauth-sign@~0.8.1:
  version "0.8.2"
  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

-object-assign@4.1.0:
+object-assign@4.1.0, object-assign@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"

-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
 object-keys@~0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
@ -1517,7 +1523,7 @@ pg-types@1.*:
    postgres-date "~1.0.0"
    postgres-interval "~1.0.0"

-pg@cartodb/node-postgres#6.1.2-cdb1:
+"pg@github:cartodb/node-postgres#6.1.2-cdb1":
  version "6.1.2"
  resolved "https://codeload.github.com/cartodb/node-postgres/tar.gz/3c81aea432ce58d20a795786c58bbb14f68f9689"
  dependencies:
@ -1828,14 +1834,18 @@ safe-json-stringify@~1:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911"

-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+"semver@2 || 3 || 4 || 5", semver@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"

 semver@4.3.2:
  version "4.3.2"
  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"

+semver@^5.1.0, semver@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
 semver@~1.1.4:
  version "1.1.4"
  resolved "https://registry.yarnpkg.com/semver/-/semver-1.1.4.tgz#2e5a4e72bab03472cc97f72753b4508912ef5540"
@ -1844,10 +1854,6 @@ semver@~4.3.3:
  version "4.3.6"
  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"

-semver@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
-
 send@0.13.1:
  version "0.13.1"
  resolved "https://registry.yarnpkg.com/send/-/send-0.13.1.tgz#a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7"
@ -2098,17 +2104,17 @@ through@2:
  version "2.3.8"
  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"

-"tilelive-bridge@github:cartodb/tilelive-bridge#2.3.1-cdb1":
+tilelive-bridge@cartodb/tilelive-bridge#buffer-size:
  version "2.3.1-cdb1"
-  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/3f76c278c782e93d79045870387a0a06bace720b"
+  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/9df4bde07f3cf9ffbda42657066559e2b8875e1b"
  dependencies:
    mapnik "~3.5.0"
    mapnik-pool "~0.1.3"
    sphericalmercator "1.0.x"

-"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb1":
+tilelive-mapnik@cartodb/tilelive-mapnik#fix-buffer-size-0:
  version "0.6.18-cdb1"
-  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cf7e5b4633db653a889a6c6e6a5ddcbcf4ddc3b5"
+  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/c67400573572e836609dd75a7acec8f414a50dbe"
  dependencies:
    generic-pool "~2.4.0"
    mapnik "3.5.14"
@ -2269,9 +2275,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@3.1.1:
+windshaft@cartodb/windshaft#548-vector-buffer-size:
  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-3.1.1.tgz#5e1b20fa9bcc6f4e04f67738b18a35cb19cadbd1"
+  resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/09493bfff94371989532bef6dff734e4cd5cf058"
  dependencies:
    abaculus cartodb/abaculus#2.0.3-cdb1
    canvas cartodb/node-canvas#1.6.2-cdb2
@ -2288,8 +2294,8 @@ windshaft@3.1.1:
    sphericalmercator "1.0.4"
    step "~0.0.6"
    tilelive "5.12.2"
-    tilelive-bridge cartodb/tilelive-bridge#2.3.1-cdb1
-    tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb1
+    tilelive-bridge cartodb/tilelive-bridge#buffer-size
+    tilelive-mapnik cartodb/tilelive-mapnik#fix-buffer-size-0
    torque.js "~2.11.0"
    underscore "~1.6.0"