From da3527979a150eb258dad9342dc43c7728b09972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Velarde?= Date: Tue, 23 Mar 2021 00:52:59 +0100 Subject: [PATCH] v1.0.0 rc.3 * chore: update @carto/react-* packages to rc.3 * doc: improve developers info for release * chore: simplify ci * chore: remove cypress dep from template clients --- .github/workflows/ci.yml | 6 +++++- CHANGELOG.md | 4 +++- DEVELOPERS.md | 15 +++++++++------ template-sample-app/template.json | 18 ++++++++---------- template-sample-app/template/package.dev.json | 16 ++++++++-------- template-skeleton/template.json | 18 ++++++++---------- template-skeleton/template/package.dev.json | 16 ++++++++-------- 7 files changed, 49 insertions(+), 44 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88793470..81b9a789 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,11 @@ name: CI -on: [push] +on: + push: + branches: + - master + pull_request: jobs: test-sample-app: diff --git a/CHANGELOG.md b/CHANGELOG.md index 14cc2fbe..af0b48dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # CHANGELOG -## Unreleased +## Not released + +## 1.0.0-rc.3 (2021-03-23) - Fix general React warning on SharedArrayBuffer [#218](https://github.com/CartoDB/carto-react-template/pull/218) - Integrate carto-react lib with workers support [#219](https://github.com/CartoDB/carto-react-template/pull/219) diff --git a/DEVELOPERS.md b/DEVELOPERS.md index 70eb3d84..0cb4739d 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -30,18 +30,21 @@ npx create-react-app test-template --template file:./carto-react-template/templa Follow these steps: -1. Open a new branch for the release, eg. release-v1.0.0-rc.2 +1. Open a new branch for the release from master, eg. `git checkout -b release-v1.0.0-rc.3` 2. For each template: + - remove the link to @carto/react-* packages with `yarn unlink-carto-react` + - ensure latest references with `yarn`. Delete previously node_modules if you feel a bit unsure :) - launch the app, with `yarn start` - test cypress locally, with `yarn cy:run` - manual review from browser (see errors & warnings) - - from template root folder `yarn clean` + - from template root folder (eg. template-skeleton), run `yarn clean` + - copy the hygen templates, so you can test them inside the client project - use create-react-app to build a project - test cra project result as a user, including hygen generators -3. Bump manually package version in package.json (root level --> package.json & inside template --> package.dev.json) -4. Update changelog: rename 'Unrelased' to new version, eg 1.0.0-rc.2 (2021-03-12) -5. Push branch to remote to run CI (all test green) -6. Execute the release command, for each template, from its **base folder**: `yarn release`. +3. Bump manually package version in package.json (root level --> package.json & inside template --> package.dev.json), checking @carto/react-* package versions are also correct. +4. Update changelog: rename 'Unrelased' to new version, eg 1.0.0-rc.3 (2021-03-23) +5. Push branch to remote to run CI (all test green) with `git push` +6. Execute the release command, for each template, from its **base folder** (eg. template-sample-app): `yarn release`. ```bash cd template-sample-app diff --git a/template-sample-app/template.json b/template-sample-app/template.json index 28c9f30a..eb75b43d 100644 --- a/template-sample-app/template.json +++ b/template-sample-app/template.json @@ -1,14 +1,14 @@ { "package": { "dependencies": { - "@carto/react-api": "1.0.0-rc.2", - "@carto/react-auth": "1.0.0-rc.2", - "@carto/react-basemaps": "1.0.0-rc.2", - "@carto/react-core": "1.0.0-rc.2", - "@carto/react-redux": "1.0.0-rc.2", - "@carto/react-ui": "1.0.0-rc.2", - "@carto/react-widgets": "1.0.0-rc.2", - "@carto/react-workers": "1.0.0-rc.2", + "@carto/react-api": "1.0.0-rc.3", + "@carto/react-auth": "1.0.0-rc.3", + "@carto/react-basemaps": "1.0.0-rc.3", + "@carto/react-core": "1.0.0-rc.3", + "@carto/react-redux": "1.0.0-rc.3", + "@carto/react-ui": "1.0.0-rc.3", + "@carto/react-widgets": "1.0.0-rc.3", + "@carto/react-workers": "1.0.0-rc.3", "@formatjs/intl-getcanonicallocales": "^1.5.3", "@formatjs/intl-locale": "^2.4.14", "@formatjs/intl-numberformat": "^6.1.4", @@ -17,13 +17,11 @@ "@material-ui/icons": "^4.11.2", "@material-ui/lab": "4.0.0-alpha.57", "@reduxjs/toolkit": "^1.5.0", - "@testing-library/cypress": "^7.0.3", "@testing-library/jest-dom": "^5.11.9", "@testing-library/react": "^11.2.3", "@testing-library/user-event": "^12.6.2", "@turf/bbox-polygon": "^6.3.0", "@turf/boolean-intersects": "^6.3.0", - "cypress": "^6.3.0", "deck.gl": "8.4.10", "echarts": "^4.9.0", "echarts-for-react": "^2.0.16", diff --git a/template-sample-app/template/package.dev.json b/template-sample-app/template/package.dev.json index 3532aa8b..dfa3ee17 100644 --- a/template-sample-app/template/package.dev.json +++ b/template-sample-app/template/package.dev.json @@ -3,14 +3,14 @@ "version": "1.0.0-rc.3", "private": true, "dependencies": { - "@carto/react-api": "1.0.0-rc.2", - "@carto/react-auth": "1.0.0-rc.2", - "@carto/react-basemaps": "1.0.0-rc.2", - "@carto/react-core": "1.0.0-rc.2", - "@carto/react-redux": "1.0.0-rc.2", - "@carto/react-ui": "1.0.0-rc.2", - "@carto/react-widgets": "1.0.0-rc.2", - "@carto/react-workers": "1.0.0-rc.2", + "@carto/react-api": "1.0.0-rc.3", + "@carto/react-auth": "1.0.0-rc.3", + "@carto/react-basemaps": "1.0.0-rc.3", + "@carto/react-core": "1.0.0-rc.3", + "@carto/react-redux": "1.0.0-rc.3", + "@carto/react-ui": "1.0.0-rc.3", + "@carto/react-widgets": "1.0.0-rc.3", + "@carto/react-workers": "1.0.0-rc.3", "@formatjs/intl-getcanonicallocales": "^1.5.3", "@formatjs/intl-locale": "^2.4.14", "@formatjs/intl-numberformat": "^6.1.4", diff --git a/template-skeleton/template.json b/template-skeleton/template.json index 28c9f30a..eb75b43d 100644 --- a/template-skeleton/template.json +++ b/template-skeleton/template.json @@ -1,14 +1,14 @@ { "package": { "dependencies": { - "@carto/react-api": "1.0.0-rc.2", - "@carto/react-auth": "1.0.0-rc.2", - "@carto/react-basemaps": "1.0.0-rc.2", - "@carto/react-core": "1.0.0-rc.2", - "@carto/react-redux": "1.0.0-rc.2", - "@carto/react-ui": "1.0.0-rc.2", - "@carto/react-widgets": "1.0.0-rc.2", - "@carto/react-workers": "1.0.0-rc.2", + "@carto/react-api": "1.0.0-rc.3", + "@carto/react-auth": "1.0.0-rc.3", + "@carto/react-basemaps": "1.0.0-rc.3", + "@carto/react-core": "1.0.0-rc.3", + "@carto/react-redux": "1.0.0-rc.3", + "@carto/react-ui": "1.0.0-rc.3", + "@carto/react-widgets": "1.0.0-rc.3", + "@carto/react-workers": "1.0.0-rc.3", "@formatjs/intl-getcanonicallocales": "^1.5.3", "@formatjs/intl-locale": "^2.4.14", "@formatjs/intl-numberformat": "^6.1.4", @@ -17,13 +17,11 @@ "@material-ui/icons": "^4.11.2", "@material-ui/lab": "4.0.0-alpha.57", "@reduxjs/toolkit": "^1.5.0", - "@testing-library/cypress": "^7.0.3", "@testing-library/jest-dom": "^5.11.9", "@testing-library/react": "^11.2.3", "@testing-library/user-event": "^12.6.2", "@turf/bbox-polygon": "^6.3.0", "@turf/boolean-intersects": "^6.3.0", - "cypress": "^6.3.0", "deck.gl": "8.4.10", "echarts": "^4.9.0", "echarts-for-react": "^2.0.16", diff --git a/template-skeleton/template/package.dev.json b/template-skeleton/template/package.dev.json index 3532aa8b..dfa3ee17 100644 --- a/template-skeleton/template/package.dev.json +++ b/template-skeleton/template/package.dev.json @@ -3,14 +3,14 @@ "version": "1.0.0-rc.3", "private": true, "dependencies": { - "@carto/react-api": "1.0.0-rc.2", - "@carto/react-auth": "1.0.0-rc.2", - "@carto/react-basemaps": "1.0.0-rc.2", - "@carto/react-core": "1.0.0-rc.2", - "@carto/react-redux": "1.0.0-rc.2", - "@carto/react-ui": "1.0.0-rc.2", - "@carto/react-widgets": "1.0.0-rc.2", - "@carto/react-workers": "1.0.0-rc.2", + "@carto/react-api": "1.0.0-rc.3", + "@carto/react-auth": "1.0.0-rc.3", + "@carto/react-basemaps": "1.0.0-rc.3", + "@carto/react-core": "1.0.0-rc.3", + "@carto/react-redux": "1.0.0-rc.3", + "@carto/react-ui": "1.0.0-rc.3", + "@carto/react-widgets": "1.0.0-rc.3", + "@carto/react-workers": "1.0.0-rc.3", "@formatjs/intl-getcanonicallocales": "^1.5.3", "@formatjs/intl-locale": "^2.4.14", "@formatjs/intl-numberformat": "^6.1.4",