expo-modules-core 0.11.0 → 0.11.1

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.11.1 — 2022-07-11
+
+### 🐛 Bug fixes
+
+- Fixed a crash when remote debugging is enabled on Android. ([#18165](https://github.com/expo/expo/pull/18165) by [@kudo](https://github.com/kudo))
+
 ## 0.11.0 — 2022-07-07
 
 ### 🎉 New features

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '0.11.0'
+version = '0.11.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -144,7 +144,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "0.11.0"
+    versionName "0.11.1"
 
     testInstrumentationRunner "expo.modules.TestRunner"
 

package/android/src/main/java/expo/modules/kotlin/AppContext.kt

@@ -89,13 +89,15 @@ class AppContext(
   fun installJSIInterop() {
     jsiInterop = JSIInteropModuleRegistry(this)
     val reactContext = reactContextHolder.get() ?: return
-    reactContext.javaScriptContextHolder?.get()?.let {
-      jsiInterop.installJSI(
-        it,
-        reactContext.catalystInstance.jsCallInvokerHolder as CallInvokerHolderImpl,
-        reactContext.catalystInstance.nativeCallInvokerHolder as CallInvokerHolderImpl
-      )
-    }
+    reactContext.javaScriptContextHolder?.get()
+      ?.takeIf { it != 0L }
+      ?.let {
+        jsiInterop.installJSI(
+          it,
+          reactContext.catalystInstance.jsCallInvokerHolder as CallInvokerHolderImpl,
+          reactContext.catalystInstance.nativeCallInvokerHolder as CallInvokerHolderImpl
+        )
+      }
   }
 
   /**

package/ios/NativeModulesProxy/EXNativeModulesProxy.mm

@@ -201,9 +201,10 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
 
 - (void)setBridge:(RCTBridge *)bridge
 {
-  _appContext = [(ExpoBridgeModule *)[bridge moduleForClass:ExpoBridgeModule.class] appContext];
-  [_appContext setLegacyModuleRegistry:_exModuleRegistry];
-  [_appContext setLegacyModulesProxy:self];
+  ExpoBridgeModule* expoBridgeModule = [bridge moduleForClass:ExpoBridgeModule.class];
+  [expoBridgeModule legacyProxyDidSetBridgeWithLegacyModulesProxy:self
+                                             legacyModuleRegistry:_exModuleRegistry];
+  _appContext = [expoBridgeModule appContext];
 
   if (!_bridge) {
     // The `setBridge` can be called during module setup or after. Registering more modules

package/ios/Swift/AppContext.swift

@@ -28,11 +28,9 @@ public final class AppContext: NSObject {
   /**
    The legacy module registry with modules written in the old-fashioned way.
    */
-  @objc
-  public weak var legacyModuleRegistry: EXModuleRegistry?
+  internal weak var legacyModuleRegistry: EXModuleRegistry?
 
-  @objc
-  public weak var legacyModulesProxy: LegacyNativeModulesProxy?
+  internal weak var legacyModulesProxy: LegacyNativeModulesProxy?
 
   /**
    React bridge of the context's app. Can be `nil` when the bridge

package/ios/Swift/ExpoBridgeModule.swift

@@ -20,8 +20,7 @@ public final class ExpoBridgeModule: NSObject, RCTBridgeModule {
    architecture of Expo modules and the app itself.
    */
   override init() {
-    appContext = AppContext().useModulesProvider("ExpoModulesProvider")
-    appContext.moduleRegistry.register(moduleType: NativeModulesProxyModule.self)
+    appContext = AppContext()
     super.init()
 
     // Listen to React Native notifications posted just before the JS is executed.
@@ -50,6 +49,21 @@ public final class ExpoBridgeModule: NSObject, RCTBridgeModule {
       appContext.reactBridge = bridge
     }
   }
+  
+  /**
+   This should be called inside EXNativeModulesProxy.setBridge()
+   */
+  @objc
+  public func legacyProxyDidSetBridge(legacyModulesProxy: LegacyNativeModulesProxy,
+                                      legacyModuleRegistry: EXModuleRegistry) {
+    appContext.legacyModuleRegistry = legacyModuleRegistry
+    appContext.legacyModulesProxy = legacyModulesProxy
+    
+    // we need to register all the modules after the legacy module registry is set
+    // otherwise legacy modules (e.g. permissions) won't be available in OnCreate { }
+    appContext.useModulesProvider("ExpoModulesProvider")
+    appContext.moduleRegistry.register(moduleType: NativeModulesProxyModule.self)
+  }
 
   // MARK: - Notifications
 

package/ios/Swift/Logging/Logger.swift

@@ -188,6 +188,9 @@ fileprivate func reformatStackSymbol(_ symbol: String) -> String {
 }
 
 fileprivate func describe(value: Any) -> String {
+  if let value = value as? String {
+    return value
+  }
   if let value = value as? CustomDebugStringConvertible {
     return value.debugDescription
   }

package/ios/Swift/Promise.swift

@@ -22,7 +22,11 @@ public struct Promise: AnyArgument {
   }
 
   public func reject(_ error: Error) {
-    rejecter(UnexpectedException(error))
+    if let exception = error as? Exception {
+      rejecter(exception)
+    } else {
+      rejecter(UnexpectedException(error))
+    }
   }
 
   public func reject(_ error: Exception) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "6e131f2da851a47c3a24eb3d6fc971a1a7822086"
+  "gitHead": "8151bf48e683a50e942ef213f7978b35c41f5e11"
 }