diff --git a/CHANGELOG.md b/CHANGELOG.md index ddeef7d2e..98ae4de4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/lerna.json b/lerna.json index ccfa024df..eba8ca71f 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.2.1" + "version": "2.2.2-cra-sso-support.3" } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 7863a06a7..04e624454 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -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": [ @@ -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", diff --git a/packages/react-auth/package.json b/packages/react-auth/package.json index 31378e1c0..a2424f7eb 100644 --- a/packages/react-auth/package.json +++ b/packages/react-auth/package.json @@ -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": [ @@ -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" } diff --git a/packages/react-basemaps/package.json b/packages/react-basemaps/package.json index c9c17b003..f422cf4b2 100644 --- a/packages/react-basemaps/package.json +++ b/packages/react-basemaps/package.json @@ -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", @@ -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" diff --git a/packages/react-core/package.json b/packages/react-core/package.json index 0d26b255b..bd191891a 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -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": [ diff --git a/packages/react-redux/package.json b/packages/react-redux/package.json index 7b1300c38..2baba6018 100644 --- a/packages/react-redux/package.json +++ b/packages/react-redux/package.json @@ -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": [ @@ -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" diff --git a/packages/react-redux/src/types.d.ts b/packages/react-redux/src/types.d.ts index b5bfccc26..439609dce 100644 --- a/packages/react-redux/src/types.d.ts +++ b/packages/react-redux/src/types.d.ts @@ -16,6 +16,7 @@ export type ViewState = { } type InitialCarto2State = { + accountsUrl?: string, viewState: ViewState, basemap: CartoBasemapsNames | GMapsBasemaps, credentials: Credentials, @@ -24,6 +25,7 @@ type InitialCarto2State = { } type OauthCarto3 = { + namespace?: string, domain: string, clientId: string, organizationId: string, diff --git a/packages/react-ui/package.json b/packages/react-ui/package.json index eb6b8fe8e..2443f1635 100644 --- a/packages/react-ui/package.json +++ b/packages/react-ui/package.json @@ -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": [ @@ -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", diff --git a/packages/react-widgets/package.json b/packages/react-widgets/package.json index cace81e97..b0f3aed0b 100644 --- a/packages/react-widgets/package.json +++ b/packages/react-widgets/package.json @@ -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": [ @@ -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", diff --git a/packages/react-workers/package.json b/packages/react-workers/package.json index 386dd34d5..e999b8b98 100644 --- a/packages/react-workers/package.json +++ b/packages/react-workers/package.json @@ -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": [ @@ -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",