From a8c9e88032b74a533efb4be7dbc5449a0e0669f7 Mon Sep 17 00:00:00 2001 From: padawannn Date: Wed, 3 Apr 2024 12:02:37 +0200 Subject: [PATCH 1/5] Release 2.5.0 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ffce0eef..275a4db70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ ## Not released -## 2.4 +## 2.5 + +### 2.5.0 (2024-04-03) + +- New Legend Widget [#837](https://github.com/CartoDB/carto-react/pull/837) ### 2.4.2 (2024-03-22) From 76b1e1b02227566754a2f42a7a298ed825c42325 Mon Sep 17 00:00:00 2001 From: padawannn Date: Wed, 3 Apr 2024 12:06:48 +0200 Subject: [PATCH 2/5] v2.5.0 --- lerna.json | 2 +- packages/react-api/package.json | 2 +- packages/react-auth/package.json | 2 +- packages/react-basemaps/package.json | 2 +- packages/react-core/package.json | 2 +- packages/react-redux/package.json | 2 +- packages/react-ui/package.json | 2 +- packages/react-widgets/package.json | 2 +- packages/react-workers/package.json | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lerna.json b/lerna.json index 40b957495..b4a76a687 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.4.2" + "version": "2.5.0" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 0bc769247..0d3196d94 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-api", - "version": "2.4.2", + "version": "2.5.0", "description": "CARTO for React - Api", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-auth/package.json b/packages/react-auth/package.json index ef1b4b4e4..8081f0d33 100644 --- a/packages/react-auth/package.json +++ b/packages/react-auth/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-auth", - "version": "2.4.2", + "version": "2.5.0", "description": "CARTO for React - Auth", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-basemaps/package.json b/packages/react-basemaps/package.json index abbb098e5..ca3deaaf9 100644 --- a/packages/react-basemaps/package.json +++ b/packages/react-basemaps/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-basemaps", - "version": "2.4.2", + "version": "2.5.0", "description": "CARTO for React - Basemaps", "keywords": [ "carto", diff --git a/packages/react-core/package.json b/packages/react-core/package.json index f5d702d3d..5d3699c8b 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-core", - "version": "2.4.2", + "version": "2.5.0", "description": "CARTO for React - Core", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-redux/package.json b/packages/react-redux/package.json index da011e425..fae23cbe5 100644 --- a/packages/react-redux/package.json +++ b/packages/react-redux/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-redux", - "version": "2.4.2", + "version": "2.5.0", "description": "CARTO for React - Redux", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-ui/package.json b/packages/react-ui/package.json index 588f9a01a..aaf124104 100644 --- a/packages/react-ui/package.json +++ b/packages/react-ui/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-ui", - "version": "2.4.2", + "version": "2.5.0", "description": "CARTO for React - UI", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-widgets/package.json b/packages/react-widgets/package.json index aee4e81e5..f3c04a699 100644 --- a/packages/react-widgets/package.json +++ b/packages/react-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-widgets", - "version": "2.4.2", + "version": "2.5.0", "description": "CARTO for React - Widgets", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-workers/package.json b/packages/react-workers/package.json index 22d948c8f..fb66bcf6a 100644 --- a/packages/react-workers/package.json +++ b/packages/react-workers/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-workers", - "version": "2.4.2", + "version": "2.5.0", "description": "CARTO for React - Workers", "author": "CARTO Dev Team", "keywords": [ @@ -66,7 +66,7 @@ }, "dependencies": { "@babel/runtime": "^7.13.9", - "@carto/react-core": "^2.4.2", + "@carto/react-core": "^2.5.0", "@turf/bbox-polygon": "^6.3.0", "@turf/boolean-intersects": "^6.3.0", "@turf/boolean-within": "^6.3.0", From 3e0183a9dd4d6426427094a0f081897e08fcbd04 Mon Sep 17 00:00:00 2001 From: padawannn Date: Wed, 3 Apr 2024 12:11:09 +0200 Subject: [PATCH 3/5] fix peer dependencies --- 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 0d3196d94..5676d1ad2 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -68,9 +68,9 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^2.4.2", - "@carto/react-redux": "^2.4.2", - "@carto/react-workers": "^2.4.2", + "@carto/react-core": "^2.5.0", + "@carto/react-redux": "^2.5.0", + "@carto/react-workers": "^2.5.0", "@deck.gl/carto": "^8.9.18", "@deck.gl/core": "^8.9.18", "@deck.gl/extensions": "^8.9.18", diff --git a/packages/react-auth/package.json b/packages/react-auth/package.json index 8081f0d33..b36f77dd0 100644 --- a/packages/react-auth/package.json +++ b/packages/react-auth/package.json @@ -68,7 +68,7 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^2.4.2", + "@carto/react-core": "^2.5.0", "react": "17.x || 18.x", "react-dom": "17.x || 18.x" } diff --git a/packages/react-basemaps/package.json b/packages/react-basemaps/package.json index ca3deaaf9..7d004708b 100644 --- a/packages/react-basemaps/package.json +++ b/packages/react-basemaps/package.json @@ -68,7 +68,7 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^2.4.2", + "@carto/react-core": "^2.5.0", "@deck.gl/google-maps": "^8.9.18", "react": "17.x || 18.x", "react-dom": "17.x || 18.x" diff --git a/packages/react-redux/package.json b/packages/react-redux/package.json index fae23cbe5..2bc9e3527 100644 --- a/packages/react-redux/package.json +++ b/packages/react-redux/package.json @@ -67,8 +67,8 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^2.4.2", - "@carto/react-workers": "^2.4.2", + "@carto/react-core": "^2.5.0", + "@carto/react-workers": "^2.5.0", "@deck.gl/carto": "^8.9.18", "@deck.gl/core": "^8.9.18", "@reduxjs/toolkit": "^1.5.0" diff --git a/packages/react-ui/package.json b/packages/react-ui/package.json index aaf124104..0287b213c 100644 --- a/packages/react-ui/package.json +++ b/packages/react-ui/package.json @@ -82,7 +82,7 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-core": "^2.4.2", + "@carto/react-core": "^2.5.0", "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@formatjs/intl-localematcher": "^0.4.0", diff --git a/packages/react-widgets/package.json b/packages/react-widgets/package.json index f3c04a699..8ed9b45f5 100644 --- a/packages/react-widgets/package.json +++ b/packages/react-widgets/package.json @@ -69,11 +69,11 @@ "@babel/runtime": "^7.13.9" }, "peerDependencies": { - "@carto/react-api": "^2.4.2", - "@carto/react-core": "^2.4.2", - "@carto/react-redux": "^2.4.2", - "@carto/react-ui": "^2.4.2", - "@carto/react-workers": "^2.4.2", + "@carto/react-api": "^2.5.0", + "@carto/react-core": "^2.5.0", + "@carto/react-redux": "^2.5.0", + "@carto/react-ui": "^2.5.0", + "@carto/react-workers": "^2.5.0", "@deck.gl/core": "^8.9.18", "@deck.gl/layers": "^8.9.18", "@emotion/react": "^11.10.6", From 1d867454352278abd4bcf0dcf7ae8612337b8897 Mon Sep 17 00:00:00 2001 From: padawannn Date: Wed, 3 Apr 2024 12:15:37 +0200 Subject: [PATCH 4/5] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 275a4db70..d9e3a589c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## 2.5 +### 2.5.1 (2024-04-03) + +- Fix peer dependencies [#859](https://github.com/CartoDB/carto-react/pull/859) + ### 2.5.0 (2024-04-03) - New Legend Widget [#837](https://github.com/CartoDB/carto-react/pull/837) From aa4626fa01ea04d7f0703ab9285d3ae78a963977 Mon Sep 17 00:00:00 2001 From: padawannn Date: Wed, 3 Apr 2024 12:18:43 +0200 Subject: [PATCH 5/5] v2.5.1 --- lerna.json | 2 +- packages/react-api/package.json | 2 +- packages/react-auth/package.json | 2 +- packages/react-basemaps/package.json | 2 +- packages/react-core/package.json | 2 +- packages/react-redux/package.json | 2 +- packages/react-ui/package.json | 2 +- packages/react-widgets/package.json | 2 +- packages/react-workers/package.json | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lerna.json b/lerna.json index b4a76a687..1e4e5be1f 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.5.0" + "version": "2.5.1" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 5676d1ad2..376c5e1e0 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-api", - "version": "2.5.0", + "version": "2.5.1", "description": "CARTO for React - Api", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-auth/package.json b/packages/react-auth/package.json index b36f77dd0..114080a71 100644 --- a/packages/react-auth/package.json +++ b/packages/react-auth/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-auth", - "version": "2.5.0", + "version": "2.5.1", "description": "CARTO for React - Auth", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-basemaps/package.json b/packages/react-basemaps/package.json index 7d004708b..e96eb137e 100644 --- a/packages/react-basemaps/package.json +++ b/packages/react-basemaps/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-basemaps", - "version": "2.5.0", + "version": "2.5.1", "description": "CARTO for React - Basemaps", "keywords": [ "carto", diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 5d3699c8b..c2144f517 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-core", - "version": "2.5.0", + "version": "2.5.1", "description": "CARTO for React - Core", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-redux/package.json b/packages/react-redux/package.json index 2bc9e3527..65eef63af 100644 --- a/packages/react-redux/package.json +++ b/packages/react-redux/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-redux", - "version": "2.5.0", + "version": "2.5.1", "description": "CARTO for React - Redux", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-ui/package.json b/packages/react-ui/package.json index 0287b213c..775a1867a 100644 --- a/packages/react-ui/package.json +++ b/packages/react-ui/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-ui", - "version": "2.5.0", + "version": "2.5.1", "description": "CARTO for React - UI", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-widgets/package.json b/packages/react-widgets/package.json index 8ed9b45f5..3dfc2cf6b 100644 --- a/packages/react-widgets/package.json +++ b/packages/react-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-widgets", - "version": "2.5.0", + "version": "2.5.1", "description": "CARTO for React - Widgets", "author": "CARTO Dev Team", "keywords": [ diff --git a/packages/react-workers/package.json b/packages/react-workers/package.json index fb66bcf6a..0f5dc5387 100644 --- a/packages/react-workers/package.json +++ b/packages/react-workers/package.json @@ -1,6 +1,6 @@ { "name": "@carto/react-workers", - "version": "2.5.0", + "version": "2.5.1", "description": "CARTO for React - Workers", "author": "CARTO Dev Team", "keywords": [ @@ -66,7 +66,7 @@ }, "dependencies": { "@babel/runtime": "^7.13.9", - "@carto/react-core": "^2.5.0", + "@carto/react-core": "^2.5.1", "@turf/bbox-polygon": "^6.3.0", "@turf/boolean-intersects": "^6.3.0", "@turf/boolean-within": "^6.3.0",