cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update windshaft to a development version

Browse Source
This commit is contained in:
Daniel García Aubert
2019-01-29 17:47:12 +01:00
parent f82a7a148b
commit c4576564e5
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
package-lock.json generated
View File

@@ -1946,9 +1946,9 @@
}
},
"generic-pool": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.3.tgz",
"integrity": "sha1-eAw29p360FpaBF3Te+etyhGk9v8="
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.2.tgz",
"integrity": "sha1-eon0kdV1tC+fBpoOjixtuqPCQb4="
},
"get-caller-file": {
"version": "1.0.3",
@@ -2029,11 +2029,6 @@
}
}
},
"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",
@@ -2582,13 +2577,6 @@
"requires": {
"generic-pool": "~2.2.1",
"xtend": "~4.0.0"
},
"dependencies": {
"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": {
@@ -2639,6 +2627,11 @@
"zipfile": "~0.5.11"
},
"dependencies": {
"generic-pool": {
"version": "2.4.6",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.6.tgz",
"integrity": "sha1-8bVeVyFn26L+ddWqkeux6fcmQtc="
},
"mime": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
@@ -2949,9 +2942,9 @@
"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
},
"object-assign": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
"integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A="
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"object-keys": {
"version": "0.4.0",
@@ -3163,6 +3156,18 @@
"requires": {
"generic-pool": "2.4.3",
"object-assign": "4.1.0"
},
"dependencies": {
"generic-pool": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.3.tgz",
"integrity": "sha1-eAw29p360FpaBF3Te+etyhGk9v8="
},
"object-assign": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
"integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A="
}
}
},
"pg-types": {
@@ -3927,18 +3932,18 @@
}
},
"tilelive-mapnik": {
"version": "github:cartodb/tilelive-mapnik#30b5d9f4f6b774d084bc6dc67a7a01d51e129bb5",
"from": "github:cartodb/tilelive-mapnik#0.6.18-cdb16",
"version": "github:cartodb/tilelive-mapnik#09093a30f870a932a6c390ab1c33fc43101d35d1",
"from": "github:cartodb/tilelive-mapnik#dynamic-map-pool",
"requires": {
"@carto/mapnik": "3.6.2-carto.11",
"generic-pool": "2.5.4",
"generic-pool": "3.5.0",
"mime": "2.3.1"
},
"dependencies": {
"generic-pool": {
"version": "2.5.4",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.5.4.tgz",
"integrity": "sha1-OMYYhRPhQDCUjsblz2VSPZd5KZs="
"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",
@@ -4149,9 +4154,8 @@
"integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
},
"windshaft": {
"version": "4.12.3",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.12.3.tgz",
"integrity": "sha512-Jay1yXFVmK8BK6EOoJ27xhCIFOaqYkGxKYlAQyJmxYAULhqNLeyiEk3qxcVUyLD0vv0GzmUiHvJQq1ojYnPMGA==",
"version": "github:cartodb/windshaft#8f373b4e6096b6b7ffb5f9984a9e950805b5f744",
"from": "github:cartodb/windshaft#dynamic-map-pool",
"requires": {
"@carto/mapnik": "3.6.2-carto.11",
"@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664",
@@ -4168,7 +4172,7 @@
"semver": "5.5.0",
"sphericalmercator": "1.0.5",
"tilelive": "5.12.3",
"tilelive-mapnik": "github:cartodb/tilelive-mapnik#30b5d9f4f6b774d084bc6dc67a7a01d51e129bb5",
"tilelive-mapnik": "github:cartodb/tilelive-mapnik#09093a30f870a932a6c390ab1c33fc43101d35d1",
"torque.js": "2.17.1",
"underscore": "1.6.0"
}

2
package.json
View File

@@ -49,7 +49,7 @@
"step-profiler": "0.3.0",
"turbo-carto": "0.21.0",
"underscore": "1.6.0",
"windshaft": "^4.12.3",
"windshaft": "github:cartodb/windshaft#dynamic-map-pool",
"yargs": "11.1.0"
},
"devDependencies": {