[DO NOT MERGE] - eas spike

.gitignore

@@ -143,14 +143,20 @@ Brewfile.lock.json
 # for tsconfig `incremental`
 tsconfig.tsbuildinfo
 
-
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
 
+# expo
+.easignore
+
 #########################################################
 # Keep this rule last.
 # Keep these, so we can keep the folders these appear in.
 !.gitkeep
 #########################################################
 
-main.jsbundle.map
+main.jsbundle.map
+# Expo
+.expo
+dist/
+web-build/

.husky/pre-commit

@@ -1,5 +1,10 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
+# Skip pre-commit during a merge
+if git rev-parse -q --verify MERGE_HEAD > /dev/null 2>&1; then
+    echo "Merge in progress; skipping pre-commit hook."
+    exit 0
+fi
 
 yarn lint-staged

android/app/build.gradle

@@ -10,7 +10,6 @@ project.ext.envConfigFiles = [
 ]
 
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
-apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
 
 /**
  * This is the configuration block to customize your React Native Android app.
@@ -62,6 +61,11 @@ react {
 
     /* Autolinking */
     autolinkLibrariesWithApp()
+    //
+    // Added by install-expo-modules
+    entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
+    cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim())
+    bundleCommand = "export:embed"
 }
 
 /**

android/app/src/main/java/net/artsy/app/MainActivity.kt

@@ -1,4 +1,5 @@
 package net.artsy.app
+import expo.modules.ReactActivityDelegateWrapper
 
 import android.graphics.Color
 import android.os.Build
@@ -34,7 +35,7 @@ class MainActivity : ReactActivity() {
      * which allows you to enable New Architecture with a single boolean flag [fabricEnabled].
      */
     override fun createReactActivityDelegate(): ReactActivityDelegate =
-        DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+        ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled))
 
     private fun isTablet(): Boolean {
         return (this.resources.configuration.screenLayout

android/app/src/main/java/net/artsy/app/MainApplication.kt

@@ -1,4 +1,7 @@
 package net.artsy.app
+import android.content.res.Configuration
+import expo.modules.ApplicationLifecycleDispatcher
+import expo.modules.ReactNativeHostWrapper
 
 import android.app.Application
 import android.content.Context
@@ -16,15 +19,14 @@ import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.soloader.SoLoader
 import com.google.firebase.messaging.FirebaseMessaging
-import com.microsoft.codepush.react.CodePush
 import com.segment.analytics.Analytics
 import net.artsy.app.utils.ReactNativeConfigUtils
 import io.sentry.react.RNSentryPackage
 
 class MainApplication : Application(), ReactApplication {
 
     override val reactNativeHost: ReactNativeHost =
-      object : DefaultReactNativeHost(this) {
+      ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
         override fun getPackages(): List<ReactPackage> =
             PackageList(this).packages.apply {
               // Packages that cannot be autolinked yet can be added manually here, for example:
@@ -38,10 +40,10 @@ class MainApplication : Application(), ReactApplication {
 
         override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
         override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-      }
+      })
 
   override val reactHost: ReactHost
-    get() = getDefaultReactHost(applicationContext, reactNativeHost)
+    get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost)
 
 
     override fun onCreate() {
@@ -66,5 +68,11 @@ class MainApplication : Application(), ReactApplication {
         Analytics.setSingletonInstance(analytics)
 
         registerActivityLifecycleCallbacks(BrazeActivityLifecycleCallbackListener())
-    }
+      ApplicationLifecycleDispatcher.onApplicationCreate(this)
+  }
+
+  override fun onConfigurationChanged(newConfig: Configuration) {
+    super.onConfigurationChanged(newConfig)
+    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
+  }
 }

android/app/src/main/res/values/strings.xml

@@ -3,5 +3,4 @@
     <string name="facebook_app_id">308278682573501</string>
     <string name="facebook_client_token">5407e54f59d45eab502144b2e6943c6e</string>
     <string name="fb_login_protocol_scheme">fb308278682573501</string>
-    <string moduleConfig="true" name="CodePushDeploymentKey">fake_deployment_key</string>
 </resources>

android/settings.gradle

@@ -2,6 +2,8 @@ pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
 plugins { id("com.facebook.react.settings") }
 extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'Artsy'
-include ':app', ':react-native-code-push'
-project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
+
+apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
+useExpoModules()

app.json

@@ -3,5 +3,13 @@
   "version": "8.59.0",
   "isAndroidBeta": false,
   "codePushReleaseName": "none",
-  "codePushDist": "none"
+  "codePushDist": "none",
+  "expo": {
+    "name": "Artsy"
+  },
+  "extra": {
+    "eas": {
+      "projectId": "39b092dc-effa-4d59-a530-85107bdfd668"
+    }
+  }
 }

babel.config.js

@@ -37,7 +37,7 @@ module.exports = (api) => {
     // presets run after
     presets: [
       [
-        "module:@react-native/babel-preset",
+        "babel-preset-expo",
         { useTransformReactJSXExperimental: true }, // this is so `import React from "react"` is not needed.
       ],
       // TODO: Remove this once we determine if its actually needed. Added during reanimated upgrade.

eas.json

@@ -0,0 +1,30 @@
+{
+  "cli": {
+    "version": "14.1.0",
+    "appVersionSource": "remote"
+  },
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal",
+      "ios": {
+        "scheme": "Artsy",
+        "buildConfiguration": "Debug"
+      }
+    },
+    "preview": {
+      "distribution": "internal",
+      "ios": {
+        "scheme": "Artsy",
+        "buildConfiguration": "Debug",
+        "simulator": true
+      }
+    },
+    "production": {
+      "autoIncrement": true
+    }
+  },
+  "submit": {
+    "production": {}
+  }
+}