From c31a733d21432f521e3b9bb4fc842ebb3587c3c9 Mon Sep 17 00:00:00 2001 From: Lisa Oppermann Date: Wed, 10 Nov 2021 16:54:32 +0100 Subject: [PATCH 1/2] ci: two scripts for linting with and without fix --- .github/pull_request_template.md | 4 ++-- .github/workflows/on-push.yml | 6 +++--- package.json | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index afc5ffd07..a6a125d53 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -18,8 +18,8 @@ Added `your feature` that allows ... - [ ] I have tested this on a device/simulator for each compatible OS -- [ ] I formatted JS and TS files with `yarn lint` -- [ ] I updated the documentation `yarn generate` +- [ ] I formatted JS and TS files with running `yarn lint:fix` in the root folder +- [ ] I updated the documentation with running `yarn generate` in the root folder - [ ] I mentioned this change in `CHANGELOG.md` - [ ] I updated the typings files (`index.d.ts`) - [ ] I added/ updated a sample (`/example`) diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index 22175983f..52975e118 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -22,13 +22,13 @@ jobs: run: yarn install --network-timeout 1000000 - name: Lint - run: yarn run lint + run: yarn lint - name: Test - run: yarn run unittest + run: yarn unittest - name: Generate - run: yarn run generate + run: yarn generate outputs: NVMRC: ${{ steps.nvm.outputs.NVMRC }} diff --git a/package.json b/package.json index 0aef9b410..d21212842 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ "test": "npm run lint && npm run unittest", "unittest": "jest", "unittest:single": "jest --testNamePattern", - "lint": "eslint . --fix", + "lint": "eslint .", + "lint:fix": "eslint . --fix", "prepare": "yarn build:plugin", "test:plugin": "expo-module test plugin", "build:plugin": "tsc --build plugin", From 3c274739fb2157699ed40ce1167f001629ea88a2 Mon Sep 17 00:00:00 2001 From: Lisa Oppermann Date: Wed, 10 Nov 2021 17:07:57 +0100 Subject: [PATCH 2/2] chore: update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c54cc57bf..df116fda3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Please add unreleased changes in the following style: PR Title ([#123](link to my pr)) +ci: two scripts for linting with and without fix ([#1630](https://github.com/react-native-mapbox-gl/maps/pull/1630)) Update MapLibre to 5.12.1 on iOS ([#1596](https://github.com/react-native-mapbox-gl/maps/pull/1596)) Update ShapeSource methods to make it usable with any cluster ( Use cluster itself instead of cluster_id as first argument for getClusterExpansionZoom/getClusterLeaves/getClusterChildren methods. Version < 9 methods still supports passing cluster_id as a first argument but a deprecation warning will be shown. ) ([#1499](https://github.com/react-native-mapbox-gl/maps/pull/1499)) fix(Camera) persist zoom when changing from `bounds` to `centerCoordinate`, fix zero padding not causing map to update, create unified example showcasing bounds/centerCoordinate/zoom/padding