Skip to content

Commit

Permalink
Add namespace as optional param (#750)
Browse files Browse the repository at this point in the history
  • Loading branch information
Josmorsot authored Jul 26, 2023
1 parent 40fa0a5 commit 6da943f
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 23 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Not released

- Add namespace as optional param in OAuthCarto3 type [#750](https://github.com/CartoDB/carto-react/pull/750)
- Add onClick event handler to GoogleMap component [#747](https://github.com/CartoDB/carto-react/pull/747)

## 2.2
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "2.2.1"
"version": "2.2.2-cra-sso-support.3"
}
8 changes: 4 additions & 4 deletions packages/react-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/react-api",
"version": "2.2.1",
"version": "2.2.2-cra-sso-support.3",
"description": "CARTO for React - Api",
"author": "CARTO Dev Team",
"keywords": [
Expand Down Expand Up @@ -64,9 +64,9 @@
"@babel/runtime": "^7.13.9"
},
"peerDependencies": {
"@carto/react-core": "^2.2.1",
"@carto/react-redux": "^2.2.1",
"@carto/react-workers": "^2.2.1",
"@carto/react-core": "2.2.2-cra-sso-support.3",
"@carto/react-redux": "2.2.2-cra-sso-support.3",
"@carto/react-workers": "2.2.2-cra-sso-support.3",
"@deck.gl/carto": "^8.9.18",
"@deck.gl/core": "^8.9.18",
"@deck.gl/extensions": "^8.9.18",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/react-auth",
"version": "2.2.1",
"version": "2.2.2-cra-sso-support.3",
"description": "CARTO for React - Auth",
"author": "CARTO Dev Team",
"keywords": [
Expand Down Expand Up @@ -64,7 +64,7 @@
"@babel/runtime": "^7.13.9"
},
"peerDependencies": {
"@carto/react-core": "^2.2.1",
"@carto/react-core": "2.2.2-cra-sso-support.3",
"react": "17.x || 18.x",
"react-dom": "17.x || 18.x"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/react-basemaps/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/react-basemaps",
"version": "2.2.1",
"version": "2.2.2-cra-sso-support.3",
"description": "CARTO for React - Basemaps",
"keywords": [
"carto",
Expand Down Expand Up @@ -64,7 +64,7 @@
"@babel/runtime": "^7.13.9"
},
"peerDependencies": {
"@carto/react-core": "^2.2.1",
"@carto/react-core": "2.2.2-cra-sso-support.3",
"@deck.gl/google-maps": "^8.9.18",
"react": "17.x || 18.x",
"react-dom": "17.x || 18.x"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/react-core",
"version": "2.2.1",
"version": "2.2.2-cra-sso-support.3",
"description": "CARTO for React - Core",
"author": "CARTO Dev Team",
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions packages/react-redux/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/react-redux",
"version": "2.2.1",
"version": "2.2.2-cra-sso-support.3",
"description": "CARTO for React - Redux",
"author": "CARTO Dev Team",
"keywords": [
Expand Down Expand Up @@ -63,8 +63,8 @@
"@babel/runtime": "^7.13.9"
},
"peerDependencies": {
"@carto/react-core": "^2.2.1",
"@carto/react-workers": "^2.2.1",
"@carto/react-core": "2.2.2-cra-sso-support.3",
"@carto/react-workers": "2.2.2-cra-sso-support.3",
"@deck.gl/carto": "^8.9.18",
"@deck.gl/core": "^8.9.18",
"@reduxjs/toolkit": "^1.5.0"
Expand Down
2 changes: 2 additions & 0 deletions packages/react-redux/src/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export type ViewState = {
}

type InitialCarto2State = {
accountsUrl?: string,
viewState: ViewState,
basemap: CartoBasemapsNames | GMapsBasemaps,
credentials: Credentials,
Expand All @@ -24,6 +25,7 @@ type InitialCarto2State = {
}

type OauthCarto3 = {
namespace?: string,
domain: string,
clientId: string,
organizationId: string,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/react-ui",
"version": "2.2.1",
"version": "2.2.2-cra-sso-support.3",
"description": "CARTO for React - UI",
"author": "CARTO Dev Team",
"keywords": [
Expand Down Expand Up @@ -78,7 +78,7 @@
"@babel/runtime": "^7.13.9"
},
"peerDependencies": {
"@carto/react-core": "^2.2.1",
"@carto/react-core": "2.2.2-cra-sso-support.3",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@mui/icons-material": "^5.11.16",
Expand Down
12 changes: 6 additions & 6 deletions packages/react-widgets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/react-widgets",
"version": "2.2.1",
"version": "2.2.2-cra-sso-support.3",
"description": "CARTO for React - Widgets",
"author": "CARTO Dev Team",
"keywords": [
Expand Down Expand Up @@ -65,11 +65,11 @@
"@babel/runtime": "^7.13.9"
},
"peerDependencies": {
"@carto/react-api": "^2.2.1",
"@carto/react-core": "^2.2.1",
"@carto/react-redux": "^2.2.1",
"@carto/react-ui": "^2.2.1",
"@carto/react-workers": "^2.2.1",
"@carto/react-api": "2.2.2-cra-sso-support.3",
"@carto/react-core": "2.2.2-cra-sso-support.3",
"@carto/react-redux": "2.2.2-cra-sso-support.3",
"@carto/react-ui": "2.2.2-cra-sso-support.3",
"@carto/react-workers": "2.2.2-cra-sso-support.3",
"@deck.gl/core": "^8.9.18",
"@deck.gl/layers": "^8.9.18",
"@emotion/react": "^11.10.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-workers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@carto/react-workers",
"version": "2.2.1",
"version": "2.2.2-cra-sso-support.3",
"description": "CARTO for React - Workers",
"author": "CARTO Dev Team",
"keywords": [
Expand Down Expand Up @@ -62,7 +62,7 @@
},
"dependencies": {
"@babel/runtime": "^7.13.9",
"@carto/react-core": "^2.2.1",
"@carto/react-core": "^2.2.2-cra-sso-support.3",
"@turf/bbox-polygon": "^6.3.0",
"@turf/boolean-intersects": "^6.3.0",
"@turf/boolean-within": "^6.3.0",
Expand Down

0 comments on commit 6da943f

Please sign in to comment.