diff --git a/package-lock.json b/package-lock.json index 1aa82981..0323464b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,8 +43,8 @@ } }, "abaculus": { - "version": "github:cartodb/abaculus#4dc05ba2e91697ed5fc68734ffa3ffb46290c942", - "from": "github:cartodb/abaculus#nodejs-10", + "version": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8", + "from": "github:cartodb/abaculus#2.0.3-cdb13", "requires": { "@carto/mapnik": "3.6.2-carto.11", "d3-queue": "^2.0.2", @@ -266,7 +266,7 @@ }, "buffer-writer": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz", + "resolved": "http://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz", "integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=" }, "builtin-modules": { @@ -309,12 +309,21 @@ "requires": { "async": "^1.5.2", "bunyan": "1.8.1", - "cartodb-psql": "github:cartodb/node-cartodb-psql#56744d4463a87f3a7f9209413a3f0efd127a4fea", + "cartodb-psql": "github:cartodb/node-cartodb-psql#4029f37a6e6d22a74e8ae2ea672daa6c319d323b", "debug": "^3.1.0", "dot": "^1.0.3", "request": "2.85.0" }, "dependencies": { + "cartodb-psql": { + "version": "github:cartodb/node-cartodb-psql#4029f37a6e6d22a74e8ae2ea672daa6c319d323b", + "from": "github:cartodb/node-cartodb-psql#nodejs-10", + "requires": { + "debug": "^3.1.0", + "pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6", + "underscore": "~1.6.0" + } + }, "request": { "version": "2.85.0", "resolved": "http://registry.npmjs.org/request/-/request-2.85.0.tgz", @@ -347,15 +356,15 @@ } }, "canvas": { - "version": "github:cartodb/node-canvas#232053066f3b0e711113d4a5af042a1a448199cd", - "from": "github:cartodb/node-canvas#nodejs-10", + "version": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d", + "from": "github:cartodb/node-canvas#1.6.2-cdb3", "requires": { "nan": "^2.4.0" } }, "carto": { - "version": "github:cartodb/carto#161516b7211d4be6bf401ab1957cb5cebc139f81", - "from": "github:cartodb/carto#nodejs-10", + "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "from": "github:cartodb/carto#0.15.1-cdb5", "requires": { "mapnik-reference": "~6.0.2", "optimist": "~0.6.0", @@ -378,11 +387,12 @@ } }, "cartodb-psql": { - "version": "github:cartodb/node-cartodb-psql#56744d4463a87f3a7f9209413a3f0efd127a4fea", - "from": "github:cartodb/node-cartodb-psql#nodejs-10", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.13.0.tgz", + "integrity": "sha512-+MBxpgijBgSgXciuwUMGedVB1lABToySoxipODB8YasRc3X15oVSSku9WcMYICnZZg1x2b2Sq4POazBAYoVHxA==", "requires": { "debug": "^3.1.0", - "pg": "github:cartodb/node-postgres#37e731940bccd2d8c001b5b69e2229d09cd057d0", + "pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6", "underscore": "~1.6.0" } }, @@ -395,7 +405,7 @@ "from": "github:cartodb/node-cartodb-redis#nodejs-10", "requires": { "dot": "~1.0.2", - "redis-mpool": "github:cartodb/node-redis-mpool#b8aed387cbfa1a3ed00417a451d6abec59801cde", + "redis-mpool": "github:cartodb/node-redis-mpool#8699ecb90b6200e1fb94835c237cb9258d1821c5", "underscore": "~1.6.0" }, "dependencies": { @@ -403,6 +413,21 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/dot/-/dot-1.0.3.tgz", "integrity": "sha1-+HUL+2sDx2ZOsObLHrTGZBmvlCc=" + }, + "generic-pool": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz", + "integrity": "sha1-rwTcLDJc/Ll1Aj+lK/zpYXp0Nf0=" + }, + "redis-mpool": { + "version": "github:cartodb/node-redis-mpool#8699ecb90b6200e1fb94835c237cb9258d1821c5", + "from": "github:cartodb/node-redis-mpool#nodejs-10", + "requires": { + "generic-pool": "~2.1.1", + "hiredis": "~0.5.0", + "redis": "^2.8.0", + "underscore": "~1.6.0" + } } } }, @@ -1587,8 +1612,9 @@ "dev": true }, "grainstore": { - "version": "github:cartodb/grainstore#e9828cc7f2777b7af61b7328269f32fdb5fb6b42", - "from": "github:cartodb/grainstore#nodejs-10", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-1.10.0.tgz", + "integrity": "sha512-mHBznPEqsM7g11ycVOrWBO7/1VAE4i/G8rFHTw7O5Ru79cbJdl0hJrnuG2ILBY207VNjSPxBC80uN1Pm1tx0Bg==", "requires": { "carto": "0.16.3", "debug": "~3.1.0", @@ -2808,8 +2834,8 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pg": { - "version": "github:cartodb/node-postgres#37e731940bccd2d8c001b5b69e2229d09cd057d0", - "from": "github:cartodb/node-postgres#nodejs-10", + "version": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6", + "from": "github:cartodb/node-postgres#6.4.2-cdb2", "requires": { "buffer-writer": "1.0.1", "js-string-escape": "1.0.1", @@ -3357,9 +3383,9 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sqlite3": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.3.tgz", - "integrity": "sha512-nuWqc26oiJZXyY5MEz+rQbiki1BTibnXsy8Kqo7QD/ut6eksOWi6uWwFMbdnFNME7CZyplWdDXj2fbdQVaEfuA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.4.tgz", + "integrity": "sha512-CO8vZMyUXBPC+E3iXOCc7Tz2pAdq5BWfLcQmOokCOZW5S5sZ/paijiPOCdvzpdP83RroWHYa5xYlVqCxSqpnQg==", "requires": { "nan": "~2.10.0", "node-pre-gyp": "^0.10.3", @@ -3616,17 +3642,18 @@ } }, "torque.js": { - "version": "github:cartodb/torque#6a60af93b7e63a3733be7ff24869c20bfbec73f9", - "from": "github:cartodb/torque#nodejs-10", + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.17.0.tgz", + "integrity": "sha512-XCjKFCJ4OBUPM4F71vwb34VsImvArw1VTQj9rUe8V+V4e+k0uGoRoAF0Xdf5arVr3QDk+RPCl8pcajJDgQzOdQ==", "requires": { - "carto": "github:cartodb/carto#31abb8bee02df605521247b0223d508320f7d4c8", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "d3": "3.5.17", "turbo-carto": "0.19.0", "turf-jenks": "~1.0.1" }, "dependencies": { "carto": { - "version": "github:cartodb/carto#31abb8bee02df605521247b0223d508320f7d4c8", + "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "from": "github:cartodb/carto#master", "requires": { "mapnik-reference": "~6.0.2", @@ -3833,22 +3860,50 @@ "requires": { "@carto/mapnik": "3.6.2-carto.11", "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664", - "abaculus": "github:cartodb/abaculus#4dc05ba2e91697ed5fc68734ffa3ffb46290c942", - "canvas": "github:cartodb/node-canvas#232053066f3b0e711113d4a5af042a1a448199cd", - "carto": "github:cartodb/carto#161516b7211d4be6bf401ab1957cb5cebc139f81", - "cartodb-psql": "github:cartodb/node-cartodb-psql#56744d4463a87f3a7f9209413a3f0efd127a4fea", + "abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8", + "canvas": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", + "cartodb-psql": "0.13.0", "debug": "3.1.0", "dot": "1.1.2", - "grainstore": "github:cartodb/grainstore#e9828cc7f2777b7af61b7328269f32fdb5fb6b42", + "grainstore": "1.10.0", "queue-async": "1.1.0", - "redis-mpool": "github:cartodb/node-redis-mpool#b8aed387cbfa1a3ed00417a451d6abec59801cde", + "redis-mpool": "0.7.0", "request": "2.87.0", "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", "tilelive-mapnik": "github:cartodb/tilelive-mapnik#30b5d9f4f6b774d084bc6dc67a7a01d51e129bb5", - "torque.js": "github:cartodb/torque#6a60af93b7e63a3733be7ff24869c20bfbec73f9", + "torque.js": "2.17.0", "underscore": "1.6.0" + }, + "dependencies": { + "cartodb-psql": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.13.0.tgz", + "integrity": "sha512-+MBxpgijBgSgXciuwUMGedVB1lABToySoxipODB8YasRc3X15oVSSku9WcMYICnZZg1x2b2Sq4POazBAYoVHxA==", + "requires": { + "debug": "^3.1.0", + "pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6", + "underscore": "~1.6.0" + } + }, + "generic-pool": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz", + "integrity": "sha1-rwTcLDJc/Ll1Aj+lK/zpYXp0Nf0=" + }, + "redis-mpool": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.7.0.tgz", + "integrity": "sha512-+Tk3LXK5YkmseZjsz6Bx6/uRHy0CBGVvl6GU5tlzugYRn1qArlxK9wSEhadIfWh96Qx9yngvtacb7g8GNi78rA==", + "requires": { + "generic-pool": "~2.1.1", + "hiredis": "~0.5.0", + "redis": "^2.8.0", + "underscore": "~1.6.0" + } + } } }, "wordwrap": { diff --git a/package.json b/package.json index c935d714..4f42e5a2 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "basic-auth": "2.0.0", "body-parser": "1.18.3", "camshaft": "github:cartodb/camshaft#nodejs-10", - "cartodb-psql": "github:cartodb/node-cartodb-psql#nodejs-10", + "cartodb-psql": "0.13.0", "cartodb-query-tables": "github:cartodb/node-cartodb-query-tables#nodejs-10", "cartodb-redis": "github:cartodb/node-cartodb-redis#nodejs-10", "debug": "3.1.0",