diff --git a/package-lock.json b/package-lock.json index 6bb1827233..9a7366d409 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1516,60 +1516,27 @@ "dev": true }, "@carto/carto.js": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@carto/carto.js/-/carto.js-4.1.11.tgz", - "integrity": "sha512-cjO+wM5QAaPx49uXgRB+B7Eh5SqR8gjrWqoEuK/+M28qdoTK3kQ3uOHVWiMh8DfrBXL0UTUoTka5Y4Az2WIg8g==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@carto/carto.js/-/carto.js-4.2.1.tgz", + "integrity": "sha512-ylvl7iVKu/pCiRH4H0Fak3hgYpC3HPVQc7iXwx0oa9jBNkIoE9TskOTGBGwks9yt2onnbf96caxtSfk8oSFF8Q==", "requires": { "@carto/zera": "1.0.7", "backbone": "1.2.3", "backbone-poller": "^1.1.3", "camshaft-reference": "0.34.0", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", "d3-time-format": "2.1.0", "jquery": "2.1.4", "mustache": "1.1.0", + "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", "postcss": "5.0.19", "promise-polyfill": "^6.1.0", + "torque.js": "github:CartoDB/torque#23101417f2774217b42ac4088119ccb80798b088", "underscore": "1.8.3", "whatwg-fetch": "^2.0.3" - }, - "dependencies": { - "carto": { - "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "requires": { - "mapnik-reference": "~6.0.2", - "optimist": "~0.6.0", - "underscore": "1.8.3" - } - }, - "perfect-scrollbar": { - "version": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", - "from": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d" - }, - "torque.js": { - "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", - "from": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", - "requires": { - "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "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" - } - } - } - } } }, "@carto/common-ui": { @@ -7182,9 +7149,9 @@ "integrity": "sha1-yTouVLQXwJWRKdfXP2z31Ckudhg=" }, "d3-time": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.11.tgz", - "integrity": "sha512-Z3wpvhPLW4vEScGeIMUckDW7+3hWKOQfAWg/U7PlWBnQmeKQ00gCUsTtWSYulrKNA7ta8hJ+xXc6MHrMuITwEw==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz", + "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==" }, "d3-time-format": { "version": "2.1.0", @@ -11188,59 +11155,26 @@ } }, "internal-carto.js": { - "version": "github:CartoDB/carto.js#cf701782c261c33e700d001d8d7fb5437836bca6", - "from": "github:CartoDB/carto.js#v4.2.0", + "version": "github:CartoDB/carto.js#097644dc652b6ac5b03e3e6bf55e9f083b4e657b", + "from": "github:CartoDB/carto.js#v4.2.1", "requires": { "@carto/zera": "1.0.7", "backbone": "1.2.3", "backbone-poller": "^1.1.3", "camshaft-reference": "0.34.0", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", "d3-time-format": "2.1.0", "jquery": "2.1.4", "mustache": "1.1.0", + "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", "postcss": "5.0.19", "promise-polyfill": "^6.1.0", + "torque.js": "github:CartoDB/torque#23101417f2774217b42ac4088119ccb80798b088", "underscore": "1.8.3", "whatwg-fetch": "^2.0.3" - }, - "dependencies": { - "carto": { - "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "requires": { - "mapnik-reference": "~6.0.2", - "optimist": "~0.6.0", - "underscore": "1.8.3" - } - }, - "perfect-scrollbar": { - "version": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", - "from": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d" - }, - "torque.js": { - "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", - "from": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", - "requires": { - "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", - "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" - } - } - } - } } }, "interpret": { diff --git a/package.json b/package.json index 7f99454542..3d0e21641e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@babel/polyfill": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz", "@babel/runtime": "^7.9.2", "@babel/runtime-corejs3": "^7.9.2", - "@carto/carto.js": "^4.1.10", + "@carto/carto.js": "^4.2.1", "@carto/common-ui": "git://github.com/CartoDB/common-ui.git#v0.1.2", "@carto/toolkit-core": "0.0.1-rc.18", "@carto/toolkit-custom-storage": "0.0.1-rc.18", @@ -45,7 +45,7 @@ "date-fns": "^1.29.0", "fastclick": "^1.0.6", "html-webpack-plugin": "^3.2.0", - "internal-carto.js": "CartoDB/carto.js#v4.2.0", + "internal-carto.js": "CartoDB/carto.js#v4.2.1", "jquery": "2.1.4", "leaflet": "CartoDB/Leaflet#v1.3.1-carto1", "loader-utils": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",