From 2a6cd45104d1b49191fe32cebf775f5ba59e5c03 Mon Sep 17 00:00:00 2001 From: Sergio Clebal Date: Fri, 8 Apr 2022 19:18:36 +0200 Subject: [PATCH 1/3] Bump deck.gl to 8.7.5 --- package.json | 16 +++---- packages/react-api/package.json | 6 +-- packages/react-basemaps/package.json | 2 +- packages/react-core/package.json | 2 +- packages/react-redux/package.json | 4 +- packages/react-widgets/package.json | 4 +- yarn.lock | 64 ++++++++++++++-------------- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index e8cea5e31..86f74be95 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,14 @@ "packages/*" ], "devDependencies": { - "@deck.gl/aggregation-layers": "^8.7.3", - "@deck.gl/carto": "^8.7.3", - "@deck.gl/core": "^8.7.3", - "@deck.gl/extensions": "^8.7.3", - "@deck.gl/geo-layers": "^8.7.3", - "@deck.gl/google-maps": "^8.7.3", - "@deck.gl/layers": "^8.7.3", - "@deck.gl/mesh-layers": "^8.7.3", + "@deck.gl/aggregation-layers": "^8.7.5", + "@deck.gl/carto": "^8.7.5", + "@deck.gl/core": "^8.7.5", + "@deck.gl/extensions": "^8.7.5", + "@deck.gl/geo-layers": "^8.7.5", + "@deck.gl/google-maps": "^8.7.5", + "@deck.gl/layers": "^8.7.5", + "@deck.gl/mesh-layers": "^8.7.5", "@material-ui/core": "^4.11.3", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.57", diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 628dec1ed..8e3fa13d9 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -67,9 +67,9 @@ "@carto/react-core": "^1.3.0-alpha.0", "@carto/react-redux": "^1.3.0-alpha.0", "@carto/react-workers": "^1.3.0-alpha.0", - "@deck.gl/carto": "^8.7.3", - "@deck.gl/core": "^8.7.3", - "@deck.gl/extensions": "^8.7.3", + "@deck.gl/carto": "^8.7.5", + "@deck.gl/core": "^8.7.5", + "@deck.gl/extensions": "^8.7.5", "react": "^17.0.1", "react-dom": "^17.0.1", "react-redux": "^7.2.2", diff --git a/packages/react-basemaps/package.json b/packages/react-basemaps/package.json index 16515d509..2e1a32ca7 100644 --- a/packages/react-basemaps/package.json +++ b/packages/react-basemaps/package.json @@ -65,7 +65,7 @@ }, "peerDependencies": { "@carto/react-core": "^1.3.0-alpha.0", - "@deck.gl/google-maps": "^8.7.3", + "@deck.gl/google-maps": "^8.7.5", "react": "^17.0.1", "react-dom": "^17.0.1" } diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 217cf2139..bf32be6e3 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -64,7 +64,7 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@deck.gl/carto": "^8.7.3", + "@deck.gl/carto": "^8.7.5", "@turf/bbox-polygon": "^6.3.0", "@turf/boolean-intersects": "^6.3.0", "@turf/boolean-within": "^6.3.0", diff --git a/packages/react-redux/package.json b/packages/react-redux/package.json index 9e9acebf8..4ab9a9063 100644 --- a/packages/react-redux/package.json +++ b/packages/react-redux/package.json @@ -65,8 +65,8 @@ "peerDependencies": { "@carto/react-core": "^1.3.0-alpha.0", "@carto/react-workers": "^1.3.0-alpha.0", - "@deck.gl/carto": "^8.7.3", - "@deck.gl/core": "^8.7.3", + "@deck.gl/carto": "^8.7.5", + "@deck.gl/core": "^8.7.5", "@reduxjs/toolkit": "^1.5.0" } } diff --git a/packages/react-widgets/package.json b/packages/react-widgets/package.json index ab5f8014d..9e49443f4 100644 --- a/packages/react-widgets/package.json +++ b/packages/react-widgets/package.json @@ -70,8 +70,8 @@ "@carto/react-redux": "^1.3.0-alpha.0", "@carto/react-ui": "^1.3.0-alpha.0", "@carto/react-workers": "^1.3.0-alpha.0", - "@deck.gl/core": "^8.7.3", - "@deck.gl/layers": "^8.7.3", + "@deck.gl/core": "^8.7.5", + "@deck.gl/layers": "^8.7.5", "@material-ui/core": "^4.11.3", "@nebula.gl/edit-modes": "^1.0.2-alpha.0", "@nebula.gl/layers": "^1.0.2-alpha.0", diff --git a/yarn.lock b/yarn.lock index ff3d8d0ad..382459638 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1165,19 +1165,19 @@ enabled "2.0.x" kuler "^2.0.0" -"@deck.gl/aggregation-layers@^8.7.3": - version "8.7.3" - resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.7.3.tgz#2c8e3a50a540c6db9dc08463aa9771c0bc1c42cb" - integrity sha512-Jx84izYlhdbj00bapwfnTUMnFqeyUTNirkntjn8StFcK32cqA+Oe33XYnAjywdMEsS1gB3ByFD+JiWNTYilW6w== +"@deck.gl/aggregation-layers@^8.7.5": + version "8.7.5" + resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.7.5.tgz#2206c9616b71da8505e86545981f4567cf8a9f7b" + integrity sha512-DZ3thV3+zZhBWaBRLYG1cd8toIkQq3MiSMgLDPGjH8bGf7LGIMmHri/QyaCEiICjKrUPvP3tToODkQS3eyzAVQ== dependencies: "@luma.gl/shadertools" "^8.5.10" "@math.gl/web-mercator" "^3.5.7" d3-hexbin "^0.2.1" -"@deck.gl/carto@^8.7.3": - version "8.7.3" - resolved "https://registry.yarnpkg.com/@deck.gl/carto/-/carto-8.7.3.tgz#e0f6d4e5058dcf642b357a3620599a7b1edf8d89" - integrity sha512-5aDLnO3gQ95IogSzKwJtHk9a4cOYEr3cGAkHYT8IKJncf2gVcQCSIjfuBOe0pyiM2ltonbRPNtEJk0im4eq7yQ== +"@deck.gl/carto@^8.7.5": + version "8.7.5" + resolved "https://registry.yarnpkg.com/@deck.gl/carto/-/carto-8.7.5.tgz#f635f990b24f90483d007a89a2eb1a0970b811b6" + integrity sha512-EFmO3UKkQr9MM2FRWNYvX3PIRO+LqPl7BSr/+BAouf6jhYT79l2Tl0O/DdRl4w5jdX+xG8IFFKe90JTpjK7LHg== dependencies: "@loaders.gl/gis" "^3.1.5" "@loaders.gl/loader-utils" "^3.1.5" @@ -1193,10 +1193,10 @@ moment-timezone "^0.5.33" pbf "^3.2.1" -"@deck.gl/core@^8.7.3": - version "8.7.3" - resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.7.3.tgz#8bc3c7668f497b342e4b329b20f1689612071090" - integrity sha512-dMN4k7zov5RtIwih1PYwHGAiK3iygygw/AhqXEZjXPdMM2hlhe2xp39NtUbtk3074u5dCELCkkB3BS5DdZqZ1g== +"@deck.gl/core@^8.7.5": + version "8.7.5" + resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.7.5.tgz#eb1c44879665b35ee509d8c8959af2e089a154a3" + integrity sha512-6VbbgY7Bzt+bsBp/fZvQIM/+48tv4TeByra6nLVsJiYg6iT7O1DlhG5dPVPksZnGXiMADn/cG/iQbbPe/v1UzA== dependencies: "@loaders.gl/core" "^3.1.5" "@loaders.gl/images" "^3.1.5" @@ -1211,17 +1211,17 @@ math.gl "^3.5.7" mjolnir.js "^2.5.0" -"@deck.gl/extensions@^8.7.3": - version "8.7.3" - resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.7.3.tgz#a89eec45a3bc663ed21a9bfae2347fe7a3c55f26" - integrity sha512-O/jzOaPZ2Ci3mIl2RmWjb2VrB3oYIL71de2BcvvZia/+9HBLwdMe+PL2ty1LZcWTVBt09e/A/1Mqfp73/ZkfeQ== +"@deck.gl/extensions@^8.7.5": + version "8.7.5" + resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.7.5.tgz#326722a2d5c9313ccdf19ae0e162da862ebcf66a" + integrity sha512-ALUUYuEOYDpW12H0Vx0tdXHKde6iQwnKULwKI33W8Xb65TMS4tbvAwQGmzNdohlwqtdG+4c3wwDqV+nJLIEbnA== dependencies: "@luma.gl/shadertools" "^8.5.10" -"@deck.gl/geo-layers@^8.7.3": - version "8.7.3" - resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.7.3.tgz#227e97e3fbb949b168c7a7b5424d4f4a78bc0de5" - integrity sha512-vvSRyN2d5QfaRDcBcf0Ya/Uk/rIR0Z0T8e2YMeptTll75pxgMoIF5OaC7xYdQH/82KfMadJyHwGEDBkoHuWFnQ== +"@deck.gl/geo-layers@^8.7.5": + version "8.7.5" + resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.7.5.tgz#adf70c47650b09894069c162a3e2af0862fbe34e" + integrity sha512-TK/fLRyEevk5xMF5l/tVJFSn4uoOpIa9gvQxmJSZCVZn4Kt865BEEVKNqeHq8h1tWKr/caO8EAGvhPSBLXz+/g== dependencies: "@loaders.gl/3d-tiles" "^3.1.5" "@loaders.gl/gis" "^3.1.5" @@ -1236,25 +1236,25 @@ h3-js "^3.6.0" long "^3.2.0" -"@deck.gl/google-maps@^8.7.3": - version "8.7.3" - resolved "https://registry.yarnpkg.com/@deck.gl/google-maps/-/google-maps-8.7.3.tgz#aa4ad08c7adb47e8fac264378d7150d1b9467f0b" - integrity sha512-Z2wLWDE2/QSSXwgebxN78Z4hux1np4aQq90fhAOxnG/nBVB28AbH9ZEqWepdSA3nYCjkuxe5+j5S5ETogRrlJQ== +"@deck.gl/google-maps@^8.7.5": + version "8.7.5" + resolved "https://registry.yarnpkg.com/@deck.gl/google-maps/-/google-maps-8.7.5.tgz#302e44b68a53de270429f53abf2c968ae46a822d" + integrity sha512-ICsD9I3TWRXE/vq5TAMiPvaR9fPLTv+hU+U7VskXh83wP1R8myFvESBGm9wm/ASa+UH+Pe6/RhsAuUX4MsI3qQ== -"@deck.gl/layers@^8.7.3": - version "8.7.3" - resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.7.3.tgz#e07f8cbe73371579f7746c97d32d97c0ca7a5e56" - integrity sha512-j6tnN/KVFV/JdaR2ttPAUgzTGGThSfZCOF2tGvhMyT2diEJOKyziDMiK6Nk2QMM5/DNIgArqxPu0uM+WTHWYmQ== +"@deck.gl/layers@^8.7.5": + version "8.7.5" + resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.7.5.tgz#e79eb464caf4afa5c4e886859a25971b2ba57d90" + integrity sha512-7DExC6mzIsxwvJRR0CFBfE+b5N98163U3+vCuBRCrmGEIvAohcijiDFRiDPA1eN6WussYVF3e3AxmNElvMC+Iw== dependencies: "@loaders.gl/images" "^3.1.5" "@mapbox/tiny-sdf" "^1.1.0" "@math.gl/polygon" "^3.5.7" earcut "^2.0.6" -"@deck.gl/mesh-layers@^8.7.3": - version "8.7.3" - resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.7.3.tgz#1bf4cc73e5f0a8ce51f598ea897cefbdc5144c0a" - integrity sha512-32M5vQry3KkgdK0xJG9TiXAxOHqmyGxH5zKhPx6KeTNe+FWHPK4wbdfDfqUMXKNvtMsyXT7Um9GRoMZ7QGr5aA== +"@deck.gl/mesh-layers@^8.7.5": + version "8.7.5" + resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.7.5.tgz#78f140b2b48783fa0a95b74cbc0fe5ddf630cc8b" + integrity sha512-aPeU5bQvQkM6WiFjyRpVbwu4ghX9wtvxYVKtPszritQDo+oRhmxzEThZshqvOxpbfmx11VU8E559PrJwXuCo9g== dependencies: "@loaders.gl/gltf" "^3.1.5" "@luma.gl/constants" "^8.5.10" From ec7f29800a2db401067457edf61b7f0c24f7c972 Mon Sep 17 00:00:00 2001 From: Sergio Clebal Date: Fri, 8 Apr 2022 19:19:37 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cab4b43b..0316b4b95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fix aggregation to ignore NULL values [#367](https://github.com/CartoDB/carto-react/pull/367) - Fix regression for PieWidgetUI category selection logic [#369](https://github.com/CartoDB/carto-react/pull/369) - Add support for formatted labels in LegendRamp [#372](https://github.com/CartoDB/carto-react/pull/372) +- Bump deck.gl to 8.7.5 [#373](https://github.com/CartoDB/carto-react/pull/373) ## 1.3 From 034c9c6dfc6c0b21c72a1bd4d541a73149c9d185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Velarde?= Date: Mon, 11 Apr 2022 12:23:02 +0200 Subject: [PATCH 3/3] Upgrade peer deps to latest published --- packages/react-api/package.json | 6 +++--- packages/react-auth/package.json | 2 +- packages/react-basemaps/package.json | 2 +- packages/react-redux/package.json | 4 ++-- packages/react-ui/package.json | 2 +- packages/react-widgets/package.json | 10 +++++----- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 8e3fa13d9..d69fe5e15 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -64,9 +64,9 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^1.3.0-alpha.0", - "@carto/react-redux": "^1.3.0-alpha.0", - "@carto/react-workers": "^1.3.0-alpha.0", + "@carto/react-core": "^1.3.0-alpha.1", + "@carto/react-redux": "^1.3.0-alpha.1", + "@carto/react-workers": "^1.3.0-alpha.1", "@deck.gl/carto": "^8.7.5", "@deck.gl/core": "^8.7.5", "@deck.gl/extensions": "^8.7.5", diff --git a/packages/react-auth/package.json b/packages/react-auth/package.json index 04e2948b7..c58855394 100644 --- a/packages/react-auth/package.json +++ b/packages/react-auth/package.json @@ -64,7 +64,7 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^1.3.0-alpha.0", + "@carto/react-core": "^1.3.0-alpha.1", "react": "^17.0.1", "react-dom": "^17.0.1" } diff --git a/packages/react-basemaps/package.json b/packages/react-basemaps/package.json index 2e1a32ca7..b8b87b1d9 100644 --- a/packages/react-basemaps/package.json +++ b/packages/react-basemaps/package.json @@ -64,7 +64,7 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^1.3.0-alpha.0", + "@carto/react-core": "^1.3.0-alpha.1", "@deck.gl/google-maps": "^8.7.5", "react": "^17.0.1", "react-dom": "^17.0.1" diff --git a/packages/react-redux/package.json b/packages/react-redux/package.json index 4ab9a9063..e420522a7 100644 --- a/packages/react-redux/package.json +++ b/packages/react-redux/package.json @@ -63,8 +63,8 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^1.3.0-alpha.0", - "@carto/react-workers": "^1.3.0-alpha.0", + "@carto/react-core": "^1.3.0-alpha.1", + "@carto/react-workers": "^1.3.0-alpha.1", "@deck.gl/carto": "^8.7.5", "@deck.gl/core": "^8.7.5", "@reduxjs/toolkit": "^1.5.0" diff --git a/packages/react-ui/package.json b/packages/react-ui/package.json index 16706a435..af0c4fb29 100644 --- a/packages/react-ui/package.json +++ b/packages/react-ui/package.json @@ -75,7 +75,7 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^1.3.0-alpha.0", + "@carto/react-core": "^1.3.0-alpha.1", "@material-ui/core": "^4.11.3", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.57", diff --git a/packages/react-widgets/package.json b/packages/react-widgets/package.json index 9e49443f4..661f48174 100644 --- a/packages/react-widgets/package.json +++ b/packages/react-widgets/package.json @@ -65,11 +65,11 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-api": "^1.3.0-alpha.0", - "@carto/react-core": "^1.3.0-alpha.0", - "@carto/react-redux": "^1.3.0-alpha.0", - "@carto/react-ui": "^1.3.0-alpha.0", - "@carto/react-workers": "^1.3.0-alpha.0", + "@carto/react-api": "^1.3.0-alpha.1", + "@carto/react-core": "^1.3.0-alpha.1", + "@carto/react-redux": "^1.3.0-alpha.1", + "@carto/react-ui": "^1.3.0-alpha.1", + "@carto/react-workers": "^1.3.0-alpha.1", "@deck.gl/core": "^8.7.5", "@deck.gl/layers": "^8.7.5", "@material-ui/core": "^4.11.3",