Use devel branch of windshaft

This commit is contained in:
Daniel García Aubert
2019-03-17 18:01:41 +01:00
parent 9a98422076
commit 00570a21f5
2 changed files with 19 additions and 29 deletions
+18 -28
View File
@@ -27,12 +27,12 @@
}
},
"@carto/tilelive-bridge": {
"version": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664",
"from": "github:cartodb/tilelive-bridge#2.5.1-cdb11",
"version": "github:cartodb/tilelive-bridge#126066832ace469d4b261bb8cb58c51e77e96518",
"from": "github:cartodb/tilelive-bridge#cartofy",
"requires": {
"@carto/mapnik": "3.6.2-carto.11",
"@mapbox/sphericalmercator": "~1.0.1",
"mapnik-pool": "~0.1.3"
"generic-pool": "^3.6.1"
},
"dependencies": {
"@mapbox/sphericalmercator": {
@@ -1941,9 +1941,9 @@
}
},
"generic-pool": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.2.tgz",
"integrity": "sha1-eon0kdV1tC+fBpoOjixtuqPCQb4="
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.6.1.tgz",
"integrity": "sha512-iMmD/pY4q0+V+f8o4twE9JPeqfNuX+gJAaIPB3B0W1lFkBOtTxBo6B0HxHPgGhzQA8jego7EWopcYq/UDJO2KA=="
},
"get-caller-file": {
"version": "1.0.3",
@@ -2024,6 +2024,11 @@
}
}
},
"generic-pool": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.2.tgz",
"integrity": "sha1-eon0kdV1tC+fBpoOjixtuqPCQb4="
},
"mapnik-reference": {
"version": "8.5.6",
"resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-8.5.6.tgz",
@@ -2557,15 +2562,6 @@
"resolved": "https://registry.npmjs.org/lzma/-/lzma-2.3.2.tgz",
"integrity": "sha1-N4OySFi5wOdHoN88vx+1/KqSxEE="
},
"mapnik-pool": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/mapnik-pool/-/mapnik-pool-0.1.3.tgz",
"integrity": "sha1-m9rRyzTYehm8eOy0y/uqIDsvPys=",
"requires": {
"generic-pool": "~2.2.1",
"xtend": "~4.0.0"
}
},
"mapnik-reference": {
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-6.0.5.tgz",
@@ -3934,19 +3930,14 @@
}
},
"tilelive-mapnik": {
"version": "github:cartodb/tilelive-mapnik#a89d4147b3288804b679a018271893dda18373c2",
"from": "github:cartodb/tilelive-mapnik#0.6.18-cdb18",
"version": "github:cartodb/tilelive-mapnik#194806841783c39e19681460c1965c09b72f6d44",
"from": "github:cartodb/tilelive-mapnik#cartofy",
"requires": {
"@carto/mapnik": "3.6.2-carto.11",
"generic-pool": "3.5.0",
"generic-pool": "^3.6.1",
"mime": "2.3.1"
},
"dependencies": {
"generic-pool": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.5.0.tgz",
"integrity": "sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w=="
},
"mime": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
@@ -4156,12 +4147,11 @@
"integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
},
"windshaft": {
"version": "4.13.3",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.3.tgz",
"integrity": "sha512-A5a9y1jA4ehtWgSPRUG1gBL/KF1mYytIk1r6OA85d1MsdgEGrcLaBgH1VISIoIGzKsEeriPanhRhagfn2/TL2g==",
"version": "github:cartodb/windshaft#301470f5bb2932be6b4cce12a78c70561298fde1",
"from": "github:cartodb/windshaft#cartofy",
"requires": {
"@carto/mapnik": "3.6.2-carto.11",
"@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664",
"@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#126066832ace469d4b261bb8cb58c51e77e96518",
"abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8",
"canvas": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d",
"carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
@@ -4175,7 +4165,7 @@
"semver": "5.5.0",
"sphericalmercator": "1.0.5",
"tilelive": "5.12.3",
"tilelive-mapnik": "github:cartodb/tilelive-mapnik#a89d4147b3288804b679a018271893dda18373c2",
"tilelive-mapnik": "github:cartodb/tilelive-mapnik#194806841783c39e19681460c1965c09b72f6d44",
"torque.js": "2.17.1",
"underscore": "1.6.0"
}
+1 -1
View File
@@ -49,7 +49,7 @@
"step-profiler": "0.3.0",
"turbo-carto": "0.21.0",
"underscore": "1.6.0",
"windshaft": "^4.13.3",
"windshaft": "github:cartodb/windshaft#cartofy",
"yargs": "11.1.0"
},
"devDependencies": {