Merge pull request #1695 from bugsnag/fix-eas-update

Improve support for EAS Update

Author: imjoehaines

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### TBD
 
+### Fixed
+
+- (expo): preliminary support for the Expo EAS Update. Please send us feedback on how we can improve our support! [kennethlynne](https://github.com/kennethlynne) [#1686](https://github.com/bugsnag/bugsnag-js/pull/1686) [#1695](https://github.com/bugsnag/bugsnag-js/pull/1695)
+
 ### Changed
 
 - (plugin-react-navigation): Allow React Navigation v6 as a peer dependency [#1691](https://github.com/bugsnag/bugsnag-js/pull/1691)

packages/expo/src/config.js

@@ -5,9 +5,14 @@ const Constants = require('expo-constants').default
 
 // If the developer property is not present in the manifest, it means the app is
 // not connected to a development tool and is either a published app running in
-// the Expo client, or a standalone app (we also assume production for a missing
-// manifest, but that should never happen)
-const IS_PRODUCTION = !Constants.manifest || !Constants.manifest.developer
+// the Expo client, or a standalone app
+let IS_PRODUCTION = true
+
+if (Constants.manifest) {
+  IS_PRODUCTION = !Constants.manifest.developer
+} else if (Constants.manifest2) {
+  IS_PRODUCTION = !Constants.manifest2?.extra?.expoGo?.developer
+}
 
 // The app can still run in production "mode" in development environments, in which
 // cases the global boolean __DEV__ will be set to true

packages/expo/src/notifier.js

@@ -28,7 +28,7 @@ const internalPlugins = [
   require('@bugsnag/plugin-expo-device'),
   require('@bugsnag/plugin-expo-app'),
   require('@bugsnag/plugin-console-breadcrumbs'),
-  require('@bugsnag/plugin-network-breadcrumbs')([NET_INFO_REACHABILITY_URL, Constants.manifest.logUrl]),
+  require('@bugsnag/plugin-network-breadcrumbs')([NET_INFO_REACHABILITY_URL, Constants.manifest?.logUrl || Constants.manifest2?.extra?.expoGo?.logUrl]),
   require('@bugsnag/plugin-react-native-app-state-breadcrumbs'),
   require('@bugsnag/plugin-react-native-connectivity-breadcrumbs'),
   require('@bugsnag/plugin-react-native-orientation-breadcrumbs'),
@@ -43,17 +43,22 @@ const Bugsnag = {
     if (typeof opts === 'string') opts = { apiKey: opts }
     if (!opts) opts = {}
 
-    // attempt to fetch apiKey from app.json if we didn't get one explicitly passed
-    if (!opts.apiKey &&
-      Constants.manifest &&
-      Constants.manifest.extra &&
-      Constants.manifest.extra.bugsnag &&
-      Constants.manifest.extra.bugsnag.apiKey) {
-      opts.apiKey = Constants.manifest.extra.bugsnag.apiKey
+    // read the api key from app.json if one is not explicitly passed
+    if (!opts.apiKey) {
+      if (Constants.manifest?.extra?.bugsnag?.apiKey) {
+        opts.apiKey = Constants.manifest.extra.bugsnag.apiKey
+      } else if (Constants.manifest2?.extra?.expoClient?.extra?.bugsnag?.apiKey) {
+        opts.apiKey = Constants.manifest2.extra.expoClient.extra.bugsnag.apiKey
+      }
     }
 
-    if (!opts.appVersion && Constants.manifest && Constants.manifest.version) {
-      opts.appVersion = Constants.manifest.version
+    // read the version from app.json if one is not explicitly passed
+    if (!opts.appVersion) {
+      if (Constants.manifest?.version) {
+        opts.appVersion = Constants.manifest.version
+      } else if (Constants.manifest2?.extra?.expoClient?.version) {
+        opts.appVersion = Constants.manifest2.extra.expoClient.version
+      }
     }
 
     const bugsnag = new Client(opts, schema, internalPlugins, { name, version, url })

packages/plugin-expo-app/app.js

@@ -29,8 +29,10 @@ module.exports = {
     }
 
     client.addOnSession(session => {
-      if (Constants.manifest.revisionId) {
+      if (Constants.manifest?.revisionId) {
         session.app.codeBundleId = Constants.manifest.revisionId
+      } else if (Constants.manifest2?.extra?.expoClient?.revisionId) {
+        session.app.codeBundleId = Constants.manifest2.extra.expoClient.revisionId
       }
     })
 
@@ -47,8 +49,10 @@ module.exports = {
 
       event.addMetadata('app', { nativeBundleVersion, nativeVersionCode })
 
-      if (Constants.manifest.revisionId) {
+      if (Constants.manifest?.revisionId) {
         event.app.codeBundleId = Constants.manifest.revisionId
+      } else if (Constants.manifest2?.extra?.expoClient?.revisionId) {
+        event.app.codeBundleId = Constants.manifest2.extra.expoClient.revisionId
       }
     }, true)
   }

packages/plugin-expo-device/device.js

@@ -31,7 +31,7 @@ module.exports = {
       runtimeVersions: {
         reactNative: rnVersion,
         expoApp: Constants.expoVersion,
-        expoSdk: Constants.manifest.sdkVersion,
+        expoSdk: Constants.manifest?.sdkVersion || Constants.manifest2?.extra?.expoClient?.sdkVersion,
         androidApiLevel: Constants.platform.android ? String(Platform.Version) : undefined
       },
       totalMemory: Device.totalMemory