expo-updates 0.27.3 → 0.27.4

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.27.4 — 2025-03-18
+
+### 🎉 New features
+
+- Support brownfield apps with EX_UPDATES_CUSTOM_INIT flag. ([#35391](https://github.com/expo/expo/pull/35391) by [@douglowder](https://github.com/douglowder))
+
 ## 0.27.3 — 2025-03-11
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.google.devtools.ksp'
 
 group = 'host.exp.exponent'
-version = '0.27.3'
+version = '0.27.4'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -49,6 +49,10 @@ def getBoolStringFromPropOrEnv(String name, Boolean defaultValue) {
 // debug builds. (default false)
 def exUpdatesNativeDebug = getBoolStringFromPropOrEnv("EX_UPDATES_NATIVE_DEBUG", false)
 
+// If true, app is using custom code to initialize expo-updates, so default initialization code
+// will be disabled.
+def exUpdatesCustomInit = getBoolStringFromPropOrEnv("EX_UPDATES_CUSTOM_INIT", false)
+
 // If true, code will run that delays app loading until updates is initialized, to prevent ANR issues.
 // (default true)
 def exUpdatesAndroidDelayLoadApp = getBoolStringFromPropOrEnv("EX_UPDATES_ANDROID_DELAY_LOAD_APP", true)
@@ -63,11 +67,12 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '0.27.3'
+    versionName '0.27.4'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     buildConfigField("boolean", "EX_UPDATES_NATIVE_DEBUG", exUpdatesNativeDebug)
+    buildConfigField("boolean", "EX_UPDATES_CUSTOM_INIT", exUpdatesCustomInit)
     buildConfigField("boolean", "EX_UPDATES_ANDROID_DELAY_LOAD_APP", exUpdatesAndroidDelayLoadApp)
     buildConfigField("boolean", "USE_DEV_CLIENT", useDevClient.toString())
   }

package/android/src/main/java/expo/modules/updates/IUpdatesController.kt

@@ -108,7 +108,7 @@ interface IUpdatesController {
       this["runtimeVersion"] = runtimeVersion ?: ""
       this["checkAutomatically"] = checkOnLaunch.toJSString()
       this["channel"] = requestHeaders["expo-channel-name"] ?: ""
-      this["shouldDeferToNativeForAPIMethodAvailabilityInDevelopment"] = shouldDeferToNativeForAPIMethodAvailabilityInDevelopment || BuildConfig.EX_UPDATES_NATIVE_DEBUG
+      this["shouldDeferToNativeForAPIMethodAvailabilityInDevelopment"] = shouldDeferToNativeForAPIMethodAvailabilityInDevelopment || UpdatesPackage.isUsingNativeDebug
       this["initialContext"] = initialContext.bundle
 
       if (launchedUpdate != null) {

package/android/src/main/java/expo/modules/updates/UpdatesController.kt

@@ -33,7 +33,7 @@ class UpdatesController {
         return
       }
       val useDeveloperSupport = (context as? ReactApplication)?.reactNativeHost?.useDeveloperSupport ?: false
-      if (useDeveloperSupport && !BuildConfig.EX_UPDATES_NATIVE_DEBUG) {
+      if (useDeveloperSupport && !UpdatesPackage.isUsingNativeDebug) {
         if (BuildConfig.USE_DEV_CLIENT) {
           val devLauncherController = initializeAsDevLauncherWithoutStarting(context)
           singletonInstance = devLauncherController

package/android/src/main/java/expo/modules/updates/UpdatesPackage.kt

@@ -22,7 +22,6 @@ import kotlinx.coroutines.withContext
  * applicable environments.
  */
 class UpdatesPackage : Package {
-  private val useNativeDebug = BuildConfig.EX_UPDATES_NATIVE_DEBUG
 
   override fun createReactNativeHostHandlers(context: Context): List<ReactNativeHostHandler> {
     val handler: ReactNativeHostHandler = object : ReactNativeHostHandler {
@@ -57,12 +56,12 @@ class UpdatesPackage : Package {
   override fun createReactActivityHandlers(activityContext: Context): List<ReactActivityHandler> {
     val handler = object : ReactActivityHandler {
       override fun getDelayLoadAppHandler(activity: ReactActivity, reactNativeHost: ReactNativeHost): ReactActivityHandler.DelayLoadAppHandler? {
-        if (!BuildConfig.EX_UPDATES_ANDROID_DELAY_LOAD_APP) {
+        if (!BuildConfig.EX_UPDATES_ANDROID_DELAY_LOAD_APP || isUsingCustomInit) {
           return null
         }
         val context = activity.applicationContext
         val useDeveloperSupport = reactNativeHost.useDeveloperSupport
-        if (!useDeveloperSupport || BuildConfig.EX_UPDATES_NATIVE_DEBUG) {
+        if (!useDeveloperSupport || isUsingNativeDebug) {
           return ReactActivityHandler.DelayLoadAppHandler { whenReadyRunnable ->
             CoroutineScope(Dispatchers.IO).launch {
               startUpdatesController(context)
@@ -76,9 +75,11 @@ class UpdatesPackage : Package {
       @WorkerThread
       private suspend fun startUpdatesController(context: Context) {
         withContext(Dispatchers.IO) {
-          UpdatesController.initialize(context)
-          // Call the synchronous `launchAssetFile()` function to wait for updates ready
-          UpdatesController.instance.launchAssetFile
+          if (!UpdatesPackage.isUsingCustomInit) {
+            UpdatesController.initialize(context)
+            // Call the synchronous `launchAssetFile()` function to wait for updates ready
+            UpdatesController.instance.launchAssetFile
+          }
         }
       }
 
@@ -119,5 +120,7 @@ class UpdatesPackage : Package {
 
   companion object {
     private val TAG = UpdatesPackage::class.java.simpleName
+    val isUsingNativeDebug = BuildConfig.EX_UPDATES_NATIVE_DEBUG
+    internal val isUsingCustomInit = BuildConfig.EX_UPDATES_CUSTOM_INIT
   }
 }

package/e2e/fixtures/project_files/eas.json

@@ -24,9 +24,6 @@
     },
     "updates_testing_debug": {
       "extends": "base",
-      "env": {
-        "EX_UPDATES_NATIVE_DEBUG": "1"
-      },
       "android": {
         "applicationArchivePath": "eas.json",
         "gradleCommand": ":app:assembleDebug :app:assembleAndroidTest -DtestBuildType=debug",
@@ -42,9 +39,6 @@
     },
     "updates_testing_release": {
       "extends": "base",
-      "env": {
-        "EX_UPDATES_NATIVE_DEBUG": "1"
-      },
       "android": {
         "gradleCommand": ":app:assembleRelease :app:assembleAndroidTest -DtestBuildType=release",
         "withoutCredentials": true

package/e2e/setup/project.ts

@@ -757,7 +757,6 @@ export async function initAsync(
   await spawnAsync(localCliBin, ['prebuild', '--no-install', '--template', localTemplatePathName], {
     env: {
       ...process.env,
-      EX_UPDATES_NATIVE_DEBUG: '1',
       EXPO_DEBUG: '1',
       CI: '1',
     },
@@ -784,7 +783,7 @@ export async function initAsync(
   // enable proguard on Android
   await fs.appendFile(
     path.join(projectRoot, 'android', 'gradle.properties'),
-    '\nandroid.enableProguardInReleaseBuilds=true\nEXPO_UPDATES_NATIVE_DEBUG=true',
+    '\nandroid.enableProguardInReleaseBuilds=true\nEX_UPDATES_NATIVE_DEBUG=true',
     'utf-8'
   );
 
@@ -804,6 +803,18 @@ export async function initAsync(
     ].join('\n'),
     'utf-8'
   );
+
+  // Add native debug to iOS Podfile.properties.json
+  const podfilePropertiesJsonPath = path.join(projectRoot, 'ios', 'Podfile.properties.json');
+  const podfilePropertiesJsonString = await fs.readFile(podfilePropertiesJsonPath, {
+    encoding: 'utf-8',
+  });
+  const podfilePropertiesJson: any = JSON.parse(podfilePropertiesJsonString);
+  podfilePropertiesJson.updatesNativeDebug = 'true';
+  await fs.writeFile(podfilePropertiesJsonPath, JSON.stringify(podfilePropertiesJson, null, 2), {
+    encoding: 'utf-8',
+  });
+
   await fs.appendFile(
     path.join(projectRoot, 'android', 'app', 'build.gradle'),
     [

package/expo-updates-gradle-plugin/src/main/kotlin/expo/modules/updates/ExpoUpdatesPlugin.kt

@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.util.Locale
+import java.util.Properties
 
 abstract class ExpoUpdatesPlugin : Plugin<Project> {
   override fun apply(project: Project) {
@@ -26,7 +27,7 @@ abstract class ExpoUpdatesPlugin : Plugin<Project> {
     val entryFile = detectedEntryFile(reactExtension)
     val androidComponents = project.extensions.getByType(AndroidComponentsExtension::class.java)
 
-    if (System.getenv("EX_UPDATES_NATIVE_DEBUG") == "1") {
+    if (isNativeDebuggingEnabled(project)) {
       logger.warn("Disable all react.debuggableVariants because EX_UPDATES_NATIVE_DEBUG=1")
       reactExtension.debuggableVariants.set(listOf())
     }
@@ -126,3 +127,10 @@ private fun detectedEntryFile(config: ReactExtension): File {
     else -> File(reactRoot, "index.js")
   }
 }
+
+private fun isNativeDebuggingEnabled(project: Project): Boolean {
+  if (System.getenv("EX_UPDATES_NATIVE_DEBUG") == "1") {
+    return true
+  }
+  return project.findProperty("EX_UPDATES_NATIVE_DEBUG") == "true"
+}

package/ios/EXUpdates/ReactDelegateHandler/ExpoUpdatesReactDelegateHandler.swift

@@ -22,6 +22,10 @@ public final class ExpoUpdatesReactDelegateHandler: ExpoReactDelegateHandler, Ap
     initialProperties: [AnyHashable: Any]?,
     launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> UIView? {
+    if UpdatesUtils.isUsingCustomInitialization() {
+      return nil
+    }
+
     AppController.initializeWithoutStarting()
     let controller = AppController.sharedInstance
     if !controller.isActiveController {
@@ -59,6 +63,9 @@ public final class ExpoUpdatesReactDelegateHandler: ExpoReactDelegateHandler, Ap
   // MARK: AppControllerDelegate implementations
 
   public func appController(_ appController: AppControllerInterface, didStartWithSuccess success: Bool) {
+    if UpdatesUtils.isUsingCustomInitialization() {
+      return
+    }
     guard let reactDelegate = self.reactDelegate else {
       fatalError("`reactDelegate` should not be nil")
     }

package/ios/EXUpdates/UpdatesUtils.swift

@@ -133,7 +133,7 @@ public final class UpdatesUtils: NSObject {
     }
   }
 
-  internal static func isNativeDebuggingEnabled() -> Bool {
+  public static func isNativeDebuggingEnabled() -> Bool {
 #if EX_UPDATES_NATIVE_DEBUG
     return true
 #else
@@ -141,6 +141,14 @@ public final class UpdatesUtils: NSObject {
 #endif
   }
 
+  internal static func isUsingCustomInitialization() -> Bool {
+#if EX_UPDATES_CUSTOM_INIT
+    return true
+#else
+    return false
+#endif
+  }
+
   internal static func runBlockOnMainThread(_ block: @escaping () -> Void) {
     if Thread.isMainThread {
       block()

package/ios/EXUpdates.podspec

@@ -3,9 +3,19 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 podfile_properties = JSON.parse(File.read("#{Pod::Config.instance.installation_root}/Podfile.properties.json")) rescue {}
 
+if ENV['EX_UPDATES_NATIVE_DEBUG'] != '1'
+  ENV['EX_UPDATES_NATIVE_DEBUG'] = podfile_properties['updatesNativeDebug'] == 'true' ? '1' : '0'
+end
+if ENV['EX_UPDATES_CUSTOM_INIT'] != '1'
+  ENV['EX_UPDATES_CUSTOM_INIT'] = podfile_properties['updatesCustomInit'] == 'true' ? '1' : '0'
+end
+
 use_dev_client = false
 begin
-  use_dev_client = `node --print "require('expo-dev-client/package.json').version" 2>/dev/null`.length > 0
+  # No dev client if we are using native debug
+  if ENV['EX_UPDATES_NATIVE_DEBUG'] != '1'
+    use_dev_client = `node --print "require('expo-dev-client/package.json').version" 2>/dev/null`.length > 0
+  end
 rescue
   use_dev_client = false
 end
@@ -43,17 +53,26 @@ Pod::Spec.new do |s|
   end
   install_modules_dependencies(s)
 
-  other_c_flags = '$(inherited)'
-  other_swift_flags = '$(inherited)'
+  other_debug_c_flags = '$(inherited)'
+  other_debug_swift_flags = '$(inherited)'
+  other_release_c_flags = '$(inherited)'
+  other_release_swift_flags = '$(inherited)'
 
   ex_updates_native_debug = ENV['EX_UPDATES_NATIVE_DEBUG'] == '1'
+  ex_updates_custom_init = ENV['EX_UPDATES_CUSTOM_INIT'] == '1'
   if ex_updates_native_debug
-    other_c_flags << ' -DEX_UPDATES_NATIVE_DEBUG=1'
-    other_swift_flags << ' -DEX_UPDATES_NATIVE_DEBUG'
+    other_debug_c_flags << ' -DEX_UPDATES_NATIVE_DEBUG=1'
+    other_debug_swift_flags << ' -DEX_UPDATES_NATIVE_DEBUG'
+  end
+  if ex_updates_custom_init
+    other_debug_c_flags << ' -DEX_UPDATES_CUSTOM_INIT=1'
+    other_debug_swift_flags << ' -DEX_UPDATES_CUSTOM_INIT'
+    other_release_c_flags << ' -DEX_UPDATES_CUSTOM_INIT=1'
+    other_release_swift_flags << ' -DEX_UPDATES_CUSTOM_INIT'
   end
   if use_dev_client
-    other_c_flags << ' -DUSE_DEV_CLIENT=1'
-    other_swift_flags << ' -DUSE_DEV_CLIENT'
+    other_debug_c_flags << ' -DUSE_DEV_CLIENT=1'
+    other_debug_swift_flags << ' -DUSE_DEV_CLIENT'
   end
 
   s.pod_target_xcconfig = {
@@ -61,8 +80,10 @@ Pod::Spec.new do |s|
     'GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS' => 'YES',
     'DEFINES_MODULE' => 'YES',
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
-    'OTHER_CFLAGS[config=*Debug*]' => other_c_flags,
-    'OTHER_SWIFT_FLAGS[config=*Debug*]' => other_swift_flags
+    'OTHER_CFLAGS[config=*Debug*]' => other_debug_c_flags,
+    'OTHER_SWIFT_FLAGS[config=*Debug*]' => other_debug_swift_flags,
+    'OTHER_CFLAGS[config=*Release*]' => other_release_c_flags,
+    'OTHER_SWIFT_FLAGS[config=*Release*]' => other_release_swift_flags
   }
   s.user_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/Swift Compatibility Header"',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -67,5 +67,5 @@
     "expo": "*",
     "react": "*"
   },
-  "gitHead": "bf63b042785a27b713485db0171eb0500abfa582"
+  "gitHead": "3d777be5908ef1cfd1aab88e9807a6b0295ae96b"
 }