From 3690959be418335786e0f7702efe6fdd0b25ba49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 21 Nov 2018 15:42:12 +0100 Subject: [PATCH] Update camshaft@0.63.0 --- package-lock.json | 63 +++++++++++++++++++---------------------------- package.json | 2 +- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index d81e482e..75cd4e20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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": { @@ -283,14 +283,6 @@ "moment": "^2.10.6", "mv": "~2", "safe-json-stringify": "~1" - }, - "dependencies": { - "moment": { - "version": "2.22.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", - "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=", - "optional": true - } } }, "bytes": { @@ -304,26 +296,18 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "camshaft": { - "version": "github:cartodb/camshaft#48ebf36f0c0cb5bbaae07f4af4080285a7dac1a0", - "from": "github:cartodb/camshaft#nodejs-10", + "version": "0.63.0", + "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.63.0.tgz", + "integrity": "sha512-od8nWaOpZ4QdxptW2A7iT7XjWPvycRbhcz6txzf/iukPKtRNZgW6T1Ds/6P5zEi3+3V/Ynj2EBxgPSe/w5+0GQ==", "requires": { "async": "^1.5.2", "bunyan": "1.8.1", - "cartodb-psql": "github:cartodb/node-cartodb-psql#4029f37a6e6d22a74e8ae2ea672daa6c319d323b", + "cartodb-psql": "0.13.0", "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", @@ -364,7 +348,7 @@ }, "carto": { "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#0.15.1-cdb5", + "from": "github:cartodb/carto#master", "requires": { "mapnik-reference": "~6.0.2", "optimist": "~0.6.0", @@ -2489,8 +2473,7 @@ "moment": { "version": "2.22.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", - "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==", - "dev": true + "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==" }, "ms": { "version": "2.0.0", @@ -3653,15 +3636,6 @@ "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" - } - }, "debug": { "version": "2.2.0", "resolved": "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz", @@ -3687,11 +3661,6 @@ "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", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" } } }, @@ -3878,6 +3847,24 @@ "tilelive-mapnik": "github:cartodb/tilelive-mapnik#30b5d9f4f6b774d084bc6dc67a7a01d51e129bb5", "torque.js": "2.17.0", "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 159afef4..68b0980d 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@carto/fqdn-sync": "0.2.2", "basic-auth": "2.0.0", "body-parser": "1.18.3", - "camshaft": "github:cartodb/camshaft#nodejs-10", + "camshaft": "0.63.0", "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",