[PLAT-6128] RN-CLI: Use a more exhaustive search for MainApplication.java

.buildkite/react-native-cli-pipeline.yml

@@ -61,6 +61,17 @@ steps:
     env:
       REACT_NATIVE_VERSION: "rn0_63"
 
+  - label: ':runner: RN 0.63 Expo (ejected) CLI tests'
+    depends_on: "cli-maze-image"
+    timeout_in_minutes: 20
+    plugins:
+      docker-compose#v3.7.0:
+        run: react-native-cli-tool-maze-runner
+        use-aliases: true
+        command: ["features/cli-tests"]
+    env:
+      REACT_NATIVE_VERSION: "rn0_63_expo_ejected"
+
   #
   # Built app test fixtures
   #
@@ -135,6 +146,22 @@ steps:
     artifact_paths:
       - build/rn0_63.apk
 
+  - label: ':android: Init and build RN 0.63 Expo (ejected) apk'
+    key: 'rn-0-63-expo-ejected-apk'
+    depends_on:
+      - 'android-builder-image'
+    timeout_in_minutes: 15
+    env:
+      DEBUG: true
+      REACT_NATIVE_VERSION: rn0_63_expo_ejected
+    plugins:
+      - docker-compose#v3.7.0:
+          run: react-native-cli-android-builder
+          command: ["features/build-app-tests/build-android-app.feature"]
+    artifact_paths:
+      - build/rn0_63_expo_ejected.apk
+    skip: To be fixed and enabled via PLAT-6449
+
   - label: ':ios: Init and build RN 0.60 ipa'
     key: 'rn-0-60-ipa'
     timeout_in_minutes: 30
@@ -179,6 +206,18 @@ steps:
     commands:
       - test/react-native-cli/scripts/init-and-build-test.sh rn0_63
 
+  - label: ':ios: Init and build RN 0.63 Expo (ejected) ipa'
+    key: 'rn-0-63-expo-ejected-ipa'
+    timeout_in_minutes: 30
+    agents:
+      queue: 'opensource-mac-rn'
+    env:
+      DEBUG: true
+    artifact_paths: build/rn0_63_expo_ejected.ipa
+    commands:
+      - test/react-native-cli/scripts/init-and-build-test.sh rn0_63_expo_ejected
+    skip: To be fixed and enabled via PLAT-6449
+
   #
   # Init, build and notify end-to-end tests
   #
@@ -258,6 +297,26 @@ steps:
     concurrency: 9
     concurrency_group: 'browserstack-app'
 
+  - label: ':runner: RN 0.63 Expo (ejected) Android end-to-end tests'
+    depends_on: "rn-0-63-expo-ejected-apk"
+    timeout_in_minutes: 10
+    plugins:
+      artifacts#v1.2.0:
+        download: "build/rn0_63_expo_ejected.apk"
+      docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
+        run: react-native-cli-maze-runner
+        use-aliases: true
+        command:
+          - --app=build/rn0_63_expo_ejected.apk
+          - --farm=bs
+          - --device=ANDROID_11_0
+          - --a11y-locator
+          - features/run-app-tests
+    concurrency: 9
+    concurrency_group: 'browserstack-app'
+    skip: To be fixed and enabled via PLAT-6449
+
   - label: ':runner: RN 0.60 iOS end-to-end tests'
     depends_on: "rn-0-60-ipa"
     timeout_in_minutes: 10
@@ -333,3 +392,23 @@ steps:
           - features/run-app-tests
     concurrency: 9
     concurrency_group: 'browserstack-app'
+
+  - label: ':runner: RN 0.63 Expo (ejected) iOS end-to-end tests'
+    depends_on: "rn-0-63-expo-ejected-ipa"
+    timeout_in_minutes: 10
+    plugins:
+      artifacts#v1.2.0:
+        download: "build/rn0_63_expo_ejected.ipa"
+      docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
+        run: react-native-cli-maze-runner
+        use-aliases: true
+        command:
+          - --app=build/rn0_63_expo_ejected.ipa
+          - --farm=bs
+          - --device=IOS_14
+          - --a11y-locator
+          - features/run-app-tests
+    concurrency: 9
+    concurrency_group: 'browserstack-app'
+    skip: To be fixed and enabled via PLAT-6449

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## TBD
+
+### Added
+
+- (react-native-cli): Add support for ejected Expo apps [#1365](https://github.com/bugsnag/bugsnag-js/pull/1365)
+
 ## v7.9.5 (2021-04-26)
 
 ### Changed

packages/react-native-cli/package.json

@@ -24,6 +24,7 @@
     "command-line-args": "^5.1.1",
     "command-line-usage": "^6.1.0",
     "consola": "^2.15.0",
+    "glob": "^7.1.6",
     "plist": "^3.0.1",
     "prompts": "^2.4.0",
     "xcode": "^3.0.1"

packages/react-native-cli/src/lib/Insert.ts

@@ -1,6 +1,10 @@
 import { Logger } from '../Logger'
 import path from 'path'
 import { promises as fs } from 'fs'
+import { promisify } from 'util'
+import glob from 'glob'
+
+const asyncGlob = promisify(glob)
 
 const BUGSNAG_JS_IMPORT_INIT =
 `import Bugsnag from "@bugsnag/react-native";
@@ -76,20 +80,21 @@ export async function insertIos (projectRoot: string, logger: Logger): Promise<v
 
 export async function insertAndroid (projectRoot: string, logger: Logger): Promise<void> {
   logger.info('Adding Bugsnag to the Android layer')
-  const comDir = path.join(projectRoot, 'android', 'app', 'src', 'main', 'java', 'com')
-  let appPackagePath
+
+  let mainApplicationPath
   try {
-    appPackagePath = (await fs.readdir(comDir))[0]
-    if (!appPackagePath) {
-      logger.warn(FAIL_MSG('MainApplication.java'))
-      return
-    }
+    const comDir = path.join(projectRoot, 'android', 'app', 'src', 'main', 'java', 'com')
+    const relativeMainApplicationPath = (await asyncGlob('**/*/MainApplication.java', {
+      cwd: comDir
+    }))[0]
+    if (!relativeMainApplicationPath) return logger.warn(FAIL_MSG('MainApplication.java'))
+    mainApplicationPath = path.join(comDir, relativeMainApplicationPath)
   } catch (e) {
-    logger.error(FAIL_MSG('MainApplication.java'))
+    logger.warn(FAIL_MSG('MainApplication.java'))
     return
   }
+
   try {
-    const mainApplicationPath = path.join(comDir, appPackagePath, 'MainApplication.java')
     const mainApplication = await fs.readFile(mainApplicationPath, 'utf8')
 
     if (mainApplication.includes(BUGSNAG_JAVA_IMPORT) || mainApplication.includes(BUGSNAG_JAVA_INIT)) {