From 2a68e0565eddc779392ea04ac104d5af6c54e719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 1 Feb 2019 17:43:47 +0100 Subject: [PATCH 01/12] Update windshaft dep --- package-lock.json | 32 ++++++++++++++++---------------- package.json | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index a2483242..e7ed324b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -270,9 +270,9 @@ "integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=" }, "builtin-modules": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz", - "integrity": "sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" }, "bunyan": { "version": "1.8.1", @@ -2290,11 +2290,11 @@ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-builtin-module": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.0.0.tgz", - "integrity": "sha512-/93sDihsAD652hrMEbJGbMAVBf1qc96kyThHQ0CAOONHaE3aROLpTjDe4WQ5aoC5ITHFxEq1z8XqSU7km+8amw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "requires": { - "builtin-modules": "^3.0.0" + "builtin-modules": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -2888,12 +2888,12 @@ } }, "normalize-package-data": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.1.tgz", - "integrity": "sha512-ZVuHxWJv1bopjv/SD5uPhgwUhLqxdJ+SsdUQbGR9HWlXrvnd/C08Cn9Bq48PbvX3y5V97GIpAHpL5Bk9BwChGg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz", + "integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==", "requires": { "hosted-git-info": "^2.1.4", - "is-builtin-module": "^3.0.0", + "is-builtin-module": "^1.0.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" } @@ -3932,8 +3932,8 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#40a8dd085f1bfd2b9bd6e49a5df5f43c6162e5dd", - "from": "github:cartodb/tilelive-mapnik#dynamic-map-pool", + "version": "github:cartodb/tilelive-mapnik#716290cf738c2c9f15ec9d5c13dd668959636728", + "from": "github:cartodb/tilelive-mapnik#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", "generic-pool": "3.5.0", @@ -4154,8 +4154,8 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#1103736d0f925f9c08cf7f4c0bebe6b6f68d416a", - "from": "github:cartodb/windshaft#dynamic-map-pool", + "version": "github:cartodb/windshaft#0e09596c6ab338b7c5a3e781a6dac15a86e397ee", + "from": "github:cartodb/windshaft#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664", @@ -4172,7 +4172,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#40a8dd085f1bfd2b9bd6e49a5df5f43c6162e5dd", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#716290cf738c2c9f15ec9d5c13dd668959636728", "torque.js": "2.17.1", "underscore": "1.6.0" } diff --git a/package.json b/package.json index 0de95824..40512671 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "github:cartodb/windshaft#dynamic-map-pool", + "windshaft": "github:cartodb/windshaft#refactor", "yargs": "11.1.0" }, "devDependencies": { From e1c4f8445c340dc16cec83961d546a0301717f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 4 Feb 2019 13:52:03 +0100 Subject: [PATCH 02/12] Update tilelive-mapnik to development version --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7ed324b..a4ca882d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3932,7 +3932,7 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#716290cf738c2c9f15ec9d5c13dd668959636728", + "version": "github:cartodb/tilelive-mapnik#badc239fdd7b57d1a636431aff8dea983043c1ab", "from": "github:cartodb/tilelive-mapnik#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4154,7 +4154,7 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#0e09596c6ab338b7c5a3e781a6dac15a86e397ee", + "version": "github:cartodb/windshaft#7be5a06a4146448273b0d387b031ddef48c6bd0f", "from": "github:cartodb/windshaft#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4172,7 +4172,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#716290cf738c2c9f15ec9d5c13dd668959636728", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#badc239fdd7b57d1a636431aff8dea983043c1ab", "torque.js": "2.17.1", "underscore": "1.6.0" } From d40be45e9ad0fc5a1eded38b61b9d5a7e8b7d03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 4 Feb 2019 18:53:38 +0100 Subject: [PATCH 03/12] Update windshaft devel dep --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a4ca882d..bc51dc87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3932,7 +3932,7 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#badc239fdd7b57d1a636431aff8dea983043c1ab", + "version": "github:cartodb/tilelive-mapnik#6f08373b3fa9bef3b65bfeb789f7e70ee7c42fb1", "from": "github:cartodb/tilelive-mapnik#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4154,7 +4154,7 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#7be5a06a4146448273b0d387b031ddef48c6bd0f", + "version": "github:cartodb/windshaft#b4f85994bab3601ad13a88ec5debd7954927431b", "from": "github:cartodb/windshaft#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4172,7 +4172,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#badc239fdd7b57d1a636431aff8dea983043c1ab", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#6f08373b3fa9bef3b65bfeb789f7e70ee7c42fb1", "torque.js": "2.17.1", "underscore": "1.6.0" } From 3dcefa3ea187f1ad33df685447c7408342637b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 5 Feb 2019 08:55:34 +0100 Subject: [PATCH 04/12] Update windshaft devel dep --- package-lock.json | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 98674aee..6dfedffe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2899,9 +2899,9 @@ } }, "npm-bundled": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", - "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", + "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==" }, "npm-packlist": { "version": "1.2.0", @@ -4175,27 +4175,6 @@ "tilelive-mapnik": "github:cartodb/tilelive-mapnik#6f08373b3fa9bef3b65bfeb789f7e70ee7c42fb1", "torque.js": "2.17.1", "underscore": "1.6.0" - }, - "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", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==" - }, - "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#a16ae79202d1b4288c1b0fe28c5e939e3be6b594", - "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb17", - "requires": { - "@carto/mapnik": "3.6.2-carto.11", - "generic-pool": "3.5.0", - "mime": "2.3.1" - } - } } }, "wordwrap": { From 6a15d3057993728c8afe6cbbe7842ca7135d6903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 6 Feb 2019 17:05:33 +0100 Subject: [PATCH 05/12] Update windshaft devel branch --- package-lock.json | 48 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6dfedffe..11053028 100644 --- a/package-lock.json +++ b/package-lock.json @@ -269,11 +269,6 @@ "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz", "integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=" }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" - }, "bunyan": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz", @@ -2289,14 +2284,6 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "requires": { - "builtin-modules": "^1.0.0" - } - }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -2888,14 +2875,24 @@ } }, "normalize-package-data": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz", - "integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "requires": { "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", + "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "resolve": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz", + "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", + "requires": { + "path-parse": "^1.0.6" + } + } } }, "npm-bundled": { @@ -2904,9 +2901,9 @@ "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==" }, "npm-packlist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz", - "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz", + "integrity": "sha512-qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA==", "requires": { "ignore-walk": "^3.0.1", "npm-bundled": "^1.0.1" @@ -3092,6 +3089,11 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -3932,7 +3934,7 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#6f08373b3fa9bef3b65bfeb789f7e70ee7c42fb1", + "version": "github:cartodb/tilelive-mapnik#1ab71989863cf0d92fbabd7ffecc988172d9eaeb", "from": "github:cartodb/tilelive-mapnik#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4154,7 +4156,7 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#b4f85994bab3601ad13a88ec5debd7954927431b", + "version": "github:cartodb/windshaft#814c322126f2e1bf2334929e7c772ee291dad497", "from": "github:cartodb/windshaft#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4172,7 +4174,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#6f08373b3fa9bef3b65bfeb789f7e70ee7c42fb1", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#1ab71989863cf0d92fbabd7ffecc988172d9eaeb", "torque.js": "2.17.1", "underscore": "1.6.0" } From 0125dcdd1dc6f77f80a15a10a4a485b1537be357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 7 Feb 2019 18:32:15 +0100 Subject: [PATCH 06/12] Update windshaft devel branch --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 11053028..80414d32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3934,7 +3934,7 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#1ab71989863cf0d92fbabd7ffecc988172d9eaeb", + "version": "github:cartodb/tilelive-mapnik#1630ed912864964d33fb4c1f17d72e4dd28b0b0f", "from": "github:cartodb/tilelive-mapnik#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4156,7 +4156,7 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#814c322126f2e1bf2334929e7c772ee291dad497", + "version": "github:cartodb/windshaft#2b81065c9b44c0df3cad947d72d0e8977c263add", "from": "github:cartodb/windshaft#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4174,7 +4174,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#1ab71989863cf0d92fbabd7ffecc988172d9eaeb", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#1630ed912864964d33fb4c1f17d72e4dd28b0b0f", "torque.js": "2.17.1", "underscore": "1.6.0" } From 14b8a72551efb4c1755d49726ae83132b000e874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Thu, 7 Feb 2019 19:16:36 +0100 Subject: [PATCH 07/12] Update windshaft devel branch --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 80414d32..c78d49cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3934,7 +3934,7 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#1630ed912864964d33fb4c1f17d72e4dd28b0b0f", + "version": "github:cartodb/tilelive-mapnik#eb9b90aaed074dec01d1de9e868e0fb99539b4b1", "from": "github:cartodb/tilelive-mapnik#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4156,7 +4156,7 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#2b81065c9b44c0df3cad947d72d0e8977c263add", + "version": "github:cartodb/windshaft#164240a22ad06d4c3bfb2123f118fb4fc2f9491d", "from": "github:cartodb/windshaft#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4174,7 +4174,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#1630ed912864964d33fb4c1f17d72e4dd28b0b0f", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#eb9b90aaed074dec01d1de9e868e0fb99539b4b1", "torque.js": "2.17.1", "underscore": "1.6.0" } From 2856703acc242e6581d8a1bde7ae150a6a6d0beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Fri, 8 Feb 2019 18:44:59 +0100 Subject: [PATCH 08/12] Update windshaft devel branch --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c78d49cf..87e82282 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3934,7 +3934,7 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#eb9b90aaed074dec01d1de9e868e0fb99539b4b1", + "version": "github:cartodb/tilelive-mapnik#abb4529faf23a404e769a88e1f21d18132863578", "from": "github:cartodb/tilelive-mapnik#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4156,7 +4156,7 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#164240a22ad06d4c3bfb2123f118fb4fc2f9491d", + "version": "github:cartodb/windshaft#b1a2c4b325b0b402020f509dc7f2fa9ede259349", "from": "github:cartodb/windshaft#refactor", "requires": { "@carto/mapnik": "3.6.2-carto.11", @@ -4174,7 +4174,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#eb9b90aaed074dec01d1de9e868e0fb99539b4b1", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#abb4529faf23a404e769a88e1f21d18132863578", "torque.js": "2.17.1", "underscore": "1.6.0" } From 8d9b8aced2cae38a096721d3dbe0b40ff416b4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 11 Feb 2019 13:19:34 +0100 Subject: [PATCH 09/12] Upgrade windshaft to version 4.13.1 --- package-lock.json | 11 ++++++----- package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 87e82282..497597d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3934,8 +3934,8 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#abb4529faf23a404e769a88e1f21d18132863578", - "from": "github:cartodb/tilelive-mapnik#refactor", + "version": "github:cartodb/tilelive-mapnik#a89d4147b3288804b679a018271893dda18373c2", + "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb18", "requires": { "@carto/mapnik": "3.6.2-carto.11", "generic-pool": "3.5.0", @@ -4156,8 +4156,9 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#b1a2c4b325b0b402020f509dc7f2fa9ede259349", - "from": "github:cartodb/windshaft#refactor", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.1.tgz", + "integrity": "sha512-sjk8D6gOZTp2jb7iuF38FyhPIcAAOUsOQtS+SmTLLIk1AipEK+xQU11IVl9cOvhiaCYjs7dRLscM54qoMqKVxw==", "requires": { "@carto/mapnik": "3.6.2-carto.11", "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664", @@ -4174,7 +4175,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#abb4529faf23a404e769a88e1f21d18132863578", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#a89d4147b3288804b679a018271893dda18373c2", "torque.js": "2.17.1", "underscore": "1.6.0" } diff --git a/package.json b/package.json index 40512671..e0ca099c 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "github:cartodb/windshaft#refactor", + "windshaft": "^4.13.1", "yargs": "11.1.0" }, "devDependencies": { From 092bed6d9dd2c122449386e3cee82165ade093d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 11 Feb 2019 13:25:13 +0100 Subject: [PATCH 10/12] Do not use caret symbol --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0ca099c..fd8294b4 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "^4.13.1", + "windshaft": "4.13.1", "yargs": "11.1.0" }, "devDependencies": { From 01d02f8c2ed15f0b5485a399c36d1c3438c6adf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 11 Feb 2019 13:33:50 +0100 Subject: [PATCH 11/12] Update windshaft to version 4.13.1 --- NEWS.md | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index ee0b3a8c..326a8a9b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,7 +10,7 @@ Announcements: - Report fine-grained Garbage Collector stats - Adding Authorization to Access-Control-Allow-Headers (https://github.com/CartoDB/CartoDB-SQL-API/issues/534) - Update deps: - - windshaft@4.12.3 + - windshaft@4.13.1: Upgrade tilelive-mapnik to version 0.6.18-cdb18 - Update dev deps: - jshint@2.9.7 - mocha@5.2.0 diff --git a/package-lock.json b/package-lock.json index 497597d1..d20e1209 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "6.5.2", + "version": "6.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fd8294b4..6e74e71a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "6.5.2", + "version": "6.6.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From f134bd459eae48567322112219bd30051534c47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 11 Feb 2019 13:35:53 +0100 Subject: [PATCH 12/12] Update yarn.lock --- yarn.lock | 64 +++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/yarn.lock b/yarn.lock index 31b4d933..1ea29608 100644 --- a/yarn.lock +++ b/yarn.lock @@ -59,8 +59,8 @@ ajv@^5.1.0: json-schema-traverse "^0.3.0" ajv@^6.5.5: - version "6.7.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96" + version "6.9.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1" dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -223,10 +223,6 @@ buffer-writer@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz#22a936901e3029afcd7547eb4487ceb697a3bf08" -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - bunyan@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.1.tgz#68c6a4a502d5620bc9f72d6736810c1b1898097f" @@ -824,9 +820,9 @@ generic-pool@2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff" -generic-pool@2.5.4: - version "2.5.4" - resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.5.4.tgz#38c6188513e14030948ec6e5cf65523d9779299b" +generic-pool@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.5.0.tgz#acac4fd743a175ff20574f380910036464cb61f7" generic-pool@~2.1.1: version "2.1.1" @@ -923,8 +919,8 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" handlebars@^4.0.1: - version "4.0.12" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5" + version "4.1.0" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a" dependencies: async "^2.5.0" optimist "^0.6.1" @@ -1085,12 +1081,6 @@ is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - dependencies: - builtin-modules "^1.0.0" - is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" @@ -1528,21 +1518,21 @@ nopt@^4.0.1: osenv "^0.1.4" normalize-package-data@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" dependencies: hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" + resolve "^1.10.0" semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" npm-bundled@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" + version "1.0.6" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" npm-packlist@^1.1.6: - version "1.2.0" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.2.0.tgz#55a60e793e272f00862c7089274439a4cc31fc7f" + version "1.3.0" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.3.0.tgz#7f01e8e44408341379ca98cfd756e7b29bd2626c" dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" @@ -1701,6 +1691,10 @@ path-key@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -2092,6 +2086,12 @@ resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" +resolve@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" + dependencies: + path-parse "^1.0.6" + rimraf@^2.6.1: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -2417,12 +2417,12 @@ through@2: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" -"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb16": - version "0.6.18-cdb16" - resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/30b5d9f4f6b774d084bc6dc67a7a01d51e129bb5" +"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb18": + version "0.6.18-cdb17" + resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/a89d4147b3288804b679a018271893dda18373c2" dependencies: "@carto/mapnik" "3.6.2-carto.11" - generic-pool "2.5.4" + generic-pool "3.5.0" mime "2.3.1" tilelive@5.12.3: @@ -2599,9 +2599,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.12.3: - version "4.12.3" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.12.3.tgz#f0ed16c208278468852f388a664bb687eed842b9" +windshaft@4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.13.1.tgz#14387b7c088adddefd52aaf82d905f3547b364d9" dependencies: "@carto/mapnik" "3.6.2-carto.11" "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb11 @@ -2618,7 +2618,7 @@ windshaft@^4.12.3: semver "5.5.0" sphericalmercator "1.0.5" tilelive "5.12.3" - tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb16 + tilelive-mapnik "github:cartodb/tilelive-mapnik#0.6.18-cdb18" torque.js "2.17.1" underscore "1.6.0"