Merge branch 'beta' into feat/typescript-examples

.eslintignore

@@ -1 +1,2 @@
 lib
+build

.eslintrc.js

@@ -1,5 +1,4 @@
 module.exports = {
   root: true,
   extends: ["universe/native"],
-  ignorePatterns: ["build"],
 };

.github/workflows/review-android.yml

@@ -0,0 +1,128 @@
+name: Android
+
+on:
+  workflow_call:
+  # Review calls this Workflow
+
+jobs:
+  build-android:
+    name: Build ${{ matrix.new-arch && 'new' || 'old'}} Arch
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./packages/react-native-app
+    strategy:
+      matrix:
+        new-arch: [false, true]
+    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
+          cache: gradle
+
+      - name: Cache Build
+        uses: actions/cache@v4
+        id: android-build-cache
+        with:
+          path: |
+            ./android/build
+            ./packages/react-native-app/android/.gradle
+            ./packages/react-native-app/android/app/build
+            ./packages/react-native-app/android/build
+          key: ${{ runner.os }}-android-build-${{ matrix.new-arch && 'new' || 'old' }}-arch-${{ github.workflow }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-android-build-${{ matrix.new-arch && 'new' || 'old' }}-arch-${{ github.workflow }}-${{ github.sha }}
+            ${{ runner.os }}-android-build-${{ matrix.new-arch && 'new' || 'old' }}-arch-${{ github.workflow }}-
+
+      - name: Build
+        if: steps.android-build-cache.outputs.cache-hit != 'true'
+        run: yarn react-native build-android --mode release --tasks assembleRelease --extra-params "-PnewArchEnabled=${{ matrix.new-arch }}"
+
+      - name: Upload App
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-app-${{ matrix.new-arch && 'new' || 'old' }}-arch
+          path: ./packages/react-native-app/android/app/build/outputs/apk/release/app-release.apk
+
+  test-android:
+    name: Test ${{ matrix.new-arch && 'new' || 'old'}} Arch
+    needs: [build-android]
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./packages/react-native-app
+    strategy:
+      matrix:
+        new-arch: [false, true]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Enable KVM Group Permissions
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Gradle cache
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Cache Virtual Device
+        uses: actions/cache@v4
+        id: android-virtual-device-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: android-virtual-device-api-level-33
+
+      - name: Create Virtual Device
+        if: steps.android-virtual-device-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 33
+          target: google_apis
+          arch: x86_64
+          force-avd-creation: false
+          working-directory: ./packages/react-native-app
+          script: echo "Generated Android Virtual Device Snapshot for Caching"
+
+      - name: Install Maestro
+        run: |
+          curl -Ls "https://get.maestro.mobile.dev" | bash
+          echo "$HOME/.maestro/bin" >> "$GITHUB_PATH"
+
+      - name: Download App
+        uses: actions/download-artifact@v4
+        with:
+          name: android-app-${{ matrix.new-arch && 'new' || 'old' }}-arch
+          path: ./packages/react-native-app/android/
+
+      - name: Run Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 33
+          target: google_apis
+          arch: x86_64
+          force-avd-creation: false
+          working-directory: ./packages/react-native-app
+          script: |
+            adb install ./android/app-release.apk
+            maestro test ./e2e/show-map.yml --format junit
+
+      - name: Upload Report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Android Report ${{ matrix.new-arch && 'new' || 'old' }} Arch
+          path: |
+            ./packages/react-native-app/report.xml
+            ~/.maestro/tests/**/*

.github/workflows/review-ios.yml

@@ -0,0 +1,102 @@
+name: iOS
+
+on:
+  workflow_call:
+  # Review calls this Workflow
+
+jobs:
+  build-ios:
+    name: Build ${{ matrix.new-arch && 'new' || 'old'}} Arch
+    runs-on: macos-latest
+    defaults:
+      run:
+        working-directory: ./packages/react-native-app
+    strategy:
+      matrix:
+        new-arch: [false, true]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup
+        uses: ./.github/actions/setup
+
+      - name: Cache Cocoapods
+        uses: actions/cache@v4
+        id: cocoapods-cache
+        with:
+          path: ./packages/react-native-app/ios/Pods
+          key: ${{ runner.os }}-cocoapods-${{ matrix.new-arch && 'new' || 'old' }}-arch-${{ hashFiles('./packages/react-native-app/ios/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cocoapods-${{ matrix.new-arch && 'new' || 'old' }}-arch-${{ hashFiles('./packages/react-native-app/ios/Podfile.lock') }}
+            ${{ runner.os }}-cocoapods-${{ matrix.new-arch && 'new' || 'old' }}-arch-
+
+      - name: Install Cocoapods
+        # New Arch changes Podfile.lock so it always has to run
+        if: matrix.new-arch || steps.cocoapods-cache.outputs.cache-hit != 'true'
+        run: RCT_NEW_ARCH_ENABLED=${{ matrix.new-arch && '1' || '0' }} yarn pod:install
+
+      - name: Cache Build
+        uses: actions/cache@v4
+        id: ios-build-cache
+        with:
+          path: ./packages/react-native-app/ios/build
+          key: ${{ runner.os }}-ios-build-${{ matrix.new-arch && 'new' || 'old' }}-arch-${{ github.workflow }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-ios-build-${{ matrix.new-arch && 'new' || 'old' }}-arch-${{ github.workflow }}-${{ github.sha }}
+            ${{ runner.os }}-ios-build-${{ matrix.new-arch && 'new' || 'old' }}-arch-${{ github.workflow }}-
+
+      - name: Build
+        if: steps.ios-build-cache.outputs.cache-hit != 'true'
+        # Like `react-native build-ios --mode Release` but adapted for simulators
+        run: xcodebuild -workspace ios/MapLibreReactNativeExample.xcworkspace -scheme MapLibreReactNativeExample -configuration Release -sdk iphonesimulator -derivedDataPath ios/build
+
+      - name: Upload App
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios-app-${{ matrix.new-arch && 'new' || 'old' }}-arch
+          # `.app` is a directory, so we have to archive one level above
+          path: |
+            ./packages/react-native-app/ios/build/Build/Products/Release-iphonesimulator
+            !./packages/react-native-app/ios/build/Build/Products/Release-iphonesimulator/**
+            ./packages/react-native-app/ios/build/Build/Products/Release-iphonesimulator/MapLibreReactNativeExample.app
+
+  test-ios:
+    name: Test ${{ matrix.new-arch && 'new' || 'old'}} Arch
+    needs: [build-ios]
+    runs-on: macos-latest
+    defaults:
+      run:
+        working-directory: ./packages/react-native-app
+    strategy:
+      matrix:
+        new-arch: [false, true]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Maestro
+        run: |
+          curl -Ls "https://get.maestro.mobile.dev" | bash
+          echo "$HOME/.maestro/bin" >> "$GITHUB_PATH"
+
+      - name: Download App
+        uses: actions/download-artifact@v4
+        with:
+          name: ios-app-${{ matrix.new-arch && 'new' || 'old' }}-arch
+          path: ./packages/react-native-app/ios
+
+      - name: Run Tests
+        run: |
+          xcrun simctl boot "iPhone 15 Pro"
+          xcrun simctl install booted ./ios/MapLibreReactNativeExample.app
+          maestro test ./e2e/show-map.yml --format junit
+
+      - name: Upload Report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: iOS Report ${{ matrix.new-arch && 'new' || 'old' }} Arch
+          path: |
+            ./packages/react-native-app/report.xml
+            ~/.maestro/tests/**/*

.github/workflows/review.yml

@@ -2,7 +2,7 @@ name: Review
 
 on:
   workflow_call:
-    # Release calls this Workflow
+  # Release calls this Workflow
   pull_request:
     branches:
       - main
@@ -87,56 +87,10 @@ jobs:
       - name: Build Library
         run: yarn prepack
 
-  build-react-native-android:
-    name: Build React Native Android
-    needs: [lint-eslint, lint-tsc, test, codegen, build-library]
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./packages/react-native-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 Android
-        run: ./gradlew assemble
-        working-directory: packages/react-native-app/android
-
-  build-react-native-ios:
-    name: Build React Native iOS & Test with Detox
-    needs: [lint-eslint, lint-tsc, test, codegen, build-library]
-    runs-on: macos-latest
-    timeout-minutes: 30
-    defaults:
-      run:
-        working-directory: ./packages/react-native-app
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - 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
-          yarn detox clean-framework-cache && yarn detox build-framework-cache
-
-      - name: Build iOS
-        run: yarn detox build -c ios.sim.release
+  review-android:
+    name: Android
+    uses: ./.github/workflows/review-android.yml
 
-      - name: Test with Detox
-        run: yarn detox test --debug-synchronization 200 -c ios.sim.release
+  review-ios:
+    name: iOS
+    uses: ./.github/workflows/review-ios.yml

.gitignore

@@ -91,3 +91,6 @@ packages/expo-app/android
 
 # Build by bob
 lib/
+
+# Maestro
+report.xml

CONTRIBUTING.md

@@ -31,7 +31,7 @@ Which means, when you change something within [
 `/src/components/UserLocation.tsx`](/src/components/UserLocation.tsx)
 it will be reflected in any scene in example that uses that component.
 
-TODO: A better overview of how we use jest, detox, etc. (issue #22)
+TODO: A better overview of how we use jest, Maestro, etc. (issue #22)
 
 ## Optional: Local development with `yalc`
 

jest-setup.ts

@@ -2,9 +2,6 @@
 import "@testing-library/react-native/extend-expect";
 import { NativeModules } from "react-native";
 
-// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
-jest.mock("react-native/Libraries/Animated/NativeAnimatedHelper");
-
 function keyMirror(keys: string[]) {
   const obj: Record<string, string> = {};
   keys.forEach((key) => (obj[key] = key));

jest.config.ts

@@ -0,0 +1,20 @@
+import type { Config } from "jest";
+
+const config: Config = {
+  preset: "@testing-library/react-native",
+
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json"],
+  setupFilesAfterEnv: [
+    "./jest-setup.ts",
+    "./__tests__/__mocks__/react-native.mock.ts",
+  ],
+  modulePathIgnorePatterns: [
+    "<rootDir>/lib",
+    "<rootDir>/packages/*",
+    "__tests__/__mocks__",
+    "fixtures",
+  ],
+  collectCoverageFrom: ["src/**/*.{ts,tsx,js,jsx}"],
+};
+
+module.exports = config;