@advenue/react-native 0.6.0 → 0.6.1

package/src/native.ts

@@ -1,22 +1,21 @@
+import { requireExpoModulesCore, requireReactNative } from './native-require.cjs';
 import type { AdvenueAndroidNativeModule, AdvenueIosNativeModule } from './native-types';
 
-declare function require(id: string): unknown;
-
 type ExpoModulesCore = {
   requireNativeModule<T>(name: string): T;
 };
 
 /**
  * Lazy access to the native modules that ship inside this package (ios/ and
- * android/, registered via expo-module.config.json). `requireNativeModule`
- * throws when the native side isn't built (Expo Go, web, missing pods), so
- * resolution happens inside try/catch — never at module scope.
- * expo-modules-core is resolved from the consuming app's Expo install.
+ * android/, registered via expo-module.config.json). Host-module resolution
+ * goes through native-require.cjs so Metro sees literal requires (see the
+ * comment there); `requireNativeModule` throws when the native side isn't
+ * built (Expo Go, web, missing pods), so calls stay inside try/catch.
  */
 export function getIosNative(): AdvenueIosNativeModule | null {
   try {
-    const core = require('expo-modules-core') as ExpoModulesCore;
-    return core.requireNativeModule<AdvenueIosNativeModule>('AdvenueIos');
+    const core = requireExpoModulesCore() as ExpoModulesCore | null;
+    return core ? core.requireNativeModule<AdvenueIosNativeModule>('AdvenueIos') : null;
   } catch {
     return null;
   }
@@ -24,8 +23,8 @@ export function getIosNative(): AdvenueIosNativeModule | null {
 
 export function getAndroidNative(): AdvenueAndroidNativeModule | null {
   try {
-    const core = require('expo-modules-core') as ExpoModulesCore;
-    return core.requireNativeModule<AdvenueAndroidNativeModule>('AdvenueAndroid');
+    const core = requireExpoModulesCore() as ExpoModulesCore | null;
+    return core ? core.requireNativeModule<AdvenueAndroidNativeModule>('AdvenueAndroid') : null;
   } catch {
     return null;
   }
@@ -38,7 +37,8 @@ export function getAndroidNative(): AdvenueAndroidNativeModule | null {
  */
 export function getPlatformOS(): string | null {
   try {
-    return (require('react-native') as { Platform: { OS: string } }).Platform.OS ?? null;
+    const rn = requireReactNative() as { Platform: { OS: string } } | null;
+    return rn?.Platform.OS ?? null;
   } catch {
     return null;
   }
@@ -60,7 +60,8 @@ export interface AppStateLike {
  */
 export function getAppState(): AppStateLike | null {
   try {
-    return (require('react-native') as { AppState: AppStateLike }).AppState;
+    const rn = requireReactNative() as { AppState: AppStateLike } | null;
+    return rn?.AppState ?? null;
   } catch {
     return null;
   }
@@ -88,7 +89,8 @@ export interface LinkingLike {
  */
 export function getLinking(): LinkingLike | null {
   try {
-    return (require('react-native') as { Linking: LinkingLike }).Linking;
+    const rn = requireReactNative() as { Linking: LinkingLike } | null;
+    return rn?.Linking ?? null;
   } catch {
     return null;
   }