From dbc926b0b8b6dcc56b7f882a2950d8d922be6c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 16 Jul 2019 12:27:49 +0200 Subject: [PATCH] Upgrade windshaft to version 5.5.0 --- NEWS.md | 8 +-- package-lock.json | 172 ++++++++++++++++------------------------------ package.json | 2 +- 3 files changed, 65 insertions(+), 117 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1c4b71f9..c8798d58 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,11 +8,11 @@ Announcements: - Cache control header fine tuning. Set a shorter value for "max-age" directive if there is no way to know when to trigger the invalidation. - Update deps: - Update `cartodb-query-tables` to version [`0.5.0`](https://github.com/CartoDB/node-cartodb-query-tables/releases/tag/0.5.0) - - windshaft@5.3.0: - - Update @carto/mapnik to [`3.6.2-carto.15`](https://github.com/CartoDB/node-mapnik/blob/v3.6.2-carto.15/CHANGELOG.carto.md#362-carto15). + - Upgrade `windshaft` to [`5.5.0`](https://github.com/CartoDB/Windshaft/blob/5.5.0/NEWS.md#version-550): + - Upgrade grainstore to [`2.0.1`](https://github.com/CartoDB/grainstore/releases/tag/2.0.1) + - Update @carto/mapnik to [`3.6.2-carto.16`](https://github.com/CartoDB/node-mapnik/blob/v3.6.2-carto.16/CHANGELOG.carto.md#362-carto16). - Update turbo-carto to [`0.21.2`](https://github.com/CartoDB/turbo-carto/releases/tag/0.21.2) - - Upgrade `@carto/cartonik` to version [0.6.0](https://github.com/CartoDB/cartonik/blob/v0.6.0/CHANGELOG.md#v060-2019-06-17). - - Upgrade `windshaft` to version [5.4.0](https://github.com/CartoDB/Windshaft/releases/tag/5.4.0) + - Upgrade `@carto/cartonik` to version [0.6.1](https://github.com/CartoDB/cartonik/blob/master/CHANGELOG.md#v061-2019-07-10). ## 7.1.0 Released 2019-05-06 diff --git a/package-lock.json b/package-lock.json index 2b38e3d0..0bc4990b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,11 +5,11 @@ "requires": true, "dependencies": { "@carto/cartonik": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.6.0.tgz", - "integrity": "sha512-p8Y9OvR/tTKm82juUVDRs0dEeN7yHt0Wrh+J81aDuBkbFTPPDxIlWm+hsDr+kLnta67zCfTtJYQJjeHEgCfbSg==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.6.1.tgz", + "integrity": "sha512-7tRnEe8JTGzbYxBcsXhneWzK2HVP/Fc4KcI0PNIgMAUsu3q2Yz3tikA9/OoT9PtGvcOmqNn6CwfVibBKwYO23Q==", "requires": { - "@carto/mapnik": "^3.6.2-carto.15", + "@carto/mapnik": "3.6.2-carto.16", "@mapbox/sphericalmercator": "^1.1.0", "generic-pool": "^3.6.1", "mime": "^2.4.0" @@ -28,9 +28,9 @@ "integrity": "sha512-hvD8HlzgWkFsCswIHs+wtrIK8HEGC2L8jny3JY00lQ/xwurLxWR+xMYpgjI821INmjEPRFtajFQkniB1HxNBkQ==" }, "@carto/mapnik": { - "version": "3.6.2-carto.15", - "resolved": "https://registry.npmjs.org/@carto/mapnik/-/mapnik-3.6.2-carto.15.tgz", - "integrity": "sha512-O6YpFQ8NRJJZjiQJxoS92Hpjci1tvd4SWKxaicG3SuRBqVGY3BKdhChL+6Ck6tRZvW3O577987vVwEnYKALTCA==", + "version": "3.6.2-carto.16", + "resolved": "https://registry.npmjs.org/@carto/mapnik/-/mapnik-3.6.2-carto.16.tgz", + "integrity": "sha512-RX8ov5EpEheToESVKiKnV5yMPLA2KxaX2ANAs9W4856oKFPdbGmB2buDz54mLhwBDfler9GVo0Bzr2ayRVLO2A==", "requires": { "mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#v1.6.1-carto.2", "nan": "2.14.0", @@ -389,7 +389,7 @@ }, "carto": { "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#master", + "from": "github:cartodb/carto#0.15.1-cdb5", "requires": { "mapnik-reference": "~6.0.2", "optimist": "~0.6.0", @@ -488,9 +488,9 @@ "dev": true }, "chownr": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", - "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz", + "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==" }, "chroma-js": { "version": "1.1.1", @@ -651,6 +651,11 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "decimal.js": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.0.tgz", + "integrity": "sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==" + }, "decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", @@ -2032,19 +2037,19 @@ } }, "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==" }, "grainstore": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-2.0.0.tgz", - "integrity": "sha512-eDCr8kkpvKaenLqomRnYPQT8ARJZh+QzqtCJ+iHCLyj2pAfGSEnnld6XtCnQdbtCgJsFPrUaaWn12DqCmJiDnQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-2.0.1.tgz", + "integrity": "sha512-a7olYowSF+kSvh3Qqa7RXg5v7kpev8MrYtqVxpF9I0PftSBLVLL0SddEmN3ylRjkSlBLnuS7bZHFiYg5SGx95Q==", "requires": { "carto": "0.16.3", "debug": "~3.1.0", "generic-pool": "~2.2.0", - "millstone": "github:cartodb/millstone#v0.6.17-carto.2", + "millstone": "github:cartodb/millstone#v0.6.17-carto.3", "postcss": "~5.2.8", "postcss-scss": "0.4.0", "postcss-strip-inline-comments": "0.1.5", @@ -2644,15 +2649,14 @@ "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, "millstone": { - "version": "github:cartodb/millstone#f201885250d2d7ea6c870a1e1060ca6bcfdef186", - "from": "github:cartodb/millstone#v0.6.17-carto.2", + "version": "github:cartodb/millstone#eeeb308fba4586343bb848fbf8ae0d180192627d", + "from": "github:cartodb/millstone#v0.6.17-carto.3", "requires": { "generic-pool": "~2.4.1", "mime": "~2.3.1", "mkdirp": "~0.5.0", "optimist": "0.6.1", "request": "2.x", - "sqlite3": "~4.0.1", "srs": "^1.2.0", "step": "~1.0.0", "underscore": "~1.9.1", @@ -2727,9 +2731,9 @@ }, "dependencies": { "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" }, "yallist": { "version": "3.0.3", @@ -2956,9 +2960,9 @@ "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==" }, "npm-packlist": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", - "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz", + "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==", "requires": { "ignore-walk": "^3.0.1", "npm-bundled": "^1.0.1" @@ -3705,9 +3709,9 @@ } }, "spdx-license-ids": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz", - "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" }, "split": { "version": "1.0.1", @@ -3722,61 +3726,6 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, - "sqlite3": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.9.tgz", - "integrity": "sha512-IkvzjmsWQl9BuBiM4xKpl5X8WCR4w0AeJHRdobCdXZ8dT/lNc1XS6WqvY35N6+YzIIgzSBeY5prdFObID9F9tA==", - "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.11.0", - "request": "^2.87.0" - }, - "dependencies": { - "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" - }, - "node-pre-gyp": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", - "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==", - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "requires": { - "glob": "^7.1.3" - } - } - } - }, "srs": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/srs/-/srs-1.2.0.tgz", @@ -3904,9 +3853,9 @@ }, "dependencies": { "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" }, "yallist": { "version": "3.0.3", @@ -3929,6 +3878,22 @@ "d3": "3.5.17", "turbo-carto": "^0.21.1", "turf-jenks": "~1.0.1" + }, + "dependencies": { + "carto": { + "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "from": "github:cartodb/carto#master", + "requires": { + "mapnik-reference": "~6.0.2", + "optimist": "~0.6.0", + "underscore": "1.8.3" + } + }, + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" + } } }, "tough-cookie": { @@ -4093,41 +4058,24 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.4.0.tgz", - "integrity": "sha512-gqEZyNqD99ErfpORWuxz7AmNnN0hDBimJD4ZCJUq4tSjIbLQT02P6WLw+uyijktqP3ZuZK+33CES+9JL3MMasQ==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.5.0.tgz", + "integrity": "sha512-QV5cixvq+5ZLWdwqvQ8On/exdcgGoKhjSp38tLZd+ymDr0jD2vdu0nR0ruLMeFEiUiGd4pv1P+peVb1ITBjaDQ==", "requires": { - "@carto/cartonik": "^0.6.0", - "@carto/mapnik": "3.6.2-carto.15", + "@carto/cartonik": "^0.6.1", + "@carto/mapnik": "3.6.2-carto.16", "canvas": "^2.4.1", "carto": "github:cartodb/carto#0.15.1-cdb5", "cartodb-psql": "0.13.1", "debug": "3.1.0", - "grainstore": "^2.0.0", + "decimal.js": "^10.2.0", + "grainstore": "^2.0.1", "queue-async": "1.1.0", "redis-mpool": "0.7.0", "request": "2.87.0", "semver": "5.5.0", "torque.js": "3.1.1", "underscore": "1.6.0" - }, - "dependencies": { - "carto": { - "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#0.15.1-cdb5", - "requires": { - "mapnik-reference": "~6.0.2", - "optimist": "~0.6.0", - "underscore": "1.8.3" - }, - "dependencies": { - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" - } - } - } } }, "wordwrap": { diff --git a/package.json b/package.json index f6582f01..31b3079b 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.2", "underscore": "1.6.0", - "windshaft": "5.4.0", + "windshaft": "^5.5.0", "yargs": "11.1.0" }, "devDependencies": {