From d58cb207559c2adead7064d2e01d2d3986d78253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jul 2018 16:24:07 +0200 Subject: [PATCH 1/4] Use dev carto.js version --- npm-shrinkwrap.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index eb9c47457c35..3486d6646aef 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3,9 +3,9 @@ "version": "4.12.57", "dependencies": { "@carto/carto.js": { - "version": "4.0.17", + "version": "4.1.0", "from": "@carto/carto.js@>=4.0.6 <5.0.0", - "resolved": "https://registry.npmjs.org/@carto/carto.js/-/carto.js-4.0.17.tgz" + "resolved": "https://registry.npmjs.org/@carto/carto.js/-/carto.js-4.1.0.tgz" }, "@carto/zera": { "version": "1.0.6", @@ -1142,9 +1142,9 @@ } }, "eslint-scope": { - "version": "3.7.1", + "version": "3.7.3", "from": "eslint-scope@>=3.7.1 <4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz", "dependencies": { "estraverse": { "version": "4.2.0", @@ -1519,9 +1519,9 @@ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz" }, "html-minifier": { - "version": "3.5.18", + "version": "3.5.19", "from": "html-minifier@>=3.2.3 <4.0.0", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.18.tgz" + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz" }, "html-webpack-plugin": { "version": "3.2.0", @@ -1665,9 +1665,9 @@ } }, "internal-carto.js": { - "version": "4.0.18-0", - "from": "cartodb/carto.js#v4.0.18-0", - "resolved": "git://github.com/cartodb/carto.js.git#f1964aaf454b1bd2221fc45946cc495886152e3b" + "version": "4.1.0", + "from": "cartodb/carto.js#fix-set-view", + "resolved": "git://github.com/cartodb/carto.js.git#253e13b4ba5e69d55754df2e9dd00ba7315bf499" }, "interpret": { "version": "1.1.0", @@ -3392,9 +3392,9 @@ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.1.tgz" }, "use": { - "version": "3.1.0", + "version": "3.1.1", "from": "use@>=3.1.0 <4.0.0", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz" + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz" }, "util": { "version": "0.10.4", diff --git a/package.json b/package.json index 9394893edfc6..d9956f867e93 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "d3-queue": "^3.0.7", "fastclick": "^1.0.6", "html-webpack-plugin": "^3.2.0", - "internal-carto.js": "CartoDB/carto.js#v4.0.18-0", + "internal-carto.js": "CartoDB/carto.js#fix-set-view", "jquery": "2.1.4", "leaflet": "CartoDB/Leaflet#v1.3.1-carto1", "moment": "2.18.1", From a9473ec76944662f6f5d8a85df338ed605ba5388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jul 2018 16:25:00 +0200 Subject: [PATCH 2/4] Update NEWS --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index bd43f1b340ad..2286f7660512 100644 --- a/NEWS.md +++ b/NEWS.md @@ -17,6 +17,7 @@ This release introduces a new API Key system. In order to migrate existing users * New rake to fix inconsistent permissions (`bundle exec rake cartodb:permissions:fix_permission_acl`) ### Bug fixes / enhancements +* Use setView instead of flyTo to improve zoom transitions (https://github.com/CartoDB/carto.js/pull/2178) * Fix torque layers when filter analysis is added (https://github.com/CartoDB/support/issues/1038) * Copyright symbol not appearing on exported image (https://github.com/CartoDB/cartodb/issues/13411) * Keep selected popup tab after fetch (https://github.com/CartoDB/support/issues/1396) From 218c4ed7418dbfdf8cc1e7bc5770d7c447b2d85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jul 2018 17:07:21 +0200 Subject: [PATCH 3/4] Allow ES6 in internal-carto.js for the tests --- lib/build/tasks/webpack/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build/tasks/webpack/webpack.config.js b/lib/build/tasks/webpack/webpack.config.js index 88455de9a77e..72209f51cb11 100644 --- a/lib/build/tasks/webpack/webpack.config.js +++ b/lib/build/tasks/webpack/webpack.config.js @@ -45,7 +45,7 @@ module.exports = { path.resolve(path.resolve('.'), 'lib/assets/javascripts/dashboard'), path.resolve(path.resolve('.'), 'lib/assets/test/spec/dashboard'), path.resolve(path.resolve('.'), 'lib/assets/test/spec/fixtures'), - path.resolve(path.resolve('.'), 'lib/assets/javascripts/dashboard') + path.resolve(path.resolve('.'), 'node_modules/internal-carto.js') ], options: { presets: [ From 03998cd207e7e432d844e9a91388f7da357bfd50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Fri, 13 Jul 2018 17:18:10 +0200 Subject: [PATCH 4/4] Point to carto.js v4.1.1-0 --- 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 3486d6646aef..8cecff116918 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1665,9 +1665,9 @@ } }, "internal-carto.js": { - "version": "4.1.0", - "from": "cartodb/carto.js#fix-set-view", - "resolved": "git://github.com/cartodb/carto.js.git#253e13b4ba5e69d55754df2e9dd00ba7315bf499" + "version": "4.1.1-0", + "from": "cartodb/carto.js#v4.1.1-0", + "resolved": "git://github.com/cartodb/carto.js.git#85499951eb4ea2199c6c11db4ce4071f2880fe10" }, "interpret": { "version": "1.1.0", diff --git a/package.json b/package.json index d9956f867e93..8c7912a041b2 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "d3-queue": "^3.0.7", "fastclick": "^1.0.6", "html-webpack-plugin": "^3.2.0", - "internal-carto.js": "CartoDB/carto.js#fix-set-view", + "internal-carto.js": "CartoDB/carto.js#v4.1.1-0", "jquery": "2.1.4", "leaflet": "CartoDB/Leaflet#v1.3.1-carto1", "moment": "2.18.1",