Merge pull request #134 from JairajJangle/fixes/misc

Fixes/misc

Author: JairajJangle

.github/ISSUE_TEMPLATE/bug-report.md

@@ -31,7 +31,6 @@ If applicable, add screenshots/screen records to help explain your problem.
 - Version of Node.js: [e.g. 14.15.0]
 - Version of NPM: [e.g. 7.0.0]
 - Version of @shopify/flash-list: [e.g. 2.0.0]
-- Version of react-native-paper: [e.g. 4.9.2]
 - Version of react-native-vector-icons: [e.g. 8.1.0]
 
 **Additional Context**

.github/actions/setup/action.yml

@@ -9,21 +9,60 @@ runs:
       with:
         node-version-file: .nvmrc
 
-    - name: Cache dependencies
+    # Create a minimal .yarnrc.yml without any plugin references
+    - name: Create minimal Yarn config
+      run: |
+        cat > .yarnrc.yml << EOF
+        nodeLinker: node-modules
+        nmHoistingLimits: workspaces
+        EOF
+      shell: bash
+
+    # Setup Corepack for proper Yarn version management
+    - name: Setup Corepack and Yarn
+      run: |
+        corepack enable
+        corepack prepare [email protected] --activate
+        yarn --version
+      shell: bash
+
+    - name: Configure Yarn and Generate .yarnrc.yml
+      run: |
+        yarn set version 4.9.2
+        yarn config set nodeLinker node-modules
+        yarn config set nmHoistingLimits workspaces
+      shell: bash
+
+    - name: Verify .yarnrc.yml
+      run: |
+        cat .yarnrc.yml
+      shell: bash
+
+    - name: Restore Yarn Cache
+      uses: actions/cache/restore@v4
       id: yarn-cache
-      uses: actions/cache@v4
       with:
         path: |
           **/node_modules
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }}
+          .yarn/cache
+          .yarn/unplugged
+          .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-${{ hashFiles('yarn.lock') }}
           ${{ runner.os }}-yarn-
 
     - name: Install dependencies
-      if: steps.yarn-cache.outputs.cache-hit != 'true'
-      run: |
-        yarn install --cwd example --frozen-lockfile
-        yarn install --frozen-lockfile
-        yarn patch-package
+      run: yarn install
       shell: bash
+
+    - name: Save Yarn Cache
+      uses: actions/cache/save@v4
+      if: steps.yarn-cache.outputs.cache-hit != 'true'
+      with:
+        path: |
+          **/node_modules
+          .yarn/cache
+          .yarn/unplugged
+          .yarn/install-state.gz
+        key: ${{ steps.yarn-cache.outputs.cache-primary-key }}

.github/workflows/beta-release.yml

@@ -6,6 +6,12 @@ on:
   pull_request:
     branches:
       - beta
+  merge_group:
+    types:
+      - checks_requested
+
+env:
+  NODE_OPTIONS: --experimental-vm-modules
 
 jobs:
   lint:
@@ -18,7 +24,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Lint files
-        run: yarn lint './**/*.{ts,tsx,js,jsx}' --ignore-pattern node_modules
+        run: yarn lint
 
       - name: Typecheck files
         run: yarn typecheck
@@ -50,141 +56,37 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
 
+      - name: Install missing dependencies
+        run: yarn add -D @ark/schema || echo "Package already installed or not needed"
+
       - name: Build package
-        run: yarn prepack
+        run: yarn prepare
 
-  build-android:
+  build-web:
     runs-on: ubuntu-latest
-    env:
-      TURBO_CACHE_DIR: .turbo/android
-      ANDROID_HOME: /usr/local/lib/android/sdk
-      JAVA_HOME: /usr/lib/jvm/zulu-17-amd64
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup
-        uses: ./.github/actions/setup
-
-      - name: Cache turborepo for Android
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.TURBO_CACHE_DIR }}
-          key: ${{ runner.os }}-turborepo-android-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-turborepo-android-
-
-      - name: Check turborepo cache for Android
-        run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn --silent turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")
-
-          if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
-            echo "turbo_cache_hit=1" >> $GITHUB_ENV
-          fi
-
-      - name: Install JDK
-        if: env.turbo_cache_hit != 1
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Set up Android SDK
-        if: env.turbo_cache_hit != 1
-        uses: android-actions/setup-android@v2
-        with:
-          api-level: 30
-          build-tools: 30.0.3
-          ndk: "23.1.7779620"
-      
-      - name: Create local.properties
-        if: env.turbo_cache_hit != 1
-        run: |
-          echo "sdk.dir=$ANDROID_HOME" > example/android/local.properties
-
-      - name: Finalize Android SDK
-        if: env.turbo_cache_hit != 1
-        run: |
-          /bin/bash -c "yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null"
-
-      - name: Cache Gradle
-        if: env.turbo_cache_hit != 1
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/wrapper
-            ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Build example for Android
-        run: |
-          yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
-
-  build-ios:
-    runs-on: macos-latest
-    env:
-      TURBO_CACHE_DIR: .turbo/ios
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup
         uses: ./.github/actions/setup
 
-      - name: Cache turborepo for iOS
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.TURBO_CACHE_DIR }}
-          key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-turborepo-ios-
+      - name: Prepare library
+        run: yarn prepare
 
-      - name: Check turborepo cache for iOS
+      - name: Build example for Web
         run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn --silent turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:ios').cache.status")
-
-          if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
-            echo "turbo_cache_hit=1" >> $GITHUB_ENV
-          fi
-
-      - name: Cache cocoapods
-        if: env.turbo_cache_hit != 1
-        id: cocoapods-cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            **/ios/Pods
-          key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cocoapods-
-
-      - name: Install cocoapods
-        if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
-        run: |
-          yarn example pods
-        env:
-          NO_FLIPPER: 1
-
-      - name: Build example for iOS
-        run: |
-          yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" 2>&1 | grep -i error > ios_errorlog.txt
-
-      - name: Upload iOS error log
-        uses: actions/upload-artifact@v4
-        with:
-          name: ios-error-log
-          path: ios_errorlog.txt
+          yarn example expo export --platform web
 
   publish-beta:
-    needs: [lint, test, build-library, build-android, build-ios]
+    needs: [lint, test, build-library, build-web]
     runs-on: ubuntu-latest
     permissions:
       contents: write # To publish a GitHub release
       issues: write # To comment on released issues
       pull-requests: write # To comment on released pull requests
       id-token: write # To enable use of OIDC for npm provenance
+    if: github.ref == 'refs/heads/beta'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -210,3 +112,4 @@ jobs:
 
           # Why NODE_AUTH_TOKEN instead of NPM_TOKEN: https://github.com/semantic-release/semantic-release/issues/2313
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}  # npm token for publishing package
+