From 872c101faf4af506b030bfb5eb0f964ffe1f0b11 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 19:05:10 +0100 Subject: [PATCH 01/22] ci: restructure setup --- .../android/action.yml} | 21 ++-- .../ios/action.yml} | 18 +--- .github/actions/setup/action.yml | 32 ++++++ .../{label-actions.yml => label.yml} | 0 .github/workflows/on-push.yml | 84 --------------- .github/workflows/review.yml | 100 ++++++++++++++++++ .nvmrc | 2 +- packages/react-native-app/.nvmrc | 1 - 8 files changed, 143 insertions(+), 115 deletions(-) rename .github/{workflows/android-actions.yml => actions/android/action.yml} (51%) rename .github/{workflows/ios-actions.yml => actions/ios/action.yml} (58%) create mode 100644 .github/actions/setup/action.yml rename .github/workflows/{label-actions.yml => label.yml} (100%) delete mode 100644 .github/workflows/on-push.yml create mode 100644 .github/workflows/review.yml delete mode 100644 packages/react-native-app/.nvmrc diff --git a/.github/workflows/android-actions.yml b/.github/actions/android/action.yml similarity index 51% rename from .github/workflows/android-actions.yml rename to .github/actions/android/action.yml index af049dc27..d9c27b7c6 100644 --- a/.github/workflows/android-actions.yml +++ b/.github/actions/android/action.yml @@ -2,22 +2,21 @@ name: Android Build on: workflow_call: - inputs: - NVMRC: - required: true - type: string jobs: build_example: runs-on: ubuntu-latest + + defaults: + run: + working-directory: ./packages/react-native-app + steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup node ${{ inputs.NVMRC }} - uses: actions/setup-node@v4 - with: - node-version: ${{ inputs.NVMRC }} + - name: Setup + uses: ./.github/actions/setup - name: Setup JDK zulu 17 uses: actions/setup-java@v4 @@ -25,11 +24,5 @@ jobs: distribution: "zulu" java-version: "17" - - name: Enable Corepack - run: corepack enable - - - run: yarn install --immutable --check-cache - working-directory: packages/react-native-app - - run: ./gradlew assemble working-directory: packages/react-native-app/android diff --git a/.github/workflows/ios-actions.yml b/.github/actions/ios/action.yml similarity index 58% rename from .github/workflows/ios-actions.yml rename to .github/actions/ios/action.yml index 93a298bd5..7355d2fdf 100644 --- a/.github/workflows/ios-actions.yml +++ b/.github/actions/ios/action.yml @@ -2,15 +2,11 @@ name: iOS Build & Detox on: workflow_call: - inputs: - NVMRC: - required: true - type: string jobs: build: runs-on: macos-latest - timeout-minutes: 45 # Figure out why this job can be super slow; runner hardware? + timeout-minutes: 30 defaults: run: @@ -20,16 +16,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup node ${{ inputs.NVMRC }} - uses: actions/setup-node@v4 - with: - node-version: ${{ inputs.NVMRC }} - - - name: Enable Corepack - run: corepack enable - - - name: Install Yarn Dependencies - run: yarn install --immutable --check-cache + - name: Setup + uses: ./.github/actions/setup - name: Install Pod Dependencies run: cd ios && pod --version && pod install diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml new file mode 100644 index 000000000..6e9c93da2 --- /dev/null +++ b/.github/actions/setup/action.yml @@ -0,0 +1,32 @@ +name: Setup +description: Setup Node.js and install dependencies + +inputs: + registry-url: + description: Optional registry to set up for auth. + +runs: + using: composite + steps: + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version-file: .nvmrc + registry-url: ${{ inputs.registry-url }} + + - name: Cache dependencies + id: yarn-cache + uses: actions/cache@v4 + with: + path: | + **/node_modules + .yarn/install-state.gz + key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }} + restore-keys: | + ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }} + ${{ runner.os }}-yarn- + + - name: Install dependencies + if: steps.yarn-cache.outputs.cache-hit != 'true' + run: yarn install --immutable + shell: bash diff --git a/.github/workflows/label-actions.yml b/.github/workflows/label.yml similarity index 100% rename from .github/workflows/label-actions.yml rename to .github/workflows/label.yml diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml deleted file mode 100644 index 597d17318..000000000 --- a/.github/workflows/on-push.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: On Push -on: [push, pull_request] - -jobs: - lint_test_generate: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Read .nvmrc - run: echo "NVMRC=$(cat .nvmrc)" >> $GITHUB_OUTPUT - id: nvm - - - name: Setup node ${{ steps.nvm.outputs.NVMRC }} - uses: actions/setup-node@v4 - with: - node-version: ${{ steps.nvm.outputs.NVMRC }} - - - name: Enable Corepack - run: corepack enable - - - name: Install - run: yarn install --immutable --check-cache - - - name: Lint with ESLint - run: yarn lint:eslint - - - name: Lint with TSC - run: yarn lint:tsc - - - name: Run test with Jest - run: yarn test - - - name: Codegen - run: yarn codegen - - - name: Pack (to ensure the plugin builds) - run: yarn pack - - outputs: - NVMRC: ${{ steps.nvm.outputs.NVMRC }} - - call_android_workflow: - needs: lint_test_generate - uses: ./.github/workflows/android-actions.yml - with: - NVMRC: ${{ needs.lint_test_generate.outputs.NVMRC }} - - call_ios_workflow: - needs: lint_test_generate - uses: ./.github/workflows/ios-actions.yml - with: - NVMRC: ${{ needs.lint_test_generate.outputs.NVMRC }} - - publish: - if: startsWith(github.ref, 'refs/tags/') - needs: [lint_test_generate, call_android_workflow, call_ios_workflow] - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup node ${{ steps.nvm.outputs.NVMRC }} - uses: actions/setup-node@v4 - with: - node-version: ${{ needs.lint_test_generate.outputs.NVMRC }} - registry-url: https://registry.npmjs.org/ - - - name: Enable Corepack - run: corepack enable - - - name: Install - run: yarn install --immutable --check-cache - - - name: Setup .yarnrc.yml - run: yarn config set npmAuthToken $NPM_AUTH_TOKEN - env: - NPM_AUTH_TOKEN: ${{ secrets.NPM_ORG_TOKEN }} - - - name: Publish - run: yarn npm publish diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml new file mode 100644 index 000000000..598f6882f --- /dev/null +++ b/.github/workflows/review.yml @@ -0,0 +1,100 @@ +name: Review + +on: + push: + branches: + - main + pull_request: + branches: + - main + merge_group: + types: + - checks_requested + +jobs: + lint: + name: Lint + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + uses: ./.github/actions/setup + + - name: Lint with ESLint + run: yarn lint:eslint + + - name: Lint with TSC + run: yarn lint:tsc + + test: + name: Test + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + uses: ./.github/actions/setup + + - name: Test with Jest + run: yarn test + + codegen: + name: Codegen + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + uses: ./.github/actions/setup + + - name: Codegen + run: yarn codegen + + build: + name: Build + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + uses: ./.github/actions/setup + + - name: Build + run: yarn prepack + + android: + name: Android + needs: [lint, test, codegen, build] + uses: ./.github/actions/android/action.yml + + ios: + name: iOS + needs: [lint, test, codegen, build] + uses: ./.github/actions/ios/action.yml + + publish: + name: Publish + if: startsWith(github.ref, 'refs/tags/') + needs: [lint, test, codegen, build, android, ios] + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup + uses: ./.github/actions/setup + with: + registry-url: https://registry.npmjs.org/ + + - name: Setup .yarnrc.yml + run: yarn config set npmAuthToken $NPM_AUTH_TOKEN + env: + NPM_AUTH_TOKEN: ${{ secrets.NPM_ORG_TOKEN }} + + - name: Publish + run: yarn npm publish diff --git a/.nvmrc b/.nvmrc index e44a38e08..7af24b7dd 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v18.12.1 +22.11.0 diff --git a/packages/react-native-app/.nvmrc b/packages/react-native-app/.nvmrc deleted file mode 100644 index e44a38e08..000000000 --- a/packages/react-native-app/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v18.12.1 From 1d718664fe9f65cd2a907b90f2f2a16f06edf208 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 19:49:45 +0100 Subject: [PATCH 02/22] ci: fix native workflows --- .../android/action.yml => workflows/build-android.yml} | 4 ++-- .../{actions/ios/action.yml => workflows/build-ios.yml} | 4 ++-- .github/workflows/review.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) rename .github/{actions/android/action.yml => workflows/build-android.yml} (90%) rename .github/{actions/ios/action.yml => workflows/build-ios.yml} (91%) diff --git a/.github/actions/android/action.yml b/.github/workflows/build-android.yml similarity index 90% rename from .github/actions/android/action.yml rename to .github/workflows/build-android.yml index d9c27b7c6..d9f521fe6 100644 --- a/.github/actions/android/action.yml +++ b/.github/workflows/build-android.yml @@ -4,7 +4,7 @@ on: workflow_call: jobs: - build_example: + build: runs-on: ubuntu-latest defaults: @@ -18,7 +18,7 @@ jobs: - name: Setup uses: ./.github/actions/setup - - name: Setup JDK zulu 17 + - name: Setup JDK Zulu 17 uses: actions/setup-java@v4 with: distribution: "zulu" diff --git a/.github/actions/ios/action.yml b/.github/workflows/build-ios.yml similarity index 91% rename from .github/actions/ios/action.yml rename to .github/workflows/build-ios.yml index 7355d2fdf..51fd83609 100644 --- a/.github/actions/ios/action.yml +++ b/.github/workflows/build-ios.yml @@ -27,8 +27,8 @@ jobs: brew tap wix/brew brew install applesimutils - - name: Build for detox + - name: Build for Detox run: yarn detox build -c ios.sim.release - - name: Test with detox + - name: Test with Detox run: yarn detox test --debug-synchronization 200 -c ios.sim.release diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 598f6882f..38c4c322b 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -68,14 +68,14 @@ jobs: run: yarn prepack android: - name: Android + name: Build React Native Android needs: [lint, test, codegen, build] - uses: ./.github/actions/android/action.yml + uses: ./.github/workflows/build-android.yml ios: - name: iOS + name: Build React Native iOS & Test with Detox needs: [lint, test, codegen, build] - uses: ./.github/actions/ios/action.yml + uses: ./.github/workflows/build-ios.yml publish: name: Publish From 8dc47b260303ae9fad00bdebe54e237b8462df57 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 19:54:55 +0100 Subject: [PATCH 03/22] ci: add corepack enable to setup --- .github/actions/setup/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 6e9c93da2..dbe6bdce6 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -14,6 +14,10 @@ runs: node-version-file: .nvmrc registry-url: ${{ inputs.registry-url }} + - name: Enable Corepack for yarn v4 + run: corepack enable + shell: bash + - name: Cache dependencies id: yarn-cache uses: actions/cache@v4 From 572f1cda8a13f2c41ce36c0ab6d0a6154a805243 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 20:00:27 +0100 Subject: [PATCH 04/22] ci: align build naming --- .github/workflows/build-android.yml | 3 ++- .github/workflows/build-ios.yml | 2 +- .github/workflows/review.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index d9f521fe6..04f0df18d 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -24,5 +24,6 @@ jobs: distribution: "zulu" java-version: "17" - - run: ./gradlew assemble + - name: Build Android + run: ./gradlew assemble working-directory: packages/react-native-app/android diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 51fd83609..72693dd84 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -27,7 +27,7 @@ jobs: brew tap wix/brew brew install applesimutils - - name: Build for Detox + - name: Build iOS run: yarn detox build -c ios.sim.release - name: Test with Detox diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 38c4c322b..9b17cb1f6 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -64,7 +64,7 @@ jobs: - name: Setup uses: ./.github/actions/setup - - name: Build + - name: Build Library run: yarn prepack android: From 11e576987d575ee1b211316b40b4ad6a902e0806 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 20:03:45 +0100 Subject: [PATCH 05/22] ci: separate linting jobs --- .github/workflows/review.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 9b17cb1f6..2d7d7254b 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -13,7 +13,7 @@ on: jobs: lint: - name: Lint + name: Lint ESLint runs-on: ubuntu-latest steps: - name: Checkout @@ -25,6 +25,16 @@ jobs: - name: Lint with ESLint run: yarn lint:eslint + lint-tsc: + name: Lint TSC + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + uses: ./.github/actions/setup + - name: Lint with TSC run: yarn lint:tsc @@ -54,8 +64,8 @@ jobs: - name: Codegen run: yarn codegen - build: - name: Build + build-library: + name: Build Library runs-on: ubuntu-latest steps: - name: Checkout @@ -67,20 +77,20 @@ jobs: - name: Build Library run: yarn prepack - android: + build-react-native-android: name: Build React Native Android - needs: [lint, test, codegen, build] + needs: [lint, test, codegen, build-library] uses: ./.github/workflows/build-android.yml - ios: + build-react-native-ios: name: Build React Native iOS & Test with Detox - needs: [lint, test, codegen, build] + needs: [lint, test, codegen, build-library] uses: ./.github/workflows/build-ios.yml publish: name: Publish if: startsWith(github.ref, 'refs/tags/') - needs: [lint, test, codegen, build, android, ios] + needs: [lint, test, codegen, build-library, build-react-native-android, build-react-native-ios] runs-on: ubuntu-latest steps: - name: Checkout code From c308d339197251e7ecbc4b4809134bfb8f1e9b9f Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 21:14:09 +0100 Subject: [PATCH 06/22] ci: add expo builds --- .github/workflows/build-expo-android.yml | 23 ++++++++++++++++++ .github/workflows/build-expo-ios.yml | 24 +++++++++++++++++++ ...oid.yml => build-react-native-android.yml} | 3 ++- ...ild-ios.yml => build-react-native-ios.yml} | 3 ++- .github/workflows/review.yml | 14 +++++++++-- 5 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/build-expo-android.yml create mode 100644 .github/workflows/build-expo-ios.yml rename .github/workflows/{build-android.yml => build-react-native-android.yml} (91%) rename .github/workflows/{build-ios.yml => build-react-native-ios.yml} (91%) diff --git a/.github/workflows/build-expo-android.yml b/.github/workflows/build-expo-android.yml new file mode 100644 index 000000000..d84b94676 --- /dev/null +++ b/.github/workflows/build-expo-android.yml @@ -0,0 +1,23 @@ +name: Build Expo Android + +on: + workflow_call: + +jobs: + build: + name: Build + runs-on: ubuntu-latest + + defaults: + run: + working-directory: ./packages/expo-app + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + uses: ./.github/actions/setup + + - name: Build Expo Android + run: yarn android \ No newline at end of file diff --git a/.github/workflows/build-expo-ios.yml b/.github/workflows/build-expo-ios.yml new file mode 100644 index 000000000..446b8e520 --- /dev/null +++ b/.github/workflows/build-expo-ios.yml @@ -0,0 +1,24 @@ +name: Build Expo iOS + +on: + workflow_call: + +jobs: + build: + name: Build + runs-on: macos-latest + timeout-minutes: 30 + + defaults: + run: + working-directory: ./packages/expo-app + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup + uses: ./.github/actions/setup + + - name: Build Expo iOS + run: yarn ios diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-react-native-android.yml similarity index 91% rename from .github/workflows/build-android.yml rename to .github/workflows/build-react-native-android.yml index 04f0df18d..25fd09376 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-react-native-android.yml @@ -1,10 +1,11 @@ -name: Android Build +name: Build React Native Android on: workflow_call: jobs: build: + name: Build runs-on: ubuntu-latest defaults: diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-react-native-ios.yml similarity index 91% rename from .github/workflows/build-ios.yml rename to .github/workflows/build-react-native-ios.yml index 72693dd84..89b6b4a93 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-react-native-ios.yml @@ -1,10 +1,11 @@ -name: iOS Build & Detox +name: Build React Native iOS & Test with Detox on: workflow_call: jobs: build: + name: Build runs-on: macos-latest timeout-minutes: 30 diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 2d7d7254b..198b4fcb8 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -77,15 +77,25 @@ jobs: - name: Build Library run: yarn prepack + build-expo-android: + name: Build Expo Android + needs: [lint, test, codegen, build-library] + uses: ./.github/workflows/build-expo-android.yml + + build-expo-ios: + name: Build Expo iOS + needs: [lint, test, codegen, build-library] + uses: ./.github/workflows/build-expo-ios.yml + build-react-native-android: name: Build React Native Android needs: [lint, test, codegen, build-library] - uses: ./.github/workflows/build-android.yml + uses: ./.github/workflows/build-react-native-android.yml build-react-native-ios: name: Build React Native iOS & Test with Detox needs: [lint, test, codegen, build-library] - uses: ./.github/workflows/build-ios.yml + uses: ./.github/workflows/build-react-native-ios.yml publish: name: Publish From 3da1e4b841b44b66b34cd1d9f797addd697d0d70 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sat, 23 Nov 2024 10:40:29 +0100 Subject: [PATCH 07/22] chore: use plugin source in expo example # Conflicts: # packages/expo-app/app.config.ts --- packages/expo-app/app.config.ts | 3 +- packages/expo-app/package.json | 3 +- yarn.lock | 136 +++++++++++++++++++++++++++++++- 3 files changed, 137 insertions(+), 5 deletions(-) diff --git a/packages/expo-app/app.config.ts b/packages/expo-app/app.config.ts index 2fe52e424..f52fc3d14 100644 --- a/packages/expo-app/app.config.ts +++ b/packages/expo-app/app.config.ts @@ -1,3 +1,4 @@ +import "ts-node/register"; import { ExpoConfig, ConfigContext } from "expo/config"; export default ({ config }: ConfigContext): ExpoConfig => ({ @@ -28,5 +29,5 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ }, package: "org.maplibre.expo.example", }, - plugins: ["@maplibre/maplibre-react-native"], + plugins: ["../../plugin/src/withMapLibre.ts"], }); diff --git a/packages/expo-app/package.json b/packages/expo-app/package.json index 779da890f..414c429a8 100644 --- a/packages/expo-app/package.json +++ b/packages/expo-app/package.json @@ -23,6 +23,7 @@ "react-native-screens": "~4.0.0" }, "devDependencies": { - "@babel/core": "^7.25.8" + "@babel/core": "^7.25.8", + "ts-node": "^10.9.2" } } diff --git a/yarn.lock b/yarn.lock index 3bb9a3f74..aeca5a3a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2478,6 +2478,15 @@ __metadata: languageName: node linkType: hard +"@cspotcode/source-map-support@npm:^0.8.0": + version: 0.8.1 + resolution: "@cspotcode/source-map-support@npm:0.8.1" + dependencies: + "@jridgewell/trace-mapping": "npm:0.3.9" + checksum: 10/b6e38a1712fab242c86a241c229cf562195aad985d0564bd352ac404be583029e89e93028ffd2c251d2c407ecac5fb0cbdca94a2d5c10f29ac806ede0508b3ff + languageName: node + linkType: hard + "@egjs/hammerjs@npm:^2.0.17": version: 2.0.17 resolution: "@egjs/hammerjs@npm:2.0.17" @@ -3450,7 +3459,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/resolve-uri@npm:^3.1.0": +"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0": version: 3.1.2 resolution: "@jridgewell/resolve-uri@npm:3.1.2" checksum: 10/97106439d750a409c22c8bff822d648f6a71f3aa9bc8e5129efdc36343cd3096ddc4eeb1c62d2fe48e9bdd4db37b05d4646a17114ecebd3bbcacfa2de51c3c1d @@ -3481,6 +3490,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/trace-mapping@npm:0.3.9": + version: 0.3.9 + resolution: "@jridgewell/trace-mapping@npm:0.3.9" + dependencies: + "@jridgewell/resolve-uri": "npm:^3.0.3" + "@jridgewell/sourcemap-codec": "npm:^1.4.10" + checksum: 10/83deafb8e7a5ca98993c2c6eeaa93c270f6f647a4c0dc00deb38c9cf9b2d3b7bf15e8839540155247ef034a052c0ec4466f980bf0c9e2ab63b97d16c0cedd3ff + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25": version: 0.3.25 resolution: "@jridgewell/trace-mapping@npm:0.3.25" @@ -4879,6 +4898,34 @@ __metadata: languageName: node linkType: hard +"@tsconfig/node10@npm:^1.0.7": + version: 1.0.11 + resolution: "@tsconfig/node10@npm:1.0.11" + checksum: 10/51fe47d55fe1b80ec35e6e5ed30a13665fd3a531945350aa74a14a1e82875fb60b350c2f2a5e72a64831b1b6bc02acb6760c30b3738b54954ec2dea82db7a267 + languageName: node + linkType: hard + +"@tsconfig/node12@npm:^1.0.7": + version: 1.0.11 + resolution: "@tsconfig/node12@npm:1.0.11" + checksum: 10/5ce29a41b13e7897a58b8e2df11269c5395999e588b9a467386f99d1d26f6c77d1af2719e407621412520ea30517d718d5192a32403b8dfcc163bf33e40a338a + languageName: node + linkType: hard + +"@tsconfig/node14@npm:^1.0.0": + version: 1.0.3 + resolution: "@tsconfig/node14@npm:1.0.3" + checksum: 10/19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d + languageName: node + linkType: hard + +"@tsconfig/node16@npm:^1.0.2": + version: 1.0.4 + resolution: "@tsconfig/node16@npm:1.0.4" + checksum: 10/202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff + languageName: node + linkType: hard + "@tsconfig/node18@npm:^18.2.2": version: 18.2.4 resolution: "@tsconfig/node18@npm:18.2.4" @@ -5757,7 +5804,7 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:^8.0.2": +"acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1": version: 8.3.4 resolution: "acorn-walk@npm:8.3.4" dependencies: @@ -5784,6 +5831,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.4.1": + version: 8.14.0 + resolution: "acorn@npm:8.14.0" + bin: + acorn: bin/acorn + checksum: 10/6df29c35556782ca9e632db461a7f97947772c6c1d5438a81f0c873a3da3a792487e83e404d1c6c25f70513e91aa18745f6eafb1fcc3a43ecd1920b21dd173d2 + languageName: node + linkType: hard + "agent-base@npm:6": version: 6.0.2 resolution: "agent-base@npm:6.0.2" @@ -5966,6 +6022,13 @@ __metadata: languageName: node linkType: hard +"arg@npm:^4.1.0": + version: 4.1.3 + resolution: "arg@npm:4.1.3" + checksum: 10/969b491082f20cad166649fa4d2073ea9e974a4e5ac36247ca23d2e5a8b3cb12d60e9ff70a8acfe26d76566c71fd351ee5e6a9a6595157eb36f92b1fd64e1599 + languageName: node + linkType: hard + "arg@npm:^5.0.2": version: 5.0.2 resolution: "arg@npm:5.0.2" @@ -7278,6 +7341,13 @@ __metadata: languageName: node linkType: hard +"create-require@npm:^1.1.0": + version: 1.1.1 + resolution: "create-require@npm:1.1.1" + checksum: 10/a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff + languageName: node + linkType: hard + "cross-fetch@npm:^3.1.5": version: 3.1.8 resolution: "cross-fetch@npm:3.1.8" @@ -7710,6 +7780,13 @@ __metadata: languageName: node linkType: hard +"diff@npm:^4.0.1": + version: 4.0.2 + resolution: "diff@npm:4.0.2" + checksum: 10/ec09ec2101934ca5966355a229d77afcad5911c92e2a77413efda5455636c4cf2ce84057e2d7715227a2eeeda04255b849bd3ae3a4dd22eb22e86e76456df069 + languageName: node + linkType: hard + "diff@npm:^5.0.0, diff@npm:^5.1.0": version: 5.2.0 resolution: "diff@npm:5.2.0" @@ -8844,6 +8921,7 @@ __metadata: react-native-gesture-handler: "npm:~2.20.2" react-native-safe-area-context: "npm:4.12.0" react-native-screens: "npm:~4.0.0" + ts-node: "npm:^10.9.2" languageName: unknown linkType: soft @@ -12198,7 +12276,7 @@ __metadata: languageName: node linkType: hard -"make-error@npm:1.x": +"make-error@npm:1.x, make-error@npm:^1.1.1": version: 1.3.6 resolution: "make-error@npm:1.3.6" checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 @@ -17000,6 +17078,44 @@ __metadata: languageName: node linkType: hard +"ts-node@npm:^10.9.2": + version: 10.9.2 + resolution: "ts-node@npm:10.9.2" + dependencies: + "@cspotcode/source-map-support": "npm:^0.8.0" + "@tsconfig/node10": "npm:^1.0.7" + "@tsconfig/node12": "npm:^1.0.7" + "@tsconfig/node14": "npm:^1.0.0" + "@tsconfig/node16": "npm:^1.0.2" + acorn: "npm:^8.4.1" + acorn-walk: "npm:^8.1.1" + arg: "npm:^4.1.0" + create-require: "npm:^1.1.0" + diff: "npm:^4.0.1" + make-error: "npm:^1.1.1" + v8-compile-cache-lib: "npm:^3.0.1" + yn: "npm:3.1.1" + peerDependencies: + "@swc/core": ">=1.2.50" + "@swc/wasm": ">=1.2.50" + "@types/node": "*" + typescript: ">=2.7" + peerDependenciesMeta: + "@swc/core": + optional: true + "@swc/wasm": + optional: true + bin: + ts-node: dist/bin.js + ts-node-cwd: dist/bin-cwd.js + ts-node-esm: dist/bin-esm.js + ts-node-script: dist/bin-script.js + ts-node-transpile-only: dist/bin-transpile.js + ts-script: dist/bin-script-deprecated.js + checksum: 10/a91a15b3c9f76ac462f006fa88b6bfa528130dcfb849dd7ef7f9d640832ab681e235b8a2bc58ecde42f72851cc1d5d4e22c901b0c11aa51001ea1d395074b794 + languageName: node + linkType: hard + "tsconfig-paths@npm:^3.15.0": version: 3.15.0 resolution: "tsconfig-paths@npm:3.15.0" @@ -17495,6 +17611,13 @@ __metadata: languageName: node linkType: hard +"v8-compile-cache-lib@npm:^3.0.1": + version: 3.0.1 + resolution: "v8-compile-cache-lib@npm:3.0.1" + checksum: 10/88d3423a52b6aaf1836be779cab12f7016d47ad8430dffba6edf766695e6d90ad4adaa3d8eeb512cc05924f3e246c4a4ca51e089dccf4402caa536b5e5be8961 + languageName: node + linkType: hard + "v8-to-istanbul@npm:^9.0.1": version: 9.3.0 resolution: "v8-to-istanbul@npm:9.3.0" @@ -18128,6 +18251,13 @@ __metadata: languageName: node linkType: hard +"yn@npm:3.1.1": + version: 3.1.1 + resolution: "yn@npm:3.1.1" + checksum: 10/2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6 + languageName: node + linkType: hard + "yocto-queue@npm:^0.1.0": version: 0.1.0 resolution: "yocto-queue@npm:0.1.0" From 2f7c7be4de9c116299cb99d9028a65420d92492a Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 21:30:24 +0100 Subject: [PATCH 08/22] ci: add setup-java to expo android build --- .github/workflows/build-expo-android.yml | 6 ++++++ .github/workflows/build-react-native-android.yml | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-expo-android.yml b/.github/workflows/build-expo-android.yml index d84b94676..82e190e46 100644 --- a/.github/workflows/build-expo-android.yml +++ b/.github/workflows/build-expo-android.yml @@ -19,5 +19,11 @@ jobs: - name: Setup uses: ./.github/actions/setup + - name: Setup Azul Zulu OpenJDK + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: 21 + - name: Build Expo Android run: yarn android \ No newline at end of file diff --git a/.github/workflows/build-react-native-android.yml b/.github/workflows/build-react-native-android.yml index 25fd09376..0ad4658c2 100644 --- a/.github/workflows/build-react-native-android.yml +++ b/.github/workflows/build-react-native-android.yml @@ -19,11 +19,11 @@ jobs: - name: Setup uses: ./.github/actions/setup - - name: Setup JDK Zulu 17 + - name: Setup Azul Zulu OpenJDK uses: actions/setup-java@v4 with: - distribution: "zulu" - java-version: "17" + distribution: zulu + java-version: 21 - name: Build Android run: ./gradlew assemble From a15dfdf8c9c3d3a0328d950911b8e6ff2ef1878d Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 21:37:05 +0100 Subject: [PATCH 09/22] ci: remove unused label action --- .github/label-actions.yml | 16 ---------------- .github/workflows/label.yml | 17 ----------------- 2 files changed, 33 deletions(-) delete mode 100644 .github/label-actions.yml delete mode 100644 .github/workflows/label.yml diff --git a/.github/label-actions.yml b/.github/label-actions.yml deleted file mode 100644 index f261a8309..000000000 --- a/.github/label-actions.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Configuration for Label Actions - https://github.com/dessant/label-actions -"Needs: Issue Template": - comment: > - :wave: @{issue-author}, have a look at our issue template and make sure that you've filled out the required fields. - # Close the issue - close: true -"question": - comment: > - :thinking: @{issue-author}, this appears to be a question rather than an issue
please use GitHub Discussions or [Slack](https://slack.openstreetmap.us/). - # Close the issue - close: true -"stale": - comment: > - :thinking: @{issue-author} we're closing this issue due to lack of activity. - # Close the issue - close: true diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml deleted file mode 100644 index 55d4ef364..000000000 --- a/.github/workflows/label.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Configuration for Label Actions - https://github.com/dessant/label-actions - -name: "Label Actions" - -on: - issues: - types: labeled - -permissions: - contents: read - issues: write - -jobs: - action: - runs-on: ubuntu-latest - steps: - - uses: dessant/label-actions@v4 From 08b4c56ba891632df084b59fc3d14ed9d311d731 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 21:37:15 +0100 Subject: [PATCH 10/22] ci: remove unused stale --- .github/stale.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 7bf58a7e6..000000000 --- a/.github/stale.yml +++ /dev/null @@ -1,11 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -exemptLabels: - - pinned - - security -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false \ No newline at end of file From a2741254647e2a160cd0434c1aed0c7197fbb763 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 21:41:18 +0100 Subject: [PATCH 11/22] refactor: move pull_request_template.md --- .github/{ => PULL_REQUEST_TEMPLATE}/pull_request_template.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => PULL_REQUEST_TEMPLATE}/pull_request_template.md (100%) diff --git a/.github/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md similarity index 100% rename from .github/pull_request_template.md rename to .github/PULL_REQUEST_TEMPLATE/pull_request_template.md From 06b0da1e4467f5eceaa657b00bb96a13f3eb77a3 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 21:41:26 +0100 Subject: [PATCH 12/22] ci: add dependabot for actions --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 79c120ee2..5e52bee78 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,3 +6,8 @@ updates: interval: "weekly" # Disable version updates for npm dependencies open-pull-requests-limit: 0 + + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly From 18082802af9da05f7bb7295f92feac7907e75c49 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 21:49:22 +0100 Subject: [PATCH 13/22] fix: lint ids --- .github/workflows/review.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 198b4fcb8..08f3097be 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -12,7 +12,7 @@ on: - checks_requested jobs: - lint: + lint-eslint: name: Lint ESLint runs-on: ubuntu-latest steps: @@ -79,28 +79,28 @@ jobs: build-expo-android: name: Build Expo Android - needs: [lint, test, codegen, build-library] + needs: [lint-eslint, lint-tsc, test, codegen, build-library] uses: ./.github/workflows/build-expo-android.yml build-expo-ios: name: Build Expo iOS - needs: [lint, test, codegen, build-library] + needs: [lint-eslint, lint-tsc, test, codegen, build-library] uses: ./.github/workflows/build-expo-ios.yml build-react-native-android: name: Build React Native Android - needs: [lint, test, codegen, build-library] + needs: [lint-eslint, lint-tsc, test, codegen, build-library] uses: ./.github/workflows/build-react-native-android.yml build-react-native-ios: name: Build React Native iOS & Test with Detox - needs: [lint, test, codegen, build-library] + needs: [lint-eslint, lint-tsc, test, codegen, build-library] uses: ./.github/workflows/build-react-native-ios.yml publish: name: Publish if: startsWith(github.ref, 'refs/tags/') - needs: [lint, test, codegen, build-library, build-react-native-android, build-react-native-ios] + needs: [lint-eslint, lint-tsc, test, codegen, build-library, build-react-native-android, build-react-native-ios] runs-on: ubuntu-latest steps: - name: Checkout code From a81caf153ce284b392e28791ad640e7eee541b78 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 22:11:07 +0100 Subject: [PATCH 14/22] ci: remove expo build --- .github/workflows/build-expo-android.yml | 29 ------------------------ .github/workflows/build-expo-ios.yml | 24 -------------------- .github/workflows/review.yml | 10 -------- 3 files changed, 63 deletions(-) delete mode 100644 .github/workflows/build-expo-android.yml delete mode 100644 .github/workflows/build-expo-ios.yml diff --git a/.github/workflows/build-expo-android.yml b/.github/workflows/build-expo-android.yml deleted file mode 100644 index 82e190e46..000000000 --- a/.github/workflows/build-expo-android.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Build Expo Android - -on: - workflow_call: - -jobs: - build: - name: Build - runs-on: ubuntu-latest - - defaults: - run: - working-directory: ./packages/expo-app - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup - uses: ./.github/actions/setup - - - name: Setup Azul Zulu OpenJDK - uses: actions/setup-java@v4 - with: - distribution: zulu - java-version: 21 - - - name: Build Expo Android - run: yarn android \ No newline at end of file diff --git a/.github/workflows/build-expo-ios.yml b/.github/workflows/build-expo-ios.yml deleted file mode 100644 index 446b8e520..000000000 --- a/.github/workflows/build-expo-ios.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build Expo iOS - -on: - workflow_call: - -jobs: - build: - name: Build - runs-on: macos-latest - timeout-minutes: 30 - - defaults: - run: - working-directory: ./packages/expo-app - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup - uses: ./.github/actions/setup - - - name: Build Expo iOS - run: yarn ios diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 08f3097be..76e515629 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -77,16 +77,6 @@ jobs: - name: Build Library run: yarn prepack - build-expo-android: - name: Build Expo Android - needs: [lint-eslint, lint-tsc, test, codegen, build-library] - uses: ./.github/workflows/build-expo-android.yml - - build-expo-ios: - name: Build Expo iOS - needs: [lint-eslint, lint-tsc, test, codegen, build-library] - uses: ./.github/workflows/build-expo-ios.yml - build-react-native-android: name: Build React Native Android needs: [lint-eslint, lint-tsc, test, codegen, build-library] From b2e63622eb1a561f6b333ada21d43208d051b0f9 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 22:12:10 +0100 Subject: [PATCH 15/22] ci: install brew before yarn --- .github/workflows/build-react-native-ios.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-react-native-ios.yml b/.github/workflows/build-react-native-ios.yml index 89b6b4a93..b7bfb21a0 100644 --- a/.github/workflows/build-react-native-ios.yml +++ b/.github/workflows/build-react-native-ios.yml @@ -17,17 +17,17 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Install Detox Dependencies + run: | + brew tap wix/brew + brew install applesimutils + - name: Setup uses: ./.github/actions/setup - name: Install Pod Dependencies run: cd ios && pod --version && pod install - - name: Install Detox Dependencies - run: | - brew tap wix/brew - brew install applesimutils - - name: Build iOS run: yarn detox build -c ios.sim.release From dc15942fd4915c9e6c540268428b791cfbd6dc64 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 22:25:51 +0100 Subject: [PATCH 16/22] ci: add plugin commands --- .github/workflows/review.yml | 9 +++++++++ package.json | 2 ++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 76e515629..fe623027f 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -25,6 +25,9 @@ jobs: - name: Lint with ESLint run: yarn lint:eslint + - name: Lint Plugin with ESLint + run: yarn plugin:lint:eslint + lint-tsc: name: Lint TSC runs-on: ubuntu-latest @@ -38,6 +41,9 @@ jobs: - name: Lint with TSC run: yarn lint:tsc + - name: Lint Plugin with TSC + run: yarn plugin:lint:tsc + test: name: Test runs-on: ubuntu-latest @@ -51,6 +57,9 @@ jobs: - name: Test with Jest run: yarn test + - name: Test Plugin with Jest + run: yarn plugin:test + codegen: name: Codegen runs-on: ubuntu-latest diff --git a/package.json b/package.json index bdfd5c817..04ef630f2 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,8 @@ "lint:tsc": "tsc --project . --noEmit && tsc --project ./packages/examples", "plugin:build": "tsc --build plugin", "plugin:lint": "eslint plugin/src/*", + "plugin:lint:eslint": "eslint plugin/src/*", + "plugin:lint:tsc": "tsc --project ./plugin --noEmit", "plugin:test": "jest plugin", "prepack": "yarn plugin:build" }, From e28aee8cf0adbe30ba8cfb51ef13ae576d3b3a7f Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 22:26:42 +0100 Subject: [PATCH 17/22] Revert "ci: install brew before yarn" This reverts commit b2e63622eb1a561f6b333ada21d43208d051b0f9. --- .github/workflows/build-react-native-ios.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-react-native-ios.yml b/.github/workflows/build-react-native-ios.yml index b7bfb21a0..89b6b4a93 100644 --- a/.github/workflows/build-react-native-ios.yml +++ b/.github/workflows/build-react-native-ios.yml @@ -17,17 +17,17 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install Detox Dependencies - run: | - brew tap wix/brew - brew install applesimutils - - name: Setup uses: ./.github/actions/setup - name: Install Pod Dependencies run: cd ios && pod --version && pod install + - name: Install Detox Dependencies + run: | + brew tap wix/brew + brew install applesimutils + - name: Build iOS run: yarn detox build -c ios.sim.release From bb5a13a8f88f14f7fc72064e8de0e19d4f654eb6 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 22:27:29 +0100 Subject: [PATCH 18/22] ci: always clear detox cache --- .github/workflows/build-react-native-ios.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-react-native-ios.yml b/.github/workflows/build-react-native-ios.yml index 89b6b4a93..f4fba1f06 100644 --- a/.github/workflows/build-react-native-ios.yml +++ b/.github/workflows/build-react-native-ios.yml @@ -27,6 +27,7 @@ jobs: run: | brew tap wix/brew brew install applesimutils + detox clean-framework-cache && detox build-framework-cache - name: Build iOS run: yarn detox build -c ios.sim.release From 01f53d09f35a8577995d60d3ad2432ceedba2fe3 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Sun, 24 Nov 2024 22:33:09 +0100 Subject: [PATCH 19/22] ci: call detox through yarn --- .github/workflows/build-react-native-ios.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-react-native-ios.yml b/.github/workflows/build-react-native-ios.yml index f4fba1f06..dd4b68ab2 100644 --- a/.github/workflows/build-react-native-ios.yml +++ b/.github/workflows/build-react-native-ios.yml @@ -27,7 +27,7 @@ jobs: run: | brew tap wix/brew brew install applesimutils - detox clean-framework-cache && detox build-framework-cache + yarn detox clean-framework-cache && yarn detox build-framework-cache - name: Build iOS run: yarn detox build -c ios.sim.release From f057ab8a3fe4e14e4afd1a5c374d61e5eabf3d67 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Mon, 25 Nov 2024 07:46:28 +0100 Subject: [PATCH 20/22] docs: update badges --- README.md | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 283bafe9f..d186711f8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ [![MapLibre Logo](https://maplibre.org/img/maplibre-logo-big.svg)](https://maplibre.org) # MapLibre React Native +[![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE.md) +[![Version](https://img.shields.io/npm/v/@maplibre/maplibre-react-native)](https://www.npmjs.com/package/@maplibre/maplibre-react-native) +[![Actions](https://img.shields.io/github/actions/workflow/status/maplibre/maplibre-react-native/review.yml?label=Actions +)](https://github.com/maplibre/maplibre-react-native/actions/workflows/review.yml) + _React Native library for creating maps with [MapLibre Native for Android & iOS](https://github.com/maplibre/maplibre-gl-native)_. @@ -9,22 +14,16 @@ React Native library for building maps with the Mapbox iOS and Android mobile SD supported both Mapbox and MapLibre for some time, but as the MapLibre and Mapbox SDKs have diverged, it has become necessary to separate the projects into specific wrappers by underlying renderer. ---- - -[![npm version](https://badge.fury.io/js/%40maplibre%2Fmaplibre-react-native.svg)](https://badge.fury.io/js/%40maplibre%2Fmaplibre-react-native) [![Android Build](https://github.com/maplibre/maplibre-react-native/actions/workflows/android-actions.yml/badge.svg)](https://github.com/maplibre/maplibre-react-native/actions/workflows/android-actions.yml) [![iOS Build](https://github.com/maplibre/maplibre-react-native/actions/workflows/ios-actions.yml/badge.svg)](https://github.com/maplibre/maplibre-react-native/actions/workflows/ios-actions.yml) - ---- - -
- -Indoor Building Map Android -Indoor Building Map iOS +

+ Indoor Building Map Android + Indoor Building Map iOS +

## Documentation From f7434d3b0fa9fb41f7d16294a9be8042061bd8a3 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Mon, 25 Nov 2024 11:39:09 +0100 Subject: [PATCH 21/22] chore: improve scripts --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 04ef630f2..b5269b30b 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,11 @@ "lint:eslint": "eslint .", "lint:eslint:fix": "eslint . --fix", "lint:tsc": "tsc --project . --noEmit && tsc --project ./packages/examples", - "plugin:build": "tsc --build plugin", - "plugin:lint": "eslint plugin/src/*", - "plugin:lint:eslint": "eslint plugin/src/*", + "plugin:build": "tsc --build ./plugin", + "plugin:lint": "yarn plugin:lint:eslint && yarn plugin:lint:tsc", + "plugin:lint:eslint": "eslint ./plugin/src/*", "plugin:lint:tsc": "tsc --project ./plugin --noEmit", - "plugin:test": "jest plugin", + "plugin:test": "jest ./plugin", "prepack": "yarn plugin:build" }, "workspaces": [ From ff756d7d3e8a4c88cad1143a77a1c0f6877f04f2 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Tue, 26 Nov 2024 13:02:54 +0100 Subject: [PATCH 22/22] ci: reorder tsc and eslint --- .github/workflows/review.yml | 24 ++++++++++++------------ package.json | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index fe623027f..645a3b3fb 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -12,8 +12,8 @@ on: - checks_requested jobs: - lint-eslint: - name: Lint ESLint + lint-tsc: + name: Lint TSC runs-on: ubuntu-latest steps: - name: Checkout @@ -22,14 +22,14 @@ jobs: - name: Setup uses: ./.github/actions/setup - - name: Lint with ESLint - run: yarn lint:eslint + - name: Lint with TSC + run: yarn lint:tsc - - name: Lint Plugin with ESLint - run: yarn plugin:lint:eslint + - name: Lint Plugin with TSC + run: yarn plugin:lint:tsc - lint-tsc: - name: Lint TSC + lint-eslint: + name: Lint ESLint runs-on: ubuntu-latest steps: - name: Checkout @@ -38,11 +38,11 @@ jobs: - name: Setup uses: ./.github/actions/setup - - name: Lint with TSC - run: yarn lint:tsc + - name: Lint with ESLint + run: yarn lint:eslint - - name: Lint Plugin with TSC - run: yarn plugin:lint:tsc + - name: Lint Plugin with ESLint + run: yarn plugin:lint:eslint test: name: Test diff --git a/package.json b/package.json index a643ccc55..cc9ec83da 100644 --- a/package.json +++ b/package.json @@ -27,13 +27,13 @@ "codegen": "tsx scripts/codegen.ts", "test": "jest", "lint": "yarn lint:tsc && yarn lint:eslint", - "lint:eslint": "eslint .", - "lint:eslint:fix": "eslint . --fix", - "lint:tsc": "tsc --project . && tsc --project ./packages/examples", + "lint:tsc": "tsc --project ./ && tsc --project ./packages/examples", + "lint:eslint": "eslint ./", + "lint:eslint:fix": "eslint ./ --fix", "plugin:build": "tsc --build ./plugin", - "plugin:lint": "yarn plugin:lint:eslint && yarn plugin:lint:tsc", + "plugin:lint": "yarn plugin:lint:tsc && yarn plugin:lint:eslint", + "plugin:lint:tsc": "tsc --noEmit --project ./plugin", "plugin:lint:eslint": "eslint ./plugin/src/*", - "plugin:lint:tsc": "tsc --project ./plugin --noEmit", "plugin:test": "jest ./plugin", "prepack": "bob build && yarn plugin:build" },