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

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)) {

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

@@ -2,6 +2,7 @@ import { insertJs, insertAndroid, insertIos } from '../Insert'
 import logger from '../../Logger'
 import path from 'path'
 import { promises as fs } from 'fs'
+import glob from 'glob'
 
 async function loadFixture (fixture: string) {
   return jest.requireActual('fs').promises.readFile(fixture, 'utf8')
@@ -19,6 +20,9 @@ jest.mock('../../Logger')
 jest.mock('fs', () => {
   return { promises: { readFile: jest.fn(), writeFile: jest.fn(), readdir: jest.fn() } }
 })
+jest.mock('glob', () => {
+  return jest.fn()
+})
 
 afterEach(() => jest.resetAllMocks())
 
@@ -170,9 +174,8 @@ test('insertIos(): no identifiable app launch method', async () => {
 })
 
 test('insertAndroid(): success', async () => {
-  type readdir = (path: string) => Promise<string[]>
-  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
-  readdirMock.mockResolvedValue(['bugsnagreactnativeclitest'])
+  const globMock = glob as unknown as jest.MockedFunction<typeof glob>
+  globMock.mockImplementation((glob, opts, cb) => cb(null, ['bugsnagreactnativeclitest/MainApplication.java']))
 
   const mainApplication = await loadFixture(path.join(__dirname, 'fixtures', 'MainApplication-before.java'))
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
@@ -193,9 +196,8 @@ test('insertAndroid(): success', async () => {
 })
 
 test('insertAndroid(): success, tolerates some differences in source', async () => {
-  type readdir = (path: string) => Promise<string[]>
-  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
-  readdirMock.mockResolvedValue(['bugsnagreactnativeclitest'])
+  const globMock = glob as unknown as jest.MockedFunction<typeof glob>
+  globMock.mockImplementation((glob, opts, cb) => cb(null, ['bugsnagreactnativeclitest/MainApplication.java']))
 
   const mainApplication = await loadFixture(path.join(__dirname, 'fixtures', 'MainApplication-before-2.java'))
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
@@ -216,9 +218,8 @@ test('insertAndroid(): success, tolerates some differences in source', async ()
 })
 
 test('insertAndroid(): already present', async () => {
-  type readdir = (path: string) => Promise<string[]>
-  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
-  readdirMock.mockResolvedValue(['bugsnagreactnativeclitest'])
+  const globMock = glob as unknown as jest.MockedFunction<typeof glob>
+  globMock.mockImplementation((glob, opts, cb) => cb(null, ['bugsnagreactnativeclitest/MainApplication.java']))
 
   const mainApplication = await loadFixture(path.join(__dirname, 'fixtures', 'MainApplication-after.java'))
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
@@ -237,9 +238,8 @@ test('insertAndroid(): already present', async () => {
 })
 
 test('insertAndroid(): failure to locate file', async () => {
-  type readdir = (path: string) => Promise<string[]>
-  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
-  readdirMock.mockResolvedValue(['bugsnagreactnativeclitest'])
+  const globMock = glob as unknown as jest.MockedFunction<typeof glob>
+  globMock.mockImplementation((glob, opts, cb) => cb(null, ['bugsnagreactnativeclitest/MainApplication.java']))
 
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
   readFileMock.mockRejectedValue(await generateNotFoundError())
@@ -257,9 +257,8 @@ test('insertAndroid(): failure to locate file', async () => {
 })
 
 test('insertAndroid(): failure to locate package directory', async () => {
-  type readdir = (path: string) => Promise<string[]>
-  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
-  readdirMock.mockResolvedValue([])
+  const globMock = glob as unknown as jest.MockedFunction<typeof glob>
+  globMock.mockImplementation((glob, opts, cb) => cb(null, []))
 
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
   const writeFileMock = fs.writeFile as jest.MockedFunction<typeof fs.writeFile>
@@ -272,9 +271,8 @@ test('insertAndroid(): failure to locate package directory', async () => {
 })
 
 test('insertAndroid(): project directory error', async () => {
-  type readdir = (path: string) => Promise<string[]>
-  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
-  readdirMock.mockRejectedValue(await generateNotFoundError())
+  const globMock = glob as unknown as jest.MockedFunction<typeof glob>
+  globMock.mockImplementation((glob, opts, cb) => cb(new Error('oh no'), []))
 
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
   const writeFileMock = fs.writeFile as jest.MockedFunction<typeof fs.writeFile>
@@ -283,13 +281,12 @@ test('insertAndroid(): project directory error', async () => {
   expect(readFileMock).not.toHaveBeenCalled()
   expect(writeFileMock).not.toHaveBeenCalled()
 
-  expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java" automatically.'))
+  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('Failed to update "MainApplication.java" automatically.'))
 })
 
 test('insertAndroid(): no identifiable onCreate method', async () => {
-  type readdir = (path: string) => Promise<string[]>
-  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
-  readdirMock.mockResolvedValue(['bugsnagreactnativeclitest'])
+  const globMock = glob as unknown as jest.MockedFunction<typeof glob>
+  globMock.mockImplementation((glob, opts, cb) => cb(null, ['bugsnagreactnativeclitest/MainApplication.java']))
 
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
   readFileMock.mockResolvedValue('not good java')

test/react-native-cli/features/fixtures/Dockerfile

@@ -10,5 +10,6 @@ COPY . /app
 WORKDIR /app
 
 RUN npm i -g bugsnag-react-native-cli-*.tgz
+RUN npm i
 
 ENTRYPOINT ["/bin/sh"]

test/react-native-cli/features/fixtures/docker-compose.yml

@@ -44,6 +44,17 @@ services:
         aliases:
           - maze-runner
 
+  rn0_63_expo_ejected:
+    build:
+      context: rn0_63_expo_ejected
+      dockerfile: ../Dockerfile
+    environment:
+      DEBUG:
+    networks:
+      default:
+        aliases:
+          - maze-runner
+
 networks:
   default:
     name: ${NETWORK_NAME:-react-native-cli-maze-runner}

test/react-native-cli/features/fixtures/rn0_63_expo_ejected/.dockerignore

@@ -0,0 +1,3 @@
+# Ignore lockfiles as they can influence test runs
+package-lock.json
+yarn.lock

test/react-native-cli/features/fixtures/rn0_63_expo_ejected/.gitignore

@@ -0,0 +1,73 @@
+node_modules/
+.expo/
+npm-debug.*
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
+*.orig.*
+web-build/
+
+# macOS
+.DS_Store
+
+# @generated expo-cli sync-2138f1e3e130677ea10ea873f6d498e3890e677b
+# The following patterns were generated by expo-cli
+
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+project.xcworkspace
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+*.hprof
+
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# BUCK
+buck-out/
+\.buckd/
+*.keystore
+!debug.keystore
+
+# Bundle artifacts
+*.jsbundle
+
+# CocoaPods
+/ios/Pods/
+
+# Expo
+.expo/
+web-build/
+
+# @end expo-cli