disable new arch (#8561)

5 files changed, 12 insertions, 37 deletions

diff --git a/.github/workflows/build-submit-android.yml b/.github/workflows/build-submit-android.yml
index 8a8388ee8..f75c95052 100644
--- a/.github/workflows/build-submit-android.yml
+++ b/.github/workflows/build-submit-android.yml
@@ -52,10 +52,6 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
-      - name: "Use upgraded MMKV for Fabric"
-        run: |
-          sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
-
       - name: ⚙️ Install dependencies
         run: yarn install
 
diff --git a/.github/workflows/bundle-deploy-eas-update.yml b/.github/workflows/bundle-deploy-eas-update.yml
index 1b2fba0b7..5a4702f96 100644
--- a/.github/workflows/bundle-deploy-eas-update.yml
+++ b/.github/workflows/bundle-deploy-eas-update.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - main
-      - hailey/eas-fab
   workflow_dispatch:
     inputs:
       channel:
@@ -119,14 +118,7 @@ jobs:
 
       - name: 🏗️ Create Bundle
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        run: |
-          SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export-ios
-          mv ./dist ./ios-dist
-          sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
-          yarn install
-          SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export-android
-          mv ./dist ./android-dist
-
+        run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export
 
       - name: 📦 Package Bundle and 🚀 Deploy
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
@@ -283,10 +275,6 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
-      - name: "Use upgraded MMKV for Fabric"
-        run: |
-          sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
-
       - name: ⚙️ Install dependencies
         run: yarn install
 
diff --git a/app.config.js b/app.config.js
index c6b2fc6d4..cbe028273 100644
--- a/app.config.js
+++ b/app.config.js
@@ -219,7 +219,7 @@ module.exports = function (_config) {
               compileSdkVersion: 35,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
-              newArchEnabled: true,
+              newArchEnabled: false,
             },
           },
         ],
diff --git a/package.json b/package.json
index eddec7928..651d55f22 100644
--- a/package.json
+++ b/package.json
@@ -61,8 +61,7 @@
     "intl:push": "crowdin push translations --verbose -b main",
     "nuke": "rm -rf ./node_modules && rm -rf ./ios && rm -rf ./android",
     "update-extensions": "bash scripts/updateExtensions.sh",
-    "export-ios": "npx expo export --platform ios --dump-sourcemap && yarn upload-native-sourcemaps",
-    "export-android": "npx expo export --platform android --dump-sourcemap && yarn upload-native-sourcemaps",
+    "export": "npx expo export --dump-sourcemap && yarn upload-native-sourcemaps",
     "upload-native-sourcemaps": "npx sentry-expo-upload-sourcemaps dist",
     "make-deploy-bundle": "bash scripts/bundleUpdate.sh",
     "generate-webpack-stats-file": "EXPO_PUBLIC_GENERATE_STATS=1 yarn build-web",
diff --git a/scripts/bundleUpdate.js b/scripts/bundleUpdate.js
index a5f1fb641..00217dcd7 100644
--- a/scripts/bundleUpdate.js
+++ b/scripts/bundleUpdate.js
@@ -3,25 +3,17 @@ const fs = require('fs')
 const fsp = fs.promises
 const path = require('path')
 
-const IOS_DIST_DIR = './ios-dist'
-const ANDROID_DIST_DIR = './android-dist'
-
+const DIST_DIR = './dist'
 const BUNDLES_DIR = '/_expo/static/js'
-
-const IOS_BUNDLE_DIR = path.join(IOS_DIST_DIR, BUNDLES_DIR, '/ios')
-const ANDROID_BUNDLE_DIR = path.join(ANDROID_DIST_DIR, BUNDLES_DIR, '/android')
-
-const IOS_METADATA_PATH = path.join(IOS_DIST_DIR, '/metadata.json')
-const ANDROID_METADATA_PATH = path.join(ANDROID_DIST_DIR, '/metadata.json')
-
+const IOS_BUNDLE_DIR = path.join(DIST_DIR, BUNDLES_DIR, '/ios')
+const ANDROID_BUNDLE_DIR = path.join(DIST_DIR, BUNDLES_DIR, '/android')
+const METADATA_PATH = path.join(DIST_DIR, '/metadata.json')
 const DEST_DIR = './bundleTempDir'
 
 // Weird, don't feel like figuring out _why_ it wants this
-const IOS_METADATA = require(`../${IOS_METADATA_PATH}`)
-const ANDROID_METADATA = require(`../${ANDROID_METADATA_PATH}`)
-
-const IOS_METADATA_ASSETS = IOS_METADATA.fileMetadata.ios.assets
-const ANDROID_METADATA_ASSETS = ANDROID_METADATA.fileMetadata.android.assets
+const METADATA = require(`../${METADATA_PATH}`)
+const IOS_METADATA_ASSETS = METADATA.fileMetadata.ios.assets
+const ANDROID_METADATA_ASSETS = METADATA.fileMetadata.android.assets
 
 const getMd5 = async path => {
   return new Promise(res => {
@@ -68,7 +60,7 @@ const moveFiles = async () => {
 
   console.log('Getting ios asset md5s and moving them...')
   for (const asset of IOS_METADATA_ASSETS) {
-    const currPath = path.join(IOS_DIST_DIR, asset.path)
+    const currPath = path.join(DIST_DIR, asset.path)
     const md5 = await getMd5(currPath)
     const withExtPath = `assets/${md5}.${asset.ext}`
     iosAssets.push(withExtPath)
@@ -77,7 +69,7 @@ const moveFiles = async () => {
 
   console.log('Getting android asset md5s and moving them...')
   for (const asset of ANDROID_METADATA_ASSETS) {
-    const currPath = path.join(ANDROID_DIST_DIR, asset.path)
+    const currPath = path.join(DIST_DIR, asset.path)
     const md5 = await getMd5(currPath)
     const withExtPath = `assets/${md5}.${asset.ext}`
     androidAssets.push(withExtPath)