From 909a0191d04dddd221c64af623771163c09e3ed8 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Fri, 18 Aug 2017 14:37:11 +0200 Subject: [PATCH 01/11] Fix source map generation --- webpack.dev.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.dev.config.js b/webpack.dev.config.js index 7aa1783679..3053d0008c 100644 --- a/webpack.dev.config.js +++ b/webpack.dev.config.js @@ -33,7 +33,7 @@ module.exports = env => { resolve(__dirname, 'lib/assets/node_modules') ] }, - devtool: 'eval-source-map', + devtool: 'source-map', plugins: [ stats(env) ? new BundleAnalyzerPlugin({ analyzerMode: 'static' From 864a065c2785d297fa9d12293a2b7d9559ec23b7 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Fri, 18 Aug 2017 16:31:51 +0200 Subject: [PATCH 02/11] Update internal deps --- NEWS.md | 1 + npm-shrinkwrap.json | 160 +++++++++++++++++++++++++++++++++----------- package.json | 6 +- 3 files changed, 125 insertions(+), 42 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1bd658a957..4678d1317b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -135,6 +135,7 @@ Development * Adding max items limit for form list editor (#12552) * Improve Google Login button (cartodb-central#1808) * Implement widget opacity in AutoStyle (#11928) +* Fix histograms data range change (#12622) ### NOTICE This release upgrades the CartoDB PostgreSQL extension to `0.19.2`. Run the following to have it available: diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d2f496c6cc..bf1e454021 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.31", + "version": "4.9.34-12618", "dependencies": { "abbrev": { "version": "1.1.0", @@ -173,9 +173,9 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz" }, "babel-code-frame": { - "version": "6.22.0", - "from": "babel-code-frame@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", + "version": "6.26.0", + "from": "babel-code-frame@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", "dependencies": { "esutils": { "version": "2.0.2", @@ -195,14 +195,24 @@ "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz" }, "babel-helper-define-map": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-helper-define-map@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "from": "babel-runtime@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + }, "lodash": { "version": "4.17.4", - "from": "lodash@>=4.2.0 <5.0.0", + "from": "lodash@>=4.17.4 <5.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "regenerator-runtime": { + "version": "0.11.0", + "from": "regenerator-runtime@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz" } } }, @@ -232,14 +242,24 @@ "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz" }, "babel-helper-regex": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-helper-regex@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "from": "babel-runtime@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + }, "lodash": { "version": "4.17.4", - "from": "lodash@>=4.2.0 <5.0.0", + "from": "lodash@>=4.17.4 <5.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "regenerator-runtime": { + "version": "0.11.0", + "from": "regenerator-runtime@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz" } } }, @@ -294,14 +314,24 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz" }, "babel-plugin-transform-es2015-block-scoping": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-plugin-transform-es2015-block-scoping@>=6.23.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "from": "babel-runtime@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + }, "lodash": { "version": "4.17.4", - "from": "lodash@>=4.2.0 <5.0.0", + "from": "lodash@>=4.17.4 <5.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "regenerator-runtime": { + "version": "0.11.0", + "from": "regenerator-runtime@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz" } } }, @@ -346,9 +376,21 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz" }, "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.23.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz", + "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "from": "babel-runtime@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + }, + "regenerator-runtime": { + "version": "0.11.0", + "from": "regenerator-runtime@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz" + } + } }, "babel-plugin-transform-es2015-modules-systemjs": { "version": "6.24.1", @@ -406,9 +448,9 @@ "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz" }, "babel-plugin-transform-regenerator": { - "version": "6.24.1", + "version": "6.26.0", "from": "babel-plugin-transform-regenerator@>=6.22.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz" + "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz" }, "babel-plugin-transform-strict-mode": { "version": "6.24.1", @@ -426,34 +468,69 @@ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz" }, "babel-template": { - "version": "6.25.0", + "version": "6.26.0", "from": "babel-template@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "from": "babel-runtime@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + }, "lodash": { "version": "4.17.4", - "from": "lodash@>=4.2.0 <5.0.0", + "from": "lodash@>=4.17.4 <5.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "regenerator-runtime": { + "version": "0.11.0", + "from": "regenerator-runtime@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz" } } }, "babel-traverse": { - "version": "6.25.0", + "version": "6.26.0", "from": "babel-traverse@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "from": "babel-runtime@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + }, + "debug": { + "version": "2.6.8", + "from": "debug@>=2.6.8 <3.0.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz" + }, "lodash": { "version": "4.17.4", - "from": "lodash@>=4.2.0 <5.0.0", + "from": "lodash@>=4.17.4 <5.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "ms": { + "version": "2.0.0", + "from": "ms@2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + }, + "regenerator-runtime": { + "version": "0.11.0", + "from": "regenerator-runtime@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz" } } }, "babel-types": { - "version": "6.25.0", + "version": "6.26.0", "from": "babel-types@>=6.24.1 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "from": "babel-runtime@>=6.26.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" + }, "esutils": { "version": "2.0.2", "from": "esutils@>=2.0.2 <3.0.0", @@ -461,14 +538,19 @@ }, "lodash": { "version": "4.17.4", - "from": "lodash@>=4.2.0 <5.0.0", + "from": "lodash@>=4.17.4 <5.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + }, + "regenerator-runtime": { + "version": "0.11.0", + "from": "regenerator-runtime@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz" } } }, "babylon": { "version": "6.18.0", - "from": "babylon@>=6.17.2 <7.0.0", + "from": "babylon@>=6.18.0 <7.0.0", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz" }, "backbone": { @@ -479,7 +561,7 @@ "backbone-forms": { "version": "0.14.0", "from": "backbone-forms@0.14.0", - "resolved": "https://registry.npmjs.org/backbone-forms/-/backbone-forms-0.14.0.tgz" + "resolved": "http://registry.npmjs.org/backbone-forms/-/backbone-forms-0.14.0.tgz" }, "backbone-model-file-upload": { "version": "1.0.0", @@ -732,8 +814,8 @@ }, "cartodb-deep-insights.js": { "version": "0.0.3", - "from": "cartodb/deep-insights.js#master", - "resolved": "git://github.com/cartodb/deep-insights.js.git#41805b1a37c76269c731422a3fb305205808087b", + "from": "cartodb/deep-insights.js#fix-histograms", + "resolved": "git://github.com/cartodb/deep-insights.js.git#65aa14088d53f391b343137d6e7e7e1e977220ac", "dependencies": { "node-polyglot": { "version": "2.2.2", @@ -749,8 +831,8 @@ }, "cartodb.js": { "version": "4.0.0-alpha.1", - "from": "cartodb/cartodb.js#v4", - "resolved": "git://github.com/cartodb/cartodb.js.git#9419e7ca6405559c1e241e09e4f9e059cbe0cbbe" + "from": "cartodb/cartodb.js#fix-histograms", + "resolved": "git://github.com/cartodb/cartodb.js.git#e1e858bb8bf8f2b8a3d0996e3d37cc720e454a8e" }, "caseless": { "version": "0.12.0", @@ -1438,7 +1520,7 @@ }, "globals": { "version": "9.18.0", - "from": "globals@>=9.0.0 <10.0.0", + "from": "globals@>=9.18.0 <10.0.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz" }, "globo": { @@ -1857,7 +1939,7 @@ }, "js-tokens": { "version": "3.0.2", - "from": "js-tokens@>=3.0.0 <4.0.0", + "from": "js-tokens@>=3.0.2 <4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz" }, "js-yaml": { @@ -2525,7 +2607,7 @@ "queue-async": { "version": "1.2.1", "from": "queue-async@1.2.1", - "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.2.1.tgz" + "resolved": "http://registry.npmjs.org/queue-async/-/queue-async-1.2.1.tgz" }, "quote-stream": { "version": "1.0.2", @@ -2640,9 +2722,9 @@ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz" }, "regenerator-transform": { - "version": "0.9.11", - "from": "regenerator-transform@0.9.11", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz" + "version": "0.10.1", + "from": "regenerator-transform@>=0.10.0 <0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz" }, "regex-cache": { "version": "0.4.3", @@ -3138,7 +3220,7 @@ }, "to-fast-properties": { "version": "1.0.3", - "from": "to-fast-properties@>=1.0.1 <2.0.0", + "from": "to-fast-properties@>=1.0.3 <2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz" }, "topojson-client": { diff --git a/package.json b/package.json index 266c02f773..c6bab319b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.34", + "version": "4.9.34-12618", "description": "CARTO UI frontend", "repository": { "type": "git", @@ -24,9 +24,9 @@ "camshaft-reference": "0.33.0", "carto": "cartodb/carto#master", "cartocolor": "4.0.0", - "cartodb-deep-insights.js": "cartodb/deep-insights.js#master", + "cartodb-deep-insights.js": "cartodb/deep-insights.js#fix-histograms", "cartodb-pecan": "0.2.x", - "cartodb.js": "CartoDB/cartodb.js#v4", + "cartodb.js": "CartoDB/cartodb.js#fix-histograms", "clipboard": "1.6.1", "codemirror": "5.14.2", "jquery": "2.1.4", From e08ae4a6b55ccc257bebf7bf4a86bf19c238bf19 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Wed, 23 Aug 2017 12:33:38 +0200 Subject: [PATCH 03/11] Update internal deps --- npm-shrinkwrap.json | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index bf1e454021..d42e25df88 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -561,7 +561,7 @@ "backbone-forms": { "version": "0.14.0", "from": "backbone-forms@0.14.0", - "resolved": "http://registry.npmjs.org/backbone-forms/-/backbone-forms-0.14.0.tgz" + "resolved": "https://registry.npmjs.org/backbone-forms/-/backbone-forms-0.14.0.tgz" }, "backbone-model-file-upload": { "version": "1.0.0", @@ -798,14 +798,14 @@ "resolved": "https://registry.npmjs.org/camshaft-reference/-/camshaft-reference-0.33.0.tgz" }, "caniuse-lite": { - "version": "1.0.30000715", + "version": "1.0.30000717", "from": "caniuse-lite@>=1.0.30000715 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000715.tgz" + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000717.tgz" }, "carto": { "version": "0.15.1-cdb4", "from": "cartodb/carto#master", - "resolved": "git://github.com/cartodb/carto.git#66cc146a02a86a52e587e1d821a04549dc754adb" + "resolved": "git://github.com/cartodb/carto.git#daafa9fbf23e3564bf6b13aa0f0eb36ce2622499" }, "cartocolor": { "version": "4.0.0", @@ -815,7 +815,7 @@ "cartodb-deep-insights.js": { "version": "0.0.3", "from": "cartodb/deep-insights.js#fix-histograms", - "resolved": "git://github.com/cartodb/deep-insights.js.git#65aa14088d53f391b343137d6e7e7e1e977220ac", + "resolved": "git://github.com/cartodb/deep-insights.js.git#acb2117ef0e8322c7da63366c9e897ad9a8e4981", "dependencies": { "node-polyglot": { "version": "2.2.2", @@ -832,7 +832,7 @@ "cartodb.js": { "version": "4.0.0-alpha.1", "from": "cartodb/cartodb.js#fix-histograms", - "resolved": "git://github.com/cartodb/cartodb.js.git#e1e858bb8bf8f2b8a3d0996e3d37cc720e454a8e" + "resolved": "git://github.com/cartodb/cartodb.js.git#5cf938ee274637829a169f16dbbb9dc543a0518d" }, "caseless": { "version": "0.12.0", @@ -1234,9 +1234,9 @@ "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz" }, "evp_bytestokey": { - "version": "1.0.0", + "version": "1.0.2", "from": "evp_bytestokey@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz" + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz" }, "exit": { "version": "0.1.2", @@ -2167,6 +2167,18 @@ "from": "md5@>=2.2.1 <3.0.0", "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz" }, + "md5.js": { + "version": "1.3.4", + "from": "md5.js@>=1.3.4 <2.0.0", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", + "dependencies": { + "hash-base": { + "version": "3.0.4", + "from": "hash-base@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz" + } + } + }, "memory-fs": { "version": "0.4.1", "from": "memory-fs@>=0.4.1 <0.5.0", @@ -2607,7 +2619,7 @@ "queue-async": { "version": "1.2.1", "from": "queue-async@1.2.1", - "resolved": "http://registry.npmjs.org/queue-async/-/queue-async-1.2.1.tgz" + "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.2.1.tgz" }, "quote-stream": { "version": "1.0.2", @@ -2919,9 +2931,9 @@ "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz" }, "source-map": { - "version": "0.5.6", + "version": "0.5.7", "from": "source-map@>=0.5.3 <0.6.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz" }, "spdx-correct": { "version": "1.0.2", @@ -3145,7 +3157,7 @@ "tangram-cartocss": { "version": "0.5.7", "from": "cartodb/tangram-carto#master", - "resolved": "git://github.com/cartodb/tangram-carto.git#35ac7973b770efb86ffaf19f74f8069fdd02cfe0" + "resolved": "git://github.com/cartodb/tangram-carto.git#01908691c58ef410d8bc13c9ff94861a06101d72" }, "tangram-reference": { "version": "1.0.19", @@ -3155,7 +3167,7 @@ "tangram.cartodb": { "version": "0.4.6", "from": "cartodb/tangram.cartodb#master", - "resolved": "git://github.com/cartodb/tangram.cartodb.git#1685d9505c195608c53c0042167361285a13fb85" + "resolved": "git://github.com/cartodb/tangram.cartodb.git#b6ac5f95ffe1b70aad19a24cee2f01711b8f869d" }, "tapable": { "version": "0.2.8", From ad53af008befab6812e13649e3aaccf0cd2e7c08 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Wed, 23 Aug 2017 12:55:14 +0200 Subject: [PATCH 04/11] Update internal deps --- npm-shrinkwrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d42e25df88..5783b1dc27 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -832,7 +832,7 @@ "cartodb.js": { "version": "4.0.0-alpha.1", "from": "cartodb/cartodb.js#fix-histograms", - "resolved": "git://github.com/cartodb/cartodb.js.git#5cf938ee274637829a169f16dbbb9dc543a0518d" + "resolved": "git://github.com/cartodb/cartodb.js.git#aff336c0f5076f368b5ae4dcc24c0ba1e1a4d642" }, "caseless": { "version": "0.12.0", From 84f6d2b8d8f2b9d3a6f1c7e3066e3b94d91777e5 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Wed, 23 Aug 2017 17:57:29 +0200 Subject: [PATCH 05/11] Update internal deps --- npm-shrinkwrap.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 5783b1dc27..3cb36b9ee1 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -805,7 +805,7 @@ "carto": { "version": "0.15.1-cdb4", "from": "cartodb/carto#master", - "resolved": "git://github.com/cartodb/carto.git#daafa9fbf23e3564bf6b13aa0f0eb36ce2622499" + "resolved": "git://github.com/cartodb/carto.git#a48ba58cae13328bf878310521a823e9699bab19" }, "cartocolor": { "version": "4.0.0", @@ -832,7 +832,7 @@ "cartodb.js": { "version": "4.0.0-alpha.1", "from": "cartodb/cartodb.js#fix-histograms", - "resolved": "git://github.com/cartodb/cartodb.js.git#aff336c0f5076f368b5ae4dcc24c0ba1e1a4d642" + "resolved": "git://github.com/cartodb/cartodb.js.git#d899fb9b14b9d26ff2c6197c596ce3eea8d8358e" }, "caseless": { "version": "0.12.0", @@ -3157,7 +3157,7 @@ "tangram-cartocss": { "version": "0.5.7", "from": "cartodb/tangram-carto#master", - "resolved": "git://github.com/cartodb/tangram-carto.git#01908691c58ef410d8bc13c9ff94861a06101d72" + "resolved": "git://github.com/cartodb/tangram-carto.git#9930fef4521d80ee443319521b3dce333ce0049d" }, "tangram-reference": { "version": "1.0.19", @@ -3167,7 +3167,7 @@ "tangram.cartodb": { "version": "0.4.6", "from": "cartodb/tangram.cartodb#master", - "resolved": "git://github.com/cartodb/tangram.cartodb.git#b6ac5f95ffe1b70aad19a24cee2f01711b8f869d" + "resolved": "git://github.com/cartodb/tangram.cartodb.git#b924c77c76f9ecee045e527478a9532602434a6e" }, "tapable": { "version": "0.2.8", From 982893bde4f4fda7f2154879cd7fca76f5179d36 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Fri, 25 Aug 2017 09:53:00 +0200 Subject: [PATCH 06/11] Update internal deps --- npm-shrinkwrap.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3cb36b9ee1..86462cea84 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -798,9 +798,9 @@ "resolved": "https://registry.npmjs.org/camshaft-reference/-/camshaft-reference-0.33.0.tgz" }, "caniuse-lite": { - "version": "1.0.30000717", + "version": "1.0.30000718", "from": "caniuse-lite@>=1.0.30000715 <2.0.0", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000717.tgz" + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz" }, "carto": { "version": "0.15.1-cdb4", @@ -815,7 +815,7 @@ "cartodb-deep-insights.js": { "version": "0.0.3", "from": "cartodb/deep-insights.js#fix-histograms", - "resolved": "git://github.com/cartodb/deep-insights.js.git#acb2117ef0e8322c7da63366c9e897ad9a8e4981", + "resolved": "git://github.com/cartodb/deep-insights.js.git#c285c5f30ad1907d28c13b26573c3cd9b96d1044", "dependencies": { "node-polyglot": { "version": "2.2.2", @@ -3155,9 +3155,9 @@ } }, "tangram-cartocss": { - "version": "0.5.7", - "from": "cartodb/tangram-carto#master", - "resolved": "git://github.com/cartodb/tangram-carto.git#9930fef4521d80ee443319521b3dce333ce0049d" + "version": "0.6.0", + "from": "tangram-cartocss@>=0.6.0 <0.7.0", + "resolved": "https://registry.npmjs.org/tangram-cartocss/-/tangram-cartocss-0.6.0.tgz" }, "tangram-reference": { "version": "1.0.19", @@ -3167,7 +3167,7 @@ "tangram.cartodb": { "version": "0.4.6", "from": "cartodb/tangram.cartodb#master", - "resolved": "git://github.com/cartodb/tangram.cartodb.git#b924c77c76f9ecee045e527478a9532602434a6e" + "resolved": "git://github.com/cartodb/tangram.cartodb.git#d496f57dfc86ce6fa4b35a25ea360e2472b0e39a" }, "tapable": { "version": "0.2.8", From 29ec9ab8b8ea5e6978823bb0514d965f96d4d1ba Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Fri, 25 Aug 2017 11:46:45 +0200 Subject: [PATCH 07/11] Update internal deps --- npm-shrinkwrap.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 72be06ef89..2f073bad0e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -815,7 +815,7 @@ "cartodb-deep-insights.js": { "version": "0.0.3", "from": "cartodb/deep-insights.js#fix-histograms", - "resolved": "git://github.com/cartodb/deep-insights.js.git#c285c5f30ad1907d28c13b26573c3cd9b96d1044", + "resolved": "git://github.com/cartodb/deep-insights.js.git#5ae976346e8f5a7abe002710e9b8171a71946a12", "dependencies": { "node-polyglot": { "version": "2.2.2", diff --git a/package.json b/package.json index e3de21e96a..1aad1da292 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms", + "version": "4.9.41-fix-histograms-2", "description": "CARTO UI frontend", "repository": { "type": "git", From 110237bb9e6c92bcadfff50d8ce58fc0ebbedd79 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Fri, 25 Aug 2017 12:45:29 +0200 Subject: [PATCH 08/11] Update internal deps --- npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 2f073bad0e..d888606f55 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms", + "version": "4.9.41-fix-histograms-2", "dependencies": { "abbrev": { "version": "1.1.0", @@ -815,7 +815,7 @@ "cartodb-deep-insights.js": { "version": "0.0.3", "from": "cartodb/deep-insights.js#fix-histograms", - "resolved": "git://github.com/cartodb/deep-insights.js.git#5ae976346e8f5a7abe002710e9b8171a71946a12", + "resolved": "git://github.com/cartodb/deep-insights.js.git#c1a563aa3fca53e4627a2893fcea4ebe8b982409", "dependencies": { "node-polyglot": { "version": "2.2.2", diff --git a/package.json b/package.json index 1aad1da292..ecb569893b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms-2", + "version": "4.9.41-fix-histograms-3", "description": "CARTO UI frontend", "repository": { "type": "git", From f9aff4b0a2dd67354a94a5e1a0e0ac2c41f1b90b Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Fri, 25 Aug 2017 14:45:42 +0200 Subject: [PATCH 09/11] Update internal deps --- npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d888606f55..b8ea063571 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms-2", + "version": "4.9.41-fix-histograms-5", "dependencies": { "abbrev": { "version": "1.1.0", @@ -832,7 +832,7 @@ "cartodb.js": { "version": "4.0.0-alpha.1", "from": "cartodb/cartodb.js#fix-histograms", - "resolved": "git://github.com/cartodb/cartodb.js.git#d899fb9b14b9d26ff2c6197c596ce3eea8d8358e" + "resolved": "git://github.com/cartodb/cartodb.js.git#9751506151fa1ce68ab16dc82961ee9379cd5731" }, "caseless": { "version": "0.12.0", diff --git a/package.json b/package.json index ecb569893b..16399ae500 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms-3", + "version": "4.9.41-fix-histograms-5", "description": "CARTO UI frontend", "repository": { "type": "git", From acb71c223201492c180db08bfbbb7e2ddbd2f2d4 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Sat, 26 Aug 2017 12:25:44 +0200 Subject: [PATCH 10/11] Update internal deps --- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index b8ea063571..3c428193a5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms-5", + "version": "4.9.41-fix-histograms-6", "dependencies": { "abbrev": { "version": "1.1.0", @@ -815,7 +815,7 @@ "cartodb-deep-insights.js": { "version": "0.0.3", "from": "cartodb/deep-insights.js#fix-histograms", - "resolved": "git://github.com/cartodb/deep-insights.js.git#c1a563aa3fca53e4627a2893fcea4ebe8b982409", + "resolved": "git://github.com/cartodb/deep-insights.js.git#2c66a90dbe2687fe9462bb49272284aa0e4888d1", "dependencies": { "node-polyglot": { "version": "2.2.2", @@ -832,7 +832,7 @@ "cartodb.js": { "version": "4.0.0-alpha.1", "from": "cartodb/cartodb.js#fix-histograms", - "resolved": "git://github.com/cartodb/cartodb.js.git#9751506151fa1ce68ab16dc82961ee9379cd5731" + "resolved": "git://github.com/cartodb/cartodb.js.git#a9df2ad7b36d0b91973cf3de1118179b584edf8d" }, "caseless": { "version": "0.12.0", diff --git a/package.json b/package.json index 16399ae500..e4664d262b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms-5", + "version": "4.9.41-fix-histograms-6", "description": "CARTO UI frontend", "repository": { "type": "git", From 4dbba32f39560af7077d58441853c5b4c027e299 Mon Sep 17 00:00:00 2001 From: Ivan Malagon Date: Mon, 28 Aug 2017 13:39:27 +0200 Subject: [PATCH 11/11] Update internal deps --- npm-shrinkwrap.json | 20 ++++++++++---------- package.json | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3c428193a5..46beb73911 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms-6", + "version": "4.9.42", "dependencies": { "abbrev": { "version": "1.1.0", @@ -753,9 +753,9 @@ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz" }, "browserslist": { - "version": "2.3.3", + "version": "2.4.0", "from": "browserslist@>=2.1.2 <3.0.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.3.3.tgz" + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.4.0.tgz" }, "buffer": { "version": "4.9.1", @@ -799,7 +799,7 @@ }, "caniuse-lite": { "version": "1.0.30000718", - "from": "caniuse-lite@>=1.0.30000715 <2.0.0", + "from": "caniuse-lite@>=1.0.30000718 <2.0.0", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz" }, "carto": { @@ -814,8 +814,8 @@ }, "cartodb-deep-insights.js": { "version": "0.0.3", - "from": "cartodb/deep-insights.js#fix-histograms", - "resolved": "git://github.com/cartodb/deep-insights.js.git#2c66a90dbe2687fe9462bb49272284aa0e4888d1", + "from": "cartodb/deep-insights.js#master", + "resolved": "git://github.com/cartodb/deep-insights.js.git#6d3729b5b9f7ba455e4a6d28e1b8b8747efbf64d", "dependencies": { "node-polyglot": { "version": "2.2.2", @@ -831,8 +831,8 @@ }, "cartodb.js": { "version": "4.0.0-alpha.1", - "from": "cartodb/cartodb.js#fix-histograms", - "resolved": "git://github.com/cartodb/cartodb.js.git#a9df2ad7b36d0b91973cf3de1118179b584edf8d" + "from": "cartodb/cartodb.js#v4", + "resolved": "git://github.com/cartodb/cartodb.js.git#85864e2096b5a6800cb885f00712dcd7e3771d9f" }, "caseless": { "version": "0.12.0", @@ -1444,9 +1444,9 @@ "optional": true }, "function-bind": { - "version": "1.1.0", + "version": "1.1.1", "from": "function-bind@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz" + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" }, "gauge": { "version": "2.7.4", diff --git a/package.json b/package.json index e4664d262b..255ec5aeae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "4.9.41-fix-histograms-6", + "version": "4.9.42", "description": "CARTO UI frontend", "repository": { "type": "git", @@ -24,9 +24,9 @@ "camshaft-reference": "0.33.0", "carto": "cartodb/carto#master", "cartocolor": "4.0.0", - "cartodb-deep-insights.js": "cartodb/deep-insights.js#fix-histograms", + "cartodb-deep-insights.js": "cartodb/deep-insights.js#master", "cartodb-pecan": "0.2.x", - "cartodb.js": "CartoDB/cartodb.js#fix-histograms", + "cartodb.js": "CartoDB/cartodb.js#v4", "clipboard": "1.6.1", "codemirror": "5.14.2", "jquery": "2.1.4",