@trycourier/courier-react-native 5.7.1 → 6.0.0

package/README.md

@@ -161,8 +161,8 @@ Starter projects using this SDK.
     <tbody>
         <tr width="1000px">
             <td align="left">
-                <a href="https://github.com/trycourier/courier-react-native/tree/master/example">
-                    <code>Example</code>
+                <a href="https://github.com/trycourier/courier-react-native/tree/master/example-085">
+                    <code>Example (React Native 0.85+, New Architecture)</code>
                 </a>
             </td>
         </tr>

package/android/build.gradle

@@ -21,13 +21,16 @@ def isNewArchitectureEnabled() {
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-
 def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
 }
 
+def safeExtGet(prop, fallback) {
+  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["CourierReactNative_" + name]
 }
@@ -61,15 +64,15 @@ android {
     }
   }
 
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  compileSdkVersion safeExtGet("compileSdkVersion", getExtOrIntegerDefault("compileSdkVersion"))
 
   buildFeatures {
     buildConfig true
   }
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    minSdkVersion safeExtGet("minSdkVersion", getExtOrIntegerDefault("minSdkVersion"))
+    targetSdkVersion safeExtGet("targetSdkVersion", getExtOrIntegerDefault("targetSdkVersion"))
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
 
@@ -100,19 +103,20 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
 
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-android:0.73.7"
+  implementation "com.facebook.react:react-android:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // For converting to json
   implementation 'com.google.code.gson:gson:2.11.0'
 
   // Courier Core SDK
-  api 'com.github.trycourier:courier-android:5.3.1'
+  api 'com.github.trycourier:courier-android:6.0.0'
   api 'androidx.recyclerview:recyclerview:1.3.2'
 
+  // Firebase Messaging (needed to resolve RemoteMessage from Courier SDK APIs)
+  compileOnly 'com.google.firebase:firebase-messaging:23.4.1'
+
 }
 
 if (isNewArchitectureEnabled()) {

package/android/gradle.properties

@@ -1,5 +1,5 @@
-CourierReactNative_kotlinVersion=1.7.0
-CourierReactNative_minSdkVersion=23
-CourierReactNative_targetSdkVersion=31
-CourierReactNative_compileSdkVersion=31
-CourierReactNative_ndkversion=21.4.7075529
+CourierReactNative_kotlinVersion=1.9.24
+CourierReactNative_minSdkVersion=24
+CourierReactNative_targetSdkVersion=34
+CourierReactNative_compileSdkVersion=34
+CourierReactNative_ndkversion=26.1.10909125

package/android/src/main/java/com/courierreactnative/CourierClientModule.kt

@@ -77,11 +77,7 @@ class CourierClientModule(
         return@launch
       }
 
-      if (reactActivity == null) {
-        promise.rejectMissingContext()
-        return@launch
-      }
-
+      val context = reactApplicationContext
       val courierDevice = device?.let {
         CourierDevice(
           appId = it.getString("appId"),
@@ -97,7 +93,7 @@ class CourierClientModule(
         client.tokens.putUserToken(
           token = token,
           provider = provider,
-          device = courierDevice ?: CourierDevice.current(reactActivity!!)
+          device = courierDevice ?: CourierDevice.current(context)
         )
         promise.resolve(null)
       } catch (e: Exception) {

package/android/src/main/java/com/courierreactnative/CourierPreferencesViewManager.kt

@@ -43,8 +43,8 @@ class CourierPreferencesViewManager : SimpleViewManager<CourierPreferences>() {
 
   override fun createViewInstance(reactContext: ThemedReactContext): CourierPreferences {
     themedReactContext = reactContext
-    val activity = reactContext.currentActivity as FragmentActivity
-    return CourierReactNativePreferencesView(activity)
+    val context = (reactContext.currentActivity as? FragmentActivity) ?: reactContext
+    return CourierReactNativePreferencesView(context)
   }
 
   @ReactProp(name = "onScrollPreferences")

package/android/src/main/java/com/courierreactnative/CourierSystemModule.kt

@@ -9,24 +9,20 @@ import com.courier.android.models.CourierTrackingEvent.DELIVERED
 import com.courier.android.modules.isPushPermissionGranted
 import com.courier.android.modules.requestNotificationPermission
 import com.courier.android.utils.error
-import com.courier.android.utils.onPushNotificationEvent
-import com.courier.android.utils.pushNotification
 import com.courier.android.utils.trackPushNotificationClick
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
-import com.google.firebase.messaging.RemoteMessage
 import org.json.JSONObject
 
 class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeModule(tag = "System Error", name = "CourierSystemModule", reactContext = reactContext) {
 
   init {
 
-    // Listen to push notification events
     Courier.shared.onPushNotificationEvent { event ->
       when (event.trackingEvent) {
-        CLICKED -> postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, event.remoteMessage)
-        DELIVERED -> postPushNotificationJavascriptEvent(CourierEvents.Push.DELIVERED_EVENT, event.remoteMessage)
+        CLICKED -> postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, event.data)
+        DELIVERED -> postPushNotificationJavascriptEvent(CourierEvents.Push.DELIVERED_EVENT, event.data)
         else -> Log.w("CourierSystemModule", "Unknown tracking event: ${event.trackingEvent}")
       }
     }
@@ -45,29 +41,40 @@ class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeMod
 
   @ReactMethod
   fun registerPushNotificationClickedOnKilledState() {
-    reactActivity?.let { activity ->
-      checkIntentForPushNotificationClick(activity.intent)
+    activity?.let { act ->
+      checkIntentForPushNotificationClick(act.intent)
     }
   }
 
   private fun checkIntentForPushNotificationClick(intent: Intent?) {
     intent?.trackPushNotificationClick { message ->
-      postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, message)
+      postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, message.data)
     }
   }
 
-  private fun postPushNotificationJavascriptEvent(eventName: String, message: RemoteMessage) {
+  private fun postPushNotificationJavascriptEvent(eventName: String, data: Map<String, String>) {
+    val rawData = data.toMutableMap()
+    val payload = mutableMapOf<String, Any?>()
+    val baseKeys = listOf("title", "subtitle", "body", "badge", "sound")
+    baseKeys.forEach { key ->
+      payload[key] = data[key]
+      rawData.remove(key)
+    }
+    for ((key, value) in rawData) {
+      payload[key] = value
+    }
+    payload["raw"] = data
     reactApplicationContext.sendEvent(
       eventName = eventName,
-      value = JSONObject(message.pushNotification).toString()
+      value = JSONObject(payload).toString()
     )
   }
 
   @ReactMethod
   fun requestNotificationPermission(promise: Promise) {
 
-    reactActivity?.let { activity ->
-      Courier.shared.requestNotificationPermission(activity)
+    activity?.let { act ->
+      Courier.shared.requestNotificationPermission(act)
     }
 
     promise.resolve("unknown")
@@ -77,9 +84,9 @@ class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeMod
   @ReactMethod
   fun getNotificationPermissionStatus(promise: Promise) {
 
-    reactActivity?.let { context ->
+    activity?.let { act ->
 
-      val isGranted = Courier.shared.isPushPermissionGranted(context)
+      val isGranted = Courier.shared.isPushPermissionGranted(act)
       val status = if (isGranted) "authorized" else "denied"
       promise.resolve(status)
       return
@@ -92,7 +99,6 @@ class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeMod
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   fun openSettingsForApp(): String? {
-    // TODO: Move this to the native package in the future
     val context = reactApplicationContext
     try {
       val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)

package/android/src/main/java/com/courierreactnative/ReactNativeModule.kt

@@ -1,7 +1,7 @@
 package com.courierreactnative
 
+import android.app.Activity
 import com.courier.android.Courier
-import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -10,14 +10,10 @@ abstract class ReactNativeModule(val tag: String, private val name: String, reac
 
   override fun getName() = name
 
-  val reactActivity: ReactActivity? get() = currentActivity as? ReactActivity
+  val activity: Activity? get() = reactApplicationContext.currentActivity
 
   init {
-
-    // User Agent is used to ensure we know the SDK
-    // the requests come from
     Courier.agent = Utils.COURIER_AGENT
-
   }
 
   internal fun Promise.rejectMissingContext() {

package/android/src/main/java/com/courierreactnative/Utils.kt

@@ -15,7 +15,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.GsonBuilder
 
 internal object Utils {
-  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.7.1")
+  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "6.0.0")
 }
 
 internal fun ReactContext.sendEvent(eventName: String, value: Any?) {

package/ios/CourierReactNativeDelegate.m

@@ -33,7 +33,7 @@ static NSString *const CourierForegroundOptionsDidChangeNotification = @"iosFore
     if (self) {
       
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"5.7.1"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"6.0.0"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];

package/ios/CourierReactNativeEventEmitter.swift

@@ -14,7 +14,7 @@ internal class CourierReactNativeEventEmitter: RCTEventEmitter {
         
         // Set the user agent
         // Used to know the platform performing requests
-        Courier.agent = CourierAgent.reactNativeIOS("5.7.1")
+        Courier.agent = CourierAgent.reactNativeIOS("6.0.0")
         
     }
     

package/lib/commonjs/Modules.js

@@ -10,11 +10,12 @@ class Modules {
     ios: "- You have run 'pod install'\n",
     default: ''
   }) + '- You rebuilt the app after installing the package\n' + '- You are not using Expo Go\n';
-  static Client = Modules.getNativeModule(_reactNative.NativeModules.CourierClientModule);
-  static Shared = Modules.getNativeModule(_reactNative.NativeModules.CourierSharedModule);
-  static System = Modules.getNativeModule(_reactNative.NativeModules.CourierSystemModule);
-  static getNativeModule(nativeModule) {
-    return nativeModule ? nativeModule : new Proxy({}, {
+  static Client = Modules.getNativeModule('CourierClientModule', _reactNative.NativeModules.CourierClientModule);
+  static Shared = Modules.getNativeModule('CourierSharedModule', _reactNative.NativeModules.CourierSharedModule);
+  static System = Modules.getNativeModule('CourierSystemModule', _reactNative.NativeModules.CourierSystemModule);
+  static getNativeModule(moduleName, bridgeModule) {
+    const resolved = (_reactNative.TurboModuleRegistry === null || _reactNative.TurboModuleRegistry === void 0 ? void 0 : _reactNative.TurboModuleRegistry.get(moduleName)) ?? bridgeModule ?? undefined;
+    return resolved ? resolved : new Proxy({}, {
       get() {
         throw new Error(Modules.LINKING_ERROR);
       }

package/lib/commonjs/Modules.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","Modules","LINKING_ERROR","Platform","select","ios","default","Client","getNativeModule","NativeModules","CourierClientModule","Shared","CourierSharedModule","System","CourierSystemModule","nativeModule","Proxy","get","Error","getNativeComponent","componentName","UIManager","getViewManagerConfig","requireNativeComponent","exports"],"sourceRoot":"../../src","sources":["Modules.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAOO,MAAMC,OAAO,CAAC;EACnB,OAAgBC,aAAa,GAC3B,2FAA2F,GAC3FC,qBAAQ,CAACC,MAAM,CAAC;IAAEC,GAAG,EAAE,gCAAgC;IAAEC,OAAO,EAAE;EAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;EAEjC,OAAgBC,MAAM,GAAGN,OAAO,CAACO,eAAe,CAC9CC,0BAAa,CAACC,mBAChB,CAAC;EACD,OAAgBC,MAAM,GAAGV,OAAO,CAACO,eAAe,CAC9CC,0BAAa,CAACG,mBAChB,CAAC;EACD,OAAgBC,MAAM,GAAGZ,OAAO,CAACO,eAAe,CAC9CC,0BAAa,CAACK,mBAChB,CAAC;EAED,OAAON,eAAeA,CAAIO,YAA2B,EAAK;IACxD,OAAOA,YAAY,GACfA,YAAY,GACX,IAAIC,KAAK,CACR,CAAC,CAAC,EACF;MACEC,GAAGA,CAAA,EAAG;QACJ,MAAM,IAAIC,KAAK,CAACjB,OAAO,CAACC,aAAa,CAAC;MACxC;IACF,CACF,CAAO;EACb;EAEA,OAAOiB,kBAAkBA,CAACC,aAAqB,EAAE;IAC/C,OAAOC,sBAAS,CAACC,oBAAoB,CAACF,aAAa,CAAC,IAAI,IAAI,GACxD,IAAAG,mCAAsB,EAAMH,aAAa,CAAC,GAC1C,MAAM;MACJ,MAAM,IAAIF,KAAK,CAACjB,OAAO,CAACC,aAAa,CAAC;IACxC,CAAC;EACP;AACF;AAACsB,OAAA,CAAAvB,OAAA,GAAAA,OAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","Modules","LINKING_ERROR","Platform","select","ios","default","Client","getNativeModule","NativeModules","CourierClientModule","Shared","CourierSharedModule","System","CourierSystemModule","moduleName","bridgeModule","resolved","TurboModuleRegistry","get","undefined","Proxy","Error","getNativeComponent","componentName","UIManager","getViewManagerConfig","requireNativeComponent","exports"],"sourceRoot":"../../src","sources":["Modules.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAQO,MAAMC,OAAO,CAAC;EACnB,OAAgBC,aAAa,GAC3B,2FAA2F,GAC3FC,qBAAQ,CAACC,MAAM,CAAC;IAAEC,GAAG,EAAE,gCAAgC;IAAEC,OAAO,EAAE;EAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;EAEjC,OAAgBC,MAAM,GAAGN,OAAO,CAACO,eAAe,CAC9C,qBAAqB,EACrBC,0BAAa,CAACC,mBAChB,CAAC;EACD,OAAgBC,MAAM,GAAGV,OAAO,CAACO,eAAe,CAC9C,qBAAqB,EACrBC,0BAAa,CAACG,mBAChB,CAAC;EACD,OAAgBC,MAAM,GAAGZ,OAAO,CAACO,eAAe,CAC9C,qBAAqB,EACrBC,0BAAa,CAACK,mBAChB,CAAC;EAED,OAAON,eAAeA,CACpBO,UAAkB,EAClBC,YAA2B,EACxB;IACH,MAAMC,QAAQ,GACZ,CAACC,gCAAmB,aAAnBA,gCAAmB,uBAAnBA,gCAAmB,CAAEC,GAAG,CAACJ,UAAU,CAAC,KACrCC,YAAY,IACZI,SAAS;IACX,OAAOH,QAAQ,GACXA,QAAQ,GACP,IAAII,KAAK,CACR,CAAC,CAAC,EACF;MACEF,GAAGA,CAAA,EAAG;QACJ,MAAM,IAAIG,KAAK,CAACrB,OAAO,CAACC,aAAa,CAAC;MACxC;IACF,CACF,CAAO;EACb;EAEA,OAAOqB,kBAAkBA,CAACC,aAAqB,EAAE;IAC/C,OAAOC,sBAAS,CAACC,oBAAoB,CAACF,aAAa,CAAC,IAAI,IAAI,GACxD,IAAAG,mCAAsB,EAAMH,aAAa,CAAC,GAC1C,MAAM;MACJ,MAAM,IAAIF,KAAK,CAACrB,OAAO,CAACC,aAAa,CAAC;IACxC,CAAC;EACP;AACF;AAAC0B,OAAA,CAAA3B,OAAA,GAAAA,OAAA","ignoreList":[]}

package/lib/module/Modules.js

@@ -1,14 +1,15 @@
-import { NativeModules, Platform, UIManager, requireNativeComponent } from 'react-native';
+import { NativeModules, Platform, UIManager, TurboModuleRegistry, requireNativeComponent } from 'react-native';
 export class Modules {
   static LINKING_ERROR = `The package '@trycourier/courier-react-native' doesn't seem to be linked. Make sure: \n\n` + Platform.select({
     ios: "- You have run 'pod install'\n",
     default: ''
   }) + '- You rebuilt the app after installing the package\n' + '- You are not using Expo Go\n';
-  static Client = Modules.getNativeModule(NativeModules.CourierClientModule);
-  static Shared = Modules.getNativeModule(NativeModules.CourierSharedModule);
-  static System = Modules.getNativeModule(NativeModules.CourierSystemModule);
-  static getNativeModule(nativeModule) {
-    return nativeModule ? nativeModule : new Proxy({}, {
+  static Client = Modules.getNativeModule('CourierClientModule', NativeModules.CourierClientModule);
+  static Shared = Modules.getNativeModule('CourierSharedModule', NativeModules.CourierSharedModule);
+  static System = Modules.getNativeModule('CourierSystemModule', NativeModules.CourierSystemModule);
+  static getNativeModule(moduleName, bridgeModule) {
+    const resolved = (TurboModuleRegistry === null || TurboModuleRegistry === void 0 ? void 0 : TurboModuleRegistry.get(moduleName)) ?? bridgeModule ?? undefined;
+    return resolved ? resolved : new Proxy({}, {
       get() {
         throw new Error(Modules.LINKING_ERROR);
       }

package/lib/module/Modules.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Platform","UIManager","requireNativeComponent","Modules","LINKING_ERROR","select","ios","default","Client","getNativeModule","CourierClientModule","Shared","CourierSharedModule","System","CourierSystemModule","nativeModule","Proxy","get","Error","getNativeComponent","componentName","getViewManagerConfig"],"sourceRoot":"../../src","sources":["Modules.tsx"],"mappings":"AAAA,SACEA,aAAa,EACbC,QAAQ,EACRC,SAAS,EACTC,sBAAsB,QACjB,cAAc;AAErB,OAAO,MAAMC,OAAO,CAAC;EACnB,OAAgBC,aAAa,GAC3B,2FAA2F,GAC3FJ,QAAQ,CAACK,MAAM,CAAC;IAAEC,GAAG,EAAE,gCAAgC;IAAEC,OAAO,EAAE;EAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;EAEjC,OAAgBC,MAAM,GAAGL,OAAO,CAACM,eAAe,CAC9CV,aAAa,CAACW,mBAChB,CAAC;EACD,OAAgBC,MAAM,GAAGR,OAAO,CAACM,eAAe,CAC9CV,aAAa,CAACa,mBAChB,CAAC;EACD,OAAgBC,MAAM,GAAGV,OAAO,CAACM,eAAe,CAC9CV,aAAa,CAACe,mBAChB,CAAC;EAED,OAAOL,eAAeA,CAAIM,YAA2B,EAAK;IACxD,OAAOA,YAAY,GACfA,YAAY,GACX,IAAIC,KAAK,CACR,CAAC,CAAC,EACF;MACEC,GAAGA,CAAA,EAAG;QACJ,MAAM,IAAIC,KAAK,CAACf,OAAO,CAACC,aAAa,CAAC;MACxC;IACF,CACF,CAAO;EACb;EAEA,OAAOe,kBAAkBA,CAACC,aAAqB,EAAE;IAC/C,OAAOnB,SAAS,CAACoB,oBAAoB,CAACD,aAAa,CAAC,IAAI,IAAI,GACxDlB,sBAAsB,CAAMkB,aAAa,CAAC,GAC1C,MAAM;MACJ,MAAM,IAAIF,KAAK,CAACf,OAAO,CAACC,aAAa,CAAC;IACxC,CAAC;EACP;AACF","ignoreList":[]}
+{"version":3,"names":["NativeModules","Platform","UIManager","TurboModuleRegistry","requireNativeComponent","Modules","LINKING_ERROR","select","ios","default","Client","getNativeModule","CourierClientModule","Shared","CourierSharedModule","System","CourierSystemModule","moduleName","bridgeModule","resolved","get","undefined","Proxy","Error","getNativeComponent","componentName","getViewManagerConfig"],"sourceRoot":"../../src","sources":["Modules.tsx"],"mappings":"AAAA,SACEA,aAAa,EACbC,QAAQ,EACRC,SAAS,EACTC,mBAAmB,EACnBC,sBAAsB,QACjB,cAAc;AAErB,OAAO,MAAMC,OAAO,CAAC;EACnB,OAAgBC,aAAa,GAC3B,2FAA2F,GAC3FL,QAAQ,CAACM,MAAM,CAAC;IAAEC,GAAG,EAAE,gCAAgC;IAAEC,OAAO,EAAE;EAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;EAEjC,OAAgBC,MAAM,GAAGL,OAAO,CAACM,eAAe,CAC9C,qBAAqB,EACrBX,aAAa,CAACY,mBAChB,CAAC;EACD,OAAgBC,MAAM,GAAGR,OAAO,CAACM,eAAe,CAC9C,qBAAqB,EACrBX,aAAa,CAACc,mBAChB,CAAC;EACD,OAAgBC,MAAM,GAAGV,OAAO,CAACM,eAAe,CAC9C,qBAAqB,EACrBX,aAAa,CAACgB,mBAChB,CAAC;EAED,OAAOL,eAAeA,CACpBM,UAAkB,EAClBC,YAA2B,EACxB;IACH,MAAMC,QAAQ,GACZ,CAAChB,mBAAmB,aAAnBA,mBAAmB,uBAAnBA,mBAAmB,CAAEiB,GAAG,CAACH,UAAU,CAAC,KACrCC,YAAY,IACZG,SAAS;IACX,OAAOF,QAAQ,GACXA,QAAQ,GACP,IAAIG,KAAK,CACR,CAAC,CAAC,EACF;MACEF,GAAGA,CAAA,EAAG;QACJ,MAAM,IAAIG,KAAK,CAAClB,OAAO,CAACC,aAAa,CAAC;MACxC;IACF,CACF,CAAO;EACb;EAEA,OAAOkB,kBAAkBA,CAACC,aAAqB,EAAE;IAC/C,OAAOvB,SAAS,CAACwB,oBAAoB,CAACD,aAAa,CAAC,IAAI,IAAI,GACxDrB,sBAAsB,CAAMqB,aAAa,CAAC,GAC1C,MAAM;MACJ,MAAM,IAAIF,KAAK,CAAClB,OAAO,CAACC,aAAa,CAAC;IACxC,CAAC;EACP;AACF","ignoreList":[]}

package/lib/typescript/src/Modules.d.ts

@@ -3,7 +3,7 @@ export declare class Modules {
     static readonly Client: any;
     static readonly Shared: any;
     static readonly System: any;
-    static getNativeModule<T>(nativeModule: T | undefined): T;
+    static getNativeModule<T>(moduleName: string, bridgeModule: T | undefined): T;
     static getNativeComponent(componentName: string): import("react-native").HostComponent<any> | (() => never);
 }
 //# sourceMappingURL=Modules.d.ts.map

package/lib/typescript/src/Modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Modules.d.ts","sourceRoot":"","sources":["../../../src/Modules.tsx"],"names":[],"mappings":"AAOA,qBAAa,OAAO;IAClB,MAAM,CAAC,QAAQ,CAAC,aAAa,SAIK;IAElC,MAAM,CAAC,QAAQ,CAAC,MAAM,MAEpB;IACF,MAAM,CAAC,QAAQ,CAAC,MAAM,MAEpB;IACF,MAAM,CAAC,QAAQ,CAAC,MAAM,MAEpB;IAEF,MAAM,CAAC,eAAe,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC;IAazD,MAAM,CAAC,kBAAkB,CAAC,aAAa,EAAE,MAAM;CAOhD"}
+{"version":3,"file":"Modules.d.ts","sourceRoot":"","sources":["../../../src/Modules.tsx"],"names":[],"mappings":"AAQA,qBAAa,OAAO;IAClB,MAAM,CAAC,QAAQ,CAAC,aAAa,SAIK;IAElC,MAAM,CAAC,QAAQ,CAAC,MAAM,MAGpB;IACF,MAAM,CAAC,QAAQ,CAAC,MAAM,MAGpB;IACF,MAAM,CAAC,QAAQ,CAAC,MAAM,MAGpB;IAEF,MAAM,CAAC,eAAe,CAAC,CAAC,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,CAAC,GAAG,SAAS,GAC1B,CAAC;IAiBJ,MAAM,CAAC,kBAAkB,CAAC,aAAa,EAAE,MAAM;CAOhD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/courier-react-native",
-  "version": "5.7.1",
+  "version": "6.0.0",
   "description": "Inbox, Push Notifications, and Preferences for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -14,7 +14,8 @@
     "ios",
     "cpp",
     "*.podspec",
-    "!lib/typescript/example",
+    "!lib/typescript/example-073",
+    "!lib/typescript/example-085",
     "!ios/build",
     "!android/build",
     "!android/gradle",
@@ -32,11 +33,12 @@
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "prepack": "bob build",
     "release": "release-it",
-    "example": "yarn --cwd example",
-    "build:android": "cd example/android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
-    "build:ios": "cd example/ios && xcodebuild -workspace CourierReactNativeExample.xcworkspace -scheme CourierReactNativeExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO",
+    "example": "yarn --cwd example-085",
+    "example-073": "yarn --cwd example-073",
+    "build:android": "cd example-085/android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
+    "build:ios": "cd example-085/ios && xcodebuild -workspace CourierReactNativeExample.xcworkspace -scheme CourierReactNativeExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO",
     "bootstrap": "yarn example && yarn install && yarn example pods",
-    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build",
+    "clean": "del-cli android/build example-085/android/build example-085/android/app/build example-085/ios/build",
     "linkPackage": "yarn link && yarn example link @trycourier/courier-react-native && yarn example setupEnv",
     "setup": "sh setup.sh"
   },
@@ -96,7 +98,9 @@
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
+      "<rootDir>/example-085/node_modules",
+      "<rootDir>/example-073/node_modules",
+      "<rootDir>/example-expo-55/node_modules",
       "<rootDir>/lib/"
     ]
   },
@@ -144,7 +148,8 @@
   },
   "eslintIgnore": [
     "node_modules/",
-    "lib/"
+    "lib/",
+    "example-expo-55/"
   ],
   "prettier": {
     "quoteProps": "consistent",

package/src/Modules.tsx

@@ -2,6 +2,7 @@ import {
   NativeModules,
   Platform,
   UIManager,
+  TurboModuleRegistry,
   requireNativeComponent,
 } from 'react-native';
 
@@ -13,18 +14,28 @@ export class Modules {
     '- You are not using Expo Go\n';
 
   static readonly Client = Modules.getNativeModule(
+    'CourierClientModule',
     NativeModules.CourierClientModule
   );
   static readonly Shared = Modules.getNativeModule(
+    'CourierSharedModule',
     NativeModules.CourierSharedModule
   );
   static readonly System = Modules.getNativeModule(
+    'CourierSystemModule',
     NativeModules.CourierSystemModule
   );
 
-  static getNativeModule<T>(nativeModule: T | undefined): T {
-    return nativeModule
-      ? nativeModule
+  static getNativeModule<T>(
+    moduleName: string,
+    bridgeModule: T | undefined
+  ): T {
+    const resolved =
+      (TurboModuleRegistry?.get(moduleName) as T | null) ??
+      bridgeModule ??
+      undefined;
+    return resolved
+      ? resolved
       : (new Proxy(
           {},
           {