From 23d9cd81c88e8f4e46538077844fc1f6597cd89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Fri, 21 Jun 2019 15:26:22 +0200 Subject: [PATCH] test torque fix --- package-lock.json | 74 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index da880561..3e459705 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +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.5.1", + "resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.5.1.tgz", + "integrity": "sha512-LEnXBdsTjNNkzpY20xk6Dpj6hJ+cTRfHROquf8ZeBPF+MAcmtL2XrmRt+zn59y14ZsvLKcdoTJPuJriFWc+J9Q==", "requires": { "@carto/mapnik": "^3.6.2-carto.15", - "@mapbox/sphericalmercator": "^1.1.0", "generic-pool": "^3.6.1", "mime": "^2.4.0" }, @@ -32,7 +31,7 @@ "resolved": "https://registry.npmjs.org/@carto/mapnik/-/mapnik-3.6.2-carto.15.tgz", "integrity": "sha512-O6YpFQ8NRJJZjiQJxoS92Hpjci1tvd4SWKxaicG3SuRBqVGY3BKdhChL+6Ck6tRZvW3O577987vVwEnYKALTCA==", "requires": { - "mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#v1.6.1-carto.2", + "mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#e7ca5471f9e5de81243e6035e70444321fc0a82f", "nan": "2.14.0", "node-pre-gyp": "0.13.0" }, @@ -44,10 +43,14 @@ } } }, - "@mapbox/sphericalmercator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@mapbox/sphericalmercator/-/sphericalmercator-1.1.0.tgz", - "integrity": "sha512-pEsfZyG4OMThlfFQbCte4gegvHUjxXCjz0KZ4Xk8NdOYTQBLflj6U8PL05RPAiuRAMAQNUUKJuL6qYZ5Y4kAWA==" + "abaculus": { + "version": "github:cartodb/abaculus#6b37aeb0d2ed21c3ad083ce0d61b2be69dc642ff", + "from": "github:cartodb/abaculus#2.0.3-cdb15", + "requires": { + "@carto/mapnik": "3.6.2-carto.15", + "d3-queue": "^2.0.2", + "sphericalmercator": "1.0.5" + } }, "abbrev": { "version": "1.1.1", @@ -417,7 +420,7 @@ "integrity": "sha512-1z3Dk9G8KQlNGurbcmGBvNj8DVCh1Keue9uzyyvB6hKOYzBHMxixAMG0D+8nSsA7oQmWUsx/xkZZ5ZxT9toEHA==", "requires": { "debug": "^3.1.0", - "pg": "github:cartodb/node-postgres#6.4.2-cdb2", + "pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6", "underscore": "~1.6.0" } }, @@ -624,6 +627,11 @@ "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz", "integrity": "sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=" }, + "d3-queue": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-2.0.3.tgz", + "integrity": "sha1-B/vaOsrlNYqcUpmq+ICt8JU+0sI=" + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -2044,7 +2052,7 @@ "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#f201885250d2d7ea6c870a1e1060ca6bcfdef186", "postcss": "~5.2.8", "postcss-scss": "0.4.0", "postcss-strip-inline-comments": "0.1.5", @@ -3334,9 +3342,9 @@ "dev": true }, "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "propagate": { "version": "1.0.0", @@ -3709,6 +3717,11 @@ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz", "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==" }, + "sphericalmercator": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.5.tgz", + "integrity": "sha1-3cWgSeNg4ADQ+tn8IsQHGIJYSYA=" + }, "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -3921,11 +3934,10 @@ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "torque.js": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-3.1.0.tgz", - "integrity": "sha512-xX0BVo/gAy5A2Qx17dbgzjB2cnzuSDwzohdT1hGaKbG0jveL3sKgKE5VyzlN1/l4hP3p6f/m20HvZo3waIawCQ==", + "version": "github:cartodb/torque#62bc50b129760cc7e9a00477cb82c9549fef0f99", + "from": "github:cartodb/torque#306-fix-cannot-read-undefined-layer", "requires": { - "carto": "github:cartodb/carto#master", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "d3": "3.5.17", "turbo-carto": "^0.21.1", "turf-jenks": "~1.0.1" @@ -3940,19 +3952,6 @@ "underscore": "1.8.3" } }, - "turbo-carto": { - "version": "0.21.2", - "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.21.2.tgz", - "integrity": "sha512-yUqc5V9U5UEVksMfNSlDOr03mHEQBa187iTM4nbTiOwViBVAo/ndW07INt2np9gin+YO8MFJjo7Ioo8lr+3xUQ==", - "requires": { - "cartocolor": "4.0.0", - "colorbrewer": "1.0.0", - "debug": "^3.1.0", - "es6-promise": "3.1.2", - "postcss": "5.0.19", - "postcss-value-parser": "3.3.0" - } - }, "underscore": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", @@ -4122,14 +4121,14 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.3.0.tgz", - "integrity": "sha512-tirrSpUXJ3vJ3Es95yDq0DzEkb2M0ueNIPIONqCwjyCEikjvFRbu9N+j1pcJAhFiitbdG36rUZftO++vPCMiiQ==", + "version": "github:cartodb/Windshaft#7b8a0868f34709e2864ad2bc5bad92977c6b6c94", + "from": "github:cartodb/Windshaft#test-torque-cartocss-fix", "requires": { - "@carto/cartonik": "^0.6.0", + "@carto/cartonik": "^0.5.1", "@carto/mapnik": "3.6.2-carto.15", + "abaculus": "github:cartodb/abaculus#6b37aeb0d2ed21c3ad083ce0d61b2be69dc642ff", "canvas": "^2.4.1", - "carto": "github:cartodb/carto#0.15.1-cdb5", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "cartodb-psql": "0.13.1", "debug": "3.1.0", "grainstore": "^2.0.0", @@ -4137,7 +4136,8 @@ "redis-mpool": "0.7.0", "request": "2.87.0", "semver": "5.5.0", - "torque.js": "^3.1.0", + "sphericalmercator": "1.0.5", + "torque.js": "github:cartodb/torque#62bc50b129760cc7e9a00477cb82c9549fef0f99", "underscore": "1.6.0" } }, diff --git a/package.json b/package.json index e71a3438..17c00338 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.3.0", + "windshaft": "github:cartodb/Windshaft#test-torque-cartocss-fix", "yargs": "11.1.0" }, "devDependencies": {