Merge pull request #248 from Resgrid/develop

RU-T50 Trying to fix build issues

Author: ucswift

app.config.ts

@@ -44,7 +44,6 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     supportsTablet: true,
     bundleIdentifier: Env.BUNDLE_ID,
     requireFullScreen: true,
-    googleServicesFile: 'GoogleService-Info.plist',
     infoPlist: {
       UIBackgroundModes: ['remote-notification', 'audio', 'bluetooth-central', 'voip'],
       ITSAppUsesNonExemptEncryption: false,
@@ -54,6 +53,10 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       LSApplicationQueriesSchemes: ['resgridunit'],
     },
     entitlements: {
+      // Required for APNs registration. Previously added by the expo-notifications
+      // plugin; set explicitly so removing/swapping plugins can never silently drop
+      // it (which previously broke ALL iOS push — see docs/ios-foreground-notifications-fix.md).
+      'aps-environment': 'production',
       ...((Env.APP_ENV === 'production' || Env.APP_ENV === 'internal') && {
         'com.apple.developer.usernotifications.critical-alerts': true,
         'com.apple.developer.usernotifications.time-sensitive': true,
@@ -169,13 +172,6 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
         },
         ios: {
           deploymentTarget: '18.1',
-          useFrameworks: 'static',
-          // Build React Native from source instead of the prebuilt
-          // ReactNativeDependencies.xcframework. The prebuilt core does not
-          // re-export RN's preprocessor macros (RCT_EXTERN, RCT_CONCAT) across
-          // the static-framework module boundary, so RCT_EXPORT_MODULE() fails
-          // to compile in third-party Obj-C modules like @react-native-firebase.
-          buildReactNativeFromSource: true,
         },
       },
     ],
@@ -223,12 +219,10 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     'react-native-ble-manager',
     '@livekit/react-native-expo-plugin',
     '@config-plugins/react-native-webrtc',
-    './plugins/withWebRTCFrameworkFix.js',
     '@config-plugins/react-native-callkeep',
-    '@react-native-firebase/app',
+    'expo-notifications',
     './customGradle.plugin.js',
     './customManifest.plugin.js',
-    './plugins/withForegroundNotifications.js',
     './plugins/withNotificationSounds.js',
     './plugins/withMediaButtonModule.js',
     [

metro.config.js

@@ -27,8 +27,6 @@ config.resolver.resolveRequest = (context, moduleName, platform) => {
     // Native modules that need web shims
     const nativeModules = [
       '@notifee/react-native',
-      '@react-native-firebase/messaging',
-      '@react-native-firebase/app',
       'react-native-callkeep',
       'react-native-ble-manager',
       '@livekit/react-native',

package.json

@@ -98,8 +98,6 @@
     "@notifee/react-native": "9.1.8",
     "@novu/react-native": "3.11.0",
     "@react-native-community/netinfo": "11.4.1",
-    "@react-native-firebase/app": "23.5.0",
-    "@react-native-firebase/messaging": "23.5.0",
     "@rnmapbox/maps": "10.2.10",
     "@semantic-release/git": "10.0.1",
     "@sentry/react-native": "8.10.0",
@@ -135,6 +133,7 @@
     "expo-localization": "17.0.8",
     "expo-location": "19.0.8",
     "expo-navigation-bar": "5.0.10",
+    "expo-notifications": "0.32.16",
     "expo-router": "6.0.23",
     "expo-screen-orientation": "9.0.8",
     "expo-secure-store": "15.0.8",