Skip to content
This repository was archived by the owner on Jan 5, 2026. It is now read-only.

Commit 9bf5782

Browse files
VictorVelardeVictorVelarde
authored
Adapt to carto-lib with workers (#219)
* chore: adapt to carto-lib with workers (rc.2) * chore: remove UserMenuLogin module from skeleton app * chore: remove unused property from KpiLayer * chore: remove pending todos
1 parent f95b40c commit 9bf5782

File tree

12 files changed

+45
-95
lines changed

12 files changed

+45
-95
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# CHANGELOG
22

33
## Unreleased
4+
- Fix general React warning on SharedArrayBuffer [#218](https://github.com/CartoDB/carto-react-template/pull/218)
5+
- Integrate carto-react lib with workers support [#219](https://github.com/CartoDB/carto-react-template/pull/219)
46

57
## 1.0.0-rc.2 (2021-03-12)
68
- Add improved htmlForFeature in skeleton [#215](https://github.com/CartoDB/carto-react-template/pull/215)
79
- Fix immutable/serializable checks for redux middleware in skeleton [#216](https://github.com/CartoDB/carto-react-template/pull/216)
8-
- Fix general React warning on SharedArrayBuffer [#218](https://github.com/CartoDB/carto-react-template/pull/218)
910

1011
## 1.0.0-rc.1 (2021-03-11)
1112
- Add cypress e2e tests in CI [#194](https://github.com/CartoDB/carto-react-template/pull/194)

‎template-sample-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@carto/cra-template-sample-app",
3-
"version": "1.0.0-rc.2",
3+
"version": "1.0.0-rc.3",
44
"keywords": [
55
"react",
66
"create-react-app",

‎template-sample-app/template.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"package": {
33
"dependencies": {
4-
"@carto/react-api": "1.0.0-rc.1",
5-
"@carto/react-auth": "1.0.0-rc.1",
6-
"@carto/react-basemaps": "1.0.0-rc.1",
7-
"@carto/react-core": "1.0.0-rc.1",
8-
"@carto/react-redux": "1.0.0-rc.1",
9-
"@carto/react-ui": "1.0.0-rc.1",
10-
"@carto/react-widgets": "1.0.0-rc.1",
4+
"@carto/react-api": "1.0.0-rc.2",
5+
"@carto/react-auth": "1.0.0-rc.2",
6+
"@carto/react-basemaps": "1.0.0-rc.2",
7+
"@carto/react-core": "1.0.0-rc.2",
8+
"@carto/react-redux": "1.0.0-rc.2",
9+
"@carto/react-ui": "1.0.0-rc.2",
10+
"@carto/react-widgets": "1.0.0-rc.2",
11+
"@carto/react-workers": "1.0.0-rc.2",
1112
"@formatjs/intl-getcanonicallocales": "^1.5.3",
1213
"@formatjs/intl-locale": "^2.4.14",
1314
"@formatjs/intl-numberformat": "^6.1.4",

‎template-sample-app/template/cypress/integration/stores_page_spec.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,6 @@ describe('Stores Page', () => {
5656
});
5757

5858
describe('Detail', () => {
59-
// TODO: temporary, while fixing issue on page
60-
beforeEach(() => {
61-
cy.on('uncaught:exception', (err, runnable) => {
62-
// temporary ignore console.errors
63-
return false;
64-
});
65-
});
66-
6759
it('successfully loads one store', () => {
6860
cy.visit(STORE_DETAIL_PAGE);
6961
});

‎template-sample-app/template/package.dev.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "carto-for-react",
3-
"version": "1.0.0-rc.2",
3+
"version": "1.0.0-rc.3",
44
"private": true,
55
"dependencies": {
6-
"@carto/react-api": "1.0.0-rc.1",
7-
"@carto/react-auth": "1.0.0-rc.1",
8-
"@carto/react-basemaps": "1.0.0-rc.1",
9-
"@carto/react-core": "1.0.0-rc.1",
10-
"@carto/react-redux": "1.0.0-rc.1",
11-
"@carto/react-ui": "1.0.0-rc.1",
12-
"@carto/react-widgets": "1.0.0-rc.1",
6+
"@carto/react-api": "1.0.0-rc.2",
7+
"@carto/react-auth": "1.0.0-rc.2",
8+
"@carto/react-basemaps": "1.0.0-rc.2",
9+
"@carto/react-core": "1.0.0-rc.2",
10+
"@carto/react-redux": "1.0.0-rc.2",
11+
"@carto/react-ui": "1.0.0-rc.2",
12+
"@carto/react-widgets": "1.0.0-rc.2",
13+
"@carto/react-workers": "1.0.0-rc.2",
1314
"@formatjs/intl-getcanonicallocales": "^1.5.3",
1415
"@formatjs/intl-locale": "^2.4.14",
1516
"@formatjs/intl-numberformat": "^6.1.4",
@@ -57,8 +58,8 @@
5758
"cy:run": "npx cypress run",
5859
"cy:ci": "START_SERVER_AND_TEST_INSECURE=1 start-server-and-test start https-get://localhost:3000 cy:run",
5960
"eject": "react-scripts eject",
60-
"link-carto-react": "yarn link @carto/react-api @carto/react-auth @carto/react-basemaps @carto/react-core @carto/react-redux @carto/react-ui @carto/react-widgets",
61-
"unlink-carto-react": "yarn unlink @carto/react-api @carto/react-auth @carto/react-basemaps @carto/react-core @carto/react-redux @carto/react-ui @carto/react-widgets",
61+
"link-carto-react": "yarn link @carto/react-api @carto/react-auth @carto/react-basemaps @carto/react-core @carto/react-redux @carto/react-ui @carto/react-widgets @carto/react-workers",
62+
"unlink-carto-react": "yarn unlink @carto/react-api @carto/react-auth @carto/react-basemaps @carto/react-core @carto/react-redux @carto/react-ui @carto/react-widgets @carto/react-workers",
6263
"lint": "eslint './src/**/*.{js,jsx}'",
6364
"lint:fix": "eslint './src/**/*.{js,jsx}' --fix",
6465
"format": "prettier --write \"**/*.+(js|jsx|json|css|md)\" --ignore-path .gitignore",

‎template-sample-app/template/src/components/common/Map.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const useStyles = makeStyles((theme) => ({
3131
padding: theme.spacing(1, 1.5),
3232
borderRadius: theme.shape.borderRadius,
3333
backgroundColor: theme.palette.other.tooltip,
34-
color: 'rgba(255, 255, 255, 0.75)', // TODO: Add emphasis colors to theme
34+
color: 'rgba(255, 255, 255, 0.75)',
3535
transform: `translate(-50%, calc(-100% - ${theme.spacing(2.5)}px))`,
3636

3737
'& .arrow': {

‎template-sample-app/template/src/components/views/Kpi.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ function Kpi() {
4141
dispatch(
4242
addLayer({
4343
id: KPI_LAYER_ID,
44-
source: kpiSource.id,
45-
selectedStore: null,
44+
source: kpiSource.id
4645
})
4746
);
4847

‎template-skeleton/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@carto/cra-template",
3-
"version": "1.0.0-rc.2",
3+
"version": "1.0.0-rc.3",
44
"keywords": [
55
"react",
66
"create-react-app",

‎template-skeleton/template.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"package": {
33
"dependencies": {
4-
"@carto/react-api": "1.0.0-rc.1",
5-
"@carto/react-auth": "1.0.0-rc.1",
6-
"@carto/react-basemaps": "1.0.0-rc.1",
7-
"@carto/react-core": "1.0.0-rc.1",
8-
"@carto/react-redux": "1.0.0-rc.1",
9-
"@carto/react-ui": "1.0.0-rc.1",
10-
"@carto/react-widgets": "1.0.0-rc.1",
4+
"@carto/react-api": "1.0.0-rc.2",
5+
"@carto/react-auth": "1.0.0-rc.2",
6+
"@carto/react-basemaps": "1.0.0-rc.2",
7+
"@carto/react-core": "1.0.0-rc.2",
8+
"@carto/react-redux": "1.0.0-rc.2",
9+
"@carto/react-ui": "1.0.0-rc.2",
10+
"@carto/react-widgets": "1.0.0-rc.2",
11+
"@carto/react-workers": "1.0.0-rc.2",
1112
"@formatjs/intl-getcanonicallocales": "^1.5.3",
1213
"@formatjs/intl-locale": "^2.4.14",
1314
"@formatjs/intl-numberformat": "^6.1.4",

‎template-skeleton/template/package.dev.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "carto-for-react",
3-
"version": "1.0.0-rc.2",
3+
"version": "1.0.0-rc.3",
44
"private": true,
55
"dependencies": {
6-
"@carto/react-api": "1.0.0-rc.1",
7-
"@carto/react-auth": "1.0.0-rc.1",
8-
"@carto/react-basemaps": "1.0.0-rc.1",
9-
"@carto/react-core": "1.0.0-rc.1",
10-
"@carto/react-redux": "1.0.0-rc.1",
11-
"@carto/react-ui": "1.0.0-rc.1",
12-
"@carto/react-widgets": "1.0.0-rc.1",
6+
"@carto/react-api": "1.0.0-rc.2",
7+
"@carto/react-auth": "1.0.0-rc.2",
8+
"@carto/react-basemaps": "1.0.0-rc.2",
9+
"@carto/react-core": "1.0.0-rc.2",
10+
"@carto/react-redux": "1.0.0-rc.2",
11+
"@carto/react-ui": "1.0.0-rc.2",
12+
"@carto/react-widgets": "1.0.0-rc.2",
13+
"@carto/react-workers": "1.0.0-rc.2",
1314
"@formatjs/intl-getcanonicallocales": "^1.5.3",
1415
"@formatjs/intl-locale": "^2.4.14",
1516
"@formatjs/intl-numberformat": "^6.1.4",
@@ -57,8 +58,8 @@
5758
"cy:run": "npx cypress run",
5859
"cy:ci": "START_SERVER_AND_TEST_INSECURE=1 start-server-and-test start https-get://localhost:3000 cy:run",
5960
"eject": "react-scripts eject",
60-
"link-carto-react": "yarn link @carto/react-api @carto/react-auth @carto/react-basemaps @carto/react-core @carto/react-redux @carto/react-ui @carto/react-widgets",
61-
"unlink-carto-react": "yarn unlink @carto/react-api @carto/react-auth @carto/react-basemaps @carto/react-core @carto/react-redux @carto/react-ui @carto/react-widgets",
61+
"link-carto-react": "yarn link @carto/react-api @carto/react-auth @carto/react-basemaps @carto/react-core @carto/react-redux @carto/react-ui @carto/react-widgets @carto/react-workers",
62+
"unlink-carto-react": "yarn unlink @carto/react-api @carto/react-auth @carto/react-basemaps @carto/react-core @carto/react-redux @carto/react-ui @carto/react-widgets @carto/react-workers",
6263
"lint": "eslint './src/**/*.{js,jsx}'",
6364
"lint:fix": "eslint './src/**/*.{js,jsx}' --fix",
6465
"format": "prettier --write \"**/*.+(js|jsx|json|css|md)\" --ignore-path .gitignore",

0 commit comments

Comments
 (0)