expo 49.0.0-alpha.3 → 49.0.0-alpha.4

package/android/build.gradle

@@ -33,7 +33,7 @@ def getRNVersion() {
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '49.0.0-alpha.3'
+version = '49.0.0-alpha.4'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -65,19 +65,11 @@ buildscript {
   }
 }
 
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate {
   publishing {
     publications {
       release(MavenPublication) {
         from components.release
-        // Add additional sourcesJar to artifacts
-        artifact(androidSourcesJar)
       }
     }
     repositories {
@@ -100,11 +92,12 @@ android {
     jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
+  namespace "expo.core"
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 1
-    versionName "49.0.0-alpha.3"
+    versionName "49.0.0-alpha.4"
     consumerProguardFiles("proguard-rules.pro")
   }
   lintOptions {
@@ -132,13 +125,18 @@ android {
       }
     }
   }
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 dependencies { dependencyHandler ->
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
 
-  testImplementation 'junit:junit:4.13.1'
+  testImplementation 'junit:junit:4.13.2'
   testImplementation 'androidx.test:core:1.4.0'
   testImplementation "com.google.truth:truth:1.1.2"
   testImplementation 'io.mockk:mockk:1.12.0'

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
-<manifest package="expo.core">
+<manifest>
 
 </manifest>

package/android/src/main/java/expo/modules/ReactActivityDelegateWrapper.kt

@@ -34,6 +34,14 @@ class ReactActivityDelegateWrapper(
   private val reactActivityHandlers = ExpoModulesPackage.packageList
     .flatMap { it.createReactActivityHandlers(activity) }
   private val methodMap: ArrayMap<String, Method> = ArrayMap()
+  private val host: ReactNativeHost by lazy {
+    invokeDelegateMethod("getReactNativeHost")
+  }
+  /**
+   * When the app delay for `loadApp`, the ReactInstanceManager's lifecycle will be disrupted.
+   * This flag indicates we should emit `onResume` after `loadApp`.
+   */
+  private var shouldEmitPendingResume = false
 
   //region ReactActivityDelegate
 
@@ -50,7 +58,7 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun getReactNativeHost(): ReactNativeHost {
-    return invokeDelegateMethod("getReactNativeHost")
+    return host
   }
 
   override fun getReactInstanceManager(): ReactInstanceManager {
@@ -76,9 +84,23 @@ class ReactActivityDelegateWrapper(
       reactDelegate.loadApp(appKey)
       rootViewContainer.addView(reactDelegate.reactRootView, ViewGroup.LayoutParams.MATCH_PARENT)
       activity.setContentView(rootViewContainer)
-    } else {
-      return invokeDelegateMethod("loadApp", arrayOf(String::class.java), arrayOf(appKey))
+      return
     }
+
+    val delayLoadAppHandler = reactActivityHandlers.asSequence()
+      .mapNotNull { it.getDelayLoadAppHandler(activity, host) }
+      .firstOrNull()
+    if (delayLoadAppHandler != null) {
+      delayLoadAppHandler.whenReady {
+        invokeDelegateMethod<Unit, String?>("loadApp", arrayOf(String::class.java), arrayOf(appKey))
+        if (shouldEmitPendingResume) {
+          onResume()
+        }
+      }
+      return
+    }
+
+    return invokeDelegateMethod("loadApp", arrayOf(String::class.java), arrayOf(appKey))
   }
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -123,13 +145,23 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onResume() {
+    if (!host.hasInstance()) {
+      shouldEmitPendingResume = true
+      return
+    }
     invokeDelegateMethod<Unit>("onResume")
     reactActivityLifecycleListeners.forEach { listener ->
       listener.onResume(activity)
     }
+    shouldEmitPendingResume = false
   }
 
   override fun onPause() {
+    // If app is stopped before delayed `loadApp`, we should cancel the pending resume
+    shouldEmitPendingResume = false
+    if (!host.hasInstance()) {
+      return
+    }
     reactActivityLifecycleListeners.forEach { listener ->
       listener.onPause(activity)
     }
@@ -137,6 +169,11 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onDestroy() {
+    // If app is stopped before delayed `loadApp`, we should cancel the pending resume
+    shouldEmitPendingResume = false
+    if (!host.hasInstance()) {
+      return
+    }
     reactActivityLifecycleListeners.forEach { listener ->
       listener.onDestroy(activity)
     }

package/android/src/test/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest package="expo.modules.appauth"
-          xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
     <application>
 

package/bundledNativeModules.json

@@ -13,49 +13,49 @@
   "expo-app-auth": "~11.1.0",
   "expo-app-loader-provider": "~8.0.0",
   "expo-apple-authentication": "~6.1.0",
-  "expo-application": "~5.2.0",
-  "expo-asset": "~8.9.2",
+  "expo-application": "~5.3.0",
+  "expo-asset": "~8.10.0",
   "expo-auth-session": "~4.1.0",
   "expo-av": "~13.3.0",
   "expo-background-fetch": "~11.2.0",
-  "expo-barcode-scanner": "~12.4.0",
-  "expo-battery": "~7.2.0",
-  "expo-blur": "~12.3.1",
+  "expo-barcode-scanner": "~12.5.0",
+  "expo-battery": "~7.3.0",
+  "expo-blur": "~12.3.2",
   "expo-brightness": "~11.3.0",
   "expo-build-properties": "~0.7.0",
   "expo-calendar": "~11.2.0",
-  "expo-camera": "~13.3.0",
+  "expo-camera": "~13.4.0",
   "expo-cellular": "~5.2.0",
   "expo-checkbox": "~2.4.0",
   "expo-clipboard": "~4.2.0",
-  "expo-constants": "~14.3.0",
+  "expo-constants": "~14.4.0",
   "expo-contacts": "~12.1.0",
-  "expo-crypto": "~12.3.0",
+  "expo-crypto": "~12.4.0",
   "expo-dev-client": "~2.3.0",
   "expo-device": "~5.3.0",
   "expo-document-picker": "~11.4.0",
   "expo-face-detector": "~12.1.2",
-  "expo-file-system": "~15.3.0",
-  "expo-font": "~11.2.0",
-  "expo-gl": "~12.5.0",
+  "expo-file-system": "~15.4.0",
+  "expo-font": "~11.3.0",
+  "expo-gl": "~13.0.0",
   "expo-google-app-auth": "~8.3.0",
   "expo-haptics": "~12.3.0",
-  "expo-image": "~1.2.2",
-  "expo-image-loader": "~4.2.0",
+  "expo-image": "~1.3.0",
+  "expo-image-loader": "~4.3.0",
   "expo-image-manipulator": "~11.2.0",
-  "expo-image-picker": "~14.2.0",
+  "expo-image-picker": "~14.3.0",
   "expo-in-app-purchases": "~14.2.0",
   "expo-intent-launcher": "~10.6.0",
-  "expo-keep-awake": "~12.1.0",
+  "expo-keep-awake": "~12.2.0",
   "expo-linear-gradient": "~12.2.0",
   "expo-linking": "~4.1.0",
-  "expo-local-authentication": "~13.4.0",
+  "expo-local-authentication": "~13.4.1",
   "expo-localization": "~14.2.0",
-  "expo-location": "~15.2.0",
+  "expo-location": "~15.3.0",
   "expo-mail-composer": "~12.2.0",
   "expo-media-library": "~15.3.0",
   "expo-module-template": "~10.7.19",
-  "expo-modules-core": "~1.3.2",
+  "expo-modules-core": "~1.4.0",
   "expo-navigation-bar": "~2.2.0",
   "expo-network": "~5.3.0",
   "expo-notifications": "~0.19.0",
@@ -63,8 +63,8 @@
   "expo-print": "~12.3.0",
   "expo-random": "~13.1.2",
   "expo-screen-capture": "~5.2.0",
-  "expo-screen-orientation": "~5.2.0",
-  "expo-secure-store": "~12.2.0",
+  "expo-screen-orientation": "~6.0.0-beta.1",
+  "expo-secure-store": "~12.3.0",
   "expo-sensors": "~12.2.0",
   "expo-sharing": "~11.4.0",
   "expo-sms": "~11.3.0",
@@ -82,24 +82,24 @@
   "lottie-react-native": "5.1.4",
   "react": "18.2.0",
   "react-dom": "18.2.0",
-  "react-native": "0.71.7",
+  "react-native": "0.72.0-rc.5",
   "react-native-web": "~0.18.10",
   "react-native-branch": "^5.4.0",
-  "react-native-gesture-handler": "~2.9.0",
+  "react-native-gesture-handler": "~2.10.1",
   "react-native-get-random-values": "~1.8.0",
   "react-native-maps": "1.3.2",
   "react-native-pager-view": "6.1.2",
-  "react-native-reanimated": "~3.0.2",
+  "react-native-reanimated": "~3.1.0",
   "react-native-screens": "~3.20.0",
   "react-native-safe-area-context": "4.5.0",
   "react-native-shared-element": "0.8.8",
   "react-native-svg": "13.4.0",
   "react-native-view-shot": "3.5.0",
   "react-native-webview": "11.26.0",
-  "sentry-expo": "~6.1.0",
+  "sentry-expo": "~6.2.0",
   "unimodules-app-loader": "~4.1.2",
   "unimodules-image-loader-interface": "~6.1.0",
   "@shopify/react-native-skia": "0.1.172",
   "@shopify/flash-list": "1.4.0",
-  "@sentry/react-native": "4.13.0"
+  "@sentry/react-native": "4.15.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "49.0.0-alpha.3",
+  "version": "49.0.0-alpha.4",
   "description": "The Expo SDK",
   "main": "build/Expo.js",
   "module": "build/Expo.js",
@@ -58,19 +58,19 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo",
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@expo/cli": "0.8.0",
+    "@expo/cli": "0.9.1",
     "@expo/vector-icons": "^13.0.0",
-    "@expo/config-plugins": "7.0.0",
+    "@expo/config-plugins": "7.1.0",
     "@expo/config": "8.0.4",
-    "babel-preset-expo": "~9.4.0",
-    "expo-application": "~5.2.0",
-    "expo-asset": "~8.9.2",
-    "expo-constants": "~14.3.0",
-    "expo-file-system": "~15.3.0",
-    "expo-font": "~11.2.0",
-    "expo-keep-awake": "~12.1.0",
-    "expo-modules-autolinking": "1.3.0",
-    "expo-modules-core": "1.3.2",
+    "babel-preset-expo": "~9.4.1",
+    "expo-application": "~5.3.0",
+    "expo-asset": "~8.10.0",
+    "expo-constants": "~14.4.0",
+    "expo-file-system": "~15.4.0",
+    "expo-font": "~11.3.0",
+    "expo-keep-awake": "~12.2.0",
+    "expo-modules-autolinking": "1.4.0",
+    "expo-modules-core": "1.4.0",
     "fbemitter": "^3.0.0",
     "invariant": "^2.2.4",
     "md5-file": "^3.2.3",
@@ -84,10 +84,10 @@
     "@types/react": "~18.0.14",
     "@types/react-test-renderer": "^18.0.0",
     "@types/uuid": "^3.4.7",
-    "expo-module-scripts": "^3.0.8",
+    "expo-module-scripts": "^3.0.9",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-native": "0.71.7"
+    "react-native": "0.72.0-rc.5"
   },
-  "gitHead": "66ba892e6d9d66854308f91ee566074924025d4d"
+  "gitHead": "3ccd2edee9cbfed217557675cb50f0ba5e55a9e4"
 }

package/react-native.config.js

@@ -1,12 +1,56 @@
+const findProjectRoot = require('@react-native-community/cli-tools').findProjectRoot;
+const fs = require('fs');
 const path = require('path');
 
+const projectRoot = findProjectRoot();
+
+function isMatchedInFile(filePath, regexp) {
+  const contents = fs.readFileSync(filePath, 'utf8');
+  return !!contents.match(regexp);
+}
+
+/**
+ * Checks if expo-modules-autolinking is setup on iOS
+ */
+function isExpoModulesInstalledIos(projectRoot) {
+  const podfilePath = path.join(projectRoot, 'ios', 'Podfile');
+  if (!fs.existsSync(podfilePath)) {
+    // Assumes true for managed apps
+    return true;
+  }
+  return isMatchedInFile(
+    podfilePath,
+    /^\s*require File.join\(File\.dirname\(`node --print "require\.resolve\('expo\/package\.json'\)"`\), "scripts\/autolinking"\)\s*$/m
+  );
+}
+
+/**
+ * Checks if expo-modules-autolinking is setup on Android
+ */
+function isExpoModulesInstalledAndroid(projectRoot) {
+  const gradlePath = path.join(projectRoot, 'android', 'settings.gradle');
+  if (!fs.existsSync(gradlePath)) {
+    // Assumes true for managed apps
+    return true;
+  }
+  return isMatchedInFile(
+    gradlePath,
+    /^\s*apply from: (new File|file)\(\["node", "--print", "require\.resolve\('expo\/package.json'\)"\]\.execute\(null, rootDir\)\.text\.trim\(\), "\.\.\/scripts\/autolinking\.gradle"\);?\s*$/m
+  );
+}
+
 module.exports = {
   dependency: {
     platforms: {
-      ios: {},
-      android: {
-        packageImportPath: 'import expo.modules.ExpoModulesPackage;',
-      },
+      // To make Expo CLI works on bare react-native projects without installing Expo Modules, we disable autolinking in this case.
+      ios: !isExpoModulesInstalledIos(projectRoot) ? null : {},
+      android: !isExpoModulesInstalledAndroid(projectRoot)
+        ? null
+        : {
+            packageImportPath: 'import expo.modules.ExpoModulesPackage;',
+          },
+      macos: null,
+      windows: null,
     },
   },
 };