Merge pull request #2410 from bugsnag/PLAT-14057/react-native-079

hamudi-ahmed · web-flow · commit d8c34e0d2f4c · 2025-04-14T15:29:30.000+01:00
Support React Native 0.79
diff --git a/.buildkite/basic/react-native-android-full-pipeline.yml b/.buildkite/basic/react-native-android-full-pipeline.yml
@@ -102,6 +102,7 @@ steps:
           - "0.74"
           - "0.76"
           - "0.77"
+          - "0.78"
         retry:
           automatic:
             - exit_status: "*"
@@ -133,6 +134,7 @@ steps:
           - "0.74"
           - "0.76"
           - "0.77"
+          - "0.78"
 
       - label: ':android: Build react-native-navigation {{matrix}} test fixture APK (Old Arch)'
         key: "build-react-native-navigation-android-fixture-old-arch"
@@ -293,6 +295,7 @@ steps:
           - "0.74"
           - "0.76"
           - "0.77"
+          - "0.78"
 
       # current latest version (v7.40.1) of react-native-navigation's autolinking tool doesn't support RN 0.73+,
       # causing a build failure - see https://github.com/wix/react-native-navigation/issues/7821
@@ -335,6 +338,7 @@ steps:
           - "0.74"
           - "0.76"
           - "0.77"
+          - "0.78"
 
       - label: ":bitbar: :android: react-native-navigation {{matrix}} Android 12 (Old Arch) end-to-end tests"
         depends_on: "build-react-native-navigation-android-fixture-old-arch"
diff --git a/.buildkite/basic/react-native-android-pipeline.yml b/.buildkite/basic/react-native-android-pipeline.yml
@@ -23,7 +23,7 @@ steps:
           - "bundle install"
           - "node scripts/generate-react-native-fixture.js"
         matrix:
-          - "0.78"
+          - "0.79"
         retry:
           automatic:
             - exit_status: "*"
@@ -51,7 +51,7 @@ steps:
             - exit_status: "*"
               limit: 1
         matrix:
-          - "0.78"
+          - "0.79"
 
       #
       # End-to-end tests
@@ -90,7 +90,7 @@ steps:
         concurrency_group: "bitbar"
         concurrency_method: eager
         matrix:
-          - "0.78"
+          - "0.79"
 
       - label: ":bitbar: :android: RN {{matrix}} Android 12 (New Arch) end-to-end tests"
         depends_on: "build-react-native-android-fixture-new-arch"
@@ -126,5 +126,5 @@ steps:
         concurrency_group: "bitbar"
         concurrency_method: eager
         matrix:
-          - "0.78"
+          - "0.79"
 
diff --git a/.buildkite/basic/react-native-cli-pipeline.yml b/.buildkite/basic/react-native-cli-pipeline.yml
@@ -25,9 +25,9 @@ steps:
           - "bundle install"
           - "bundle exec maze-runner features/build-app-tests/build-android-app.feature"
         matrix:
+          - "0.79"
+          - "0.78"
           - "0.77"
-          - "0.76"
-          - "0.75"
         retry:
           automatic:
             - exit_status: "*"
@@ -54,9 +54,9 @@ steps:
           - "bundle install"
           - "bundle exec maze-runner features/build-app-tests/build-ios-app.feature"
         matrix:
+          - "0.79"
+          - "0.78"
           - "0.77"
-          - "0.76"
-          - "0.75"
         retry:
           automatic:
             - exit_status: "*"
@@ -92,9 +92,9 @@ steps:
         concurrency_group: "browserstack-app"
         concurrency_method: eager
         matrix:
+          - "0.79"
+          - "0.78"
           - "0.77"
-          - "0.76"
-          - "0.75"
 
       - label: ":browserstack: :mac: RN CLI - {{matrix}} iOS end-to-end tests"
         depends_on: "build-react-native-cli-ios-fixture"
@@ -123,6 +123,6 @@ steps:
         concurrency_group: "browserstack-app"
         concurrency_method: eager
         matrix:
+          - "0.79"
+          - "0.78"
           - "0.77"
-          - "0.76"
-          - "0.75"
diff --git a/.buildkite/basic/react-native-ios-full-pipeline.yml b/.buildkite/basic/react-native-ios-full-pipeline.yml
@@ -67,6 +67,7 @@ steps:
           - "0.74"
           - "0.76"
           - "0.77"
+          - "0.78"
         retry:
           automatic:
             - exit_status: "*"
@@ -94,6 +95,7 @@ steps:
           - "0.74"
           - "0.76"
           - "0.77"
+          - "0.78"
         retry:
           automatic:
             - exit_status: "*"
@@ -254,6 +256,7 @@ steps:
           - "0.74"
           - "0.76"
           - "0.77"
+          - "0.78"
 
       - label: ":bitbar: :mac: RN {{matrix}} iOS (New Arch) end-to-end tests"
         depends_on: "build-react-native-ios-fixture-new-arch-full"
@@ -292,6 +295,7 @@ steps:
           - "0.74"
           - "0.76"
           - "0.77"
+          - "0.78"
 
       # current latest version (v7.40.1) of react-native-navigation's autolinking tool doesn't currently support RN 0.73+,
       # causing a build failure - see https://github.com/wix/react-native-navigation/issues/7821
diff --git a/.buildkite/basic/react-native-ios-pipeline.yml b/.buildkite/basic/react-native-ios-pipeline.yml
@@ -27,7 +27,7 @@ steps:
           - "bundle install"
           - "node scripts/generate-react-native-fixture.js"
         matrix:
-          - "0.78"
+          - "0.79"
         retry:
           automatic:
             - exit_status: "*"
@@ -51,7 +51,7 @@ steps:
           - "bundle install"
           - "node scripts/generate-react-native-fixture.js"
         matrix:
-          - "0.78"
+          - "0.79"
         retry:
           automatic:
             - exit_status: "*"
@@ -92,7 +92,7 @@ steps:
         concurrency_group: "bitbar"
         concurrency_method: eager
         matrix:
-          - "0.78"
+          - "0.79"
 
       - label: ":bitbar: :mac: RN {{matrix}} iOS (New Arch) end-to-end tests"
         depends_on: "build-react-native-ios-fixture-new-arch"
@@ -127,5 +127,5 @@ steps:
         concurrency_group: "bitbar"
         concurrency_method: eager
         matrix:
-          - "0.78"
+          - "0.79"
 
diff --git a/.buildkite/package_manifest.json b/.buildkite/package_manifest.json
@@ -138,7 +138,10 @@
     {
         "pipeline": ".buildkite/basic/react-native-cli-pipeline.yml",
         "block": ".buildkite/block/react-native-cli-pipeline.block.yml",
-        "paths": []
+        "paths": [
+            "test/react-native-cli",
+            "packages/react-native-cli"
+        ]
     },
     {
         "pipeline": ".buildkite/basic/expo-pipeline.yml",
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Unreleased]
+
+- (react-native-cli) Update insert command for 0.79 projects [#2410](https://github.com/bugsnag/bugsnag-js/pull/2410)
+
 ## [8.3.1] - 2025-04-09
 
 ### Changed
diff --git a/packages/react-native-cli/src/lib/Insert.ts b/packages/react-native-cli/src/lib/Insert.ts
@@ -16,7 +16,7 @@ const COCOA_OBJ_C_APP_LAUNCH_REGEX = /(-\s*\(BOOL\)\s*application:\s*\(UIApplica
 
 const BUGSNAG_COCOA_SWIFT_IMPORT = 'import Bugsnag'
 const BUGSNAG_COCOA_SWIFT_INIT = 'Bugsnag.start()'
-const COCOA_SWIFT_APP_LAUNCH_REGEX = /(override func application\s*\(\s*_ application:\s*UIApplication,\s*didFinishLaunchingWithOptions launchOptions:\s*\[UIApplication\.LaunchOptionsKey\s*:\s*Any\]\?\s*=\s*nil\)\s*->\s*Bool\s*\{\s)/
+const COCOA_SWIFT_APP_LAUNCH_REGEX = /((?:override )?func application\s*\(\s*_\s+application:\s*UIApplication,\s*didFinishLaunchingWithOptions\s+launchOptions:\s*\[UIApplication\.LaunchOptionsKey\s*:?\s*Any\]\?\s*(?:=\s*nil)?\s*\)\s*->\s*Bool\s*\{\s)/
 
 const BUGSNAG_JAVA_IMPORT = 'import com.bugsnag.android.Bugsnag;'
 const BUGSNAG_JAVA_INIT = 'Bugsnag.start(this);'
diff --git a/packages/react-native-cli/src/lib/__test__/Insert.test.ts b/packages/react-native-cli/src/lib/__test__/Insert.test.ts
@@ -94,15 +94,15 @@ test('insertIos(): success', async () => {
   )
 })
 
-test('insertIos(): success (swift)', async () => {
+test('insertIos(): success (swift 0.78)', async () => {
   type readdir = (path: string) => Promise<string[]>
   const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
 
   readdirMock
     .mockResolvedValueOnce(['BugsnagReactNativeCliTest.xcodeproj'])
     .mockResolvedValueOnce(['a', 'b', 'AppDelegate.swift', 'c', 'd'])
 
-  const appDelegate = await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-before.swift'))
+  const appDelegate = await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-before-078.swift'))
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
   readFileMock.mockResolvedValue(appDelegate)
 
@@ -113,7 +113,31 @@ test('insertIos(): success (swift)', async () => {
   expect(readFileMock).toHaveBeenCalledWith('/random/path/ios/BugsnagReactNativeCliTest/AppDelegate.swift', 'utf8')
   expect(writeFileMock).toHaveBeenCalledWith(
     '/random/path/ios/BugsnagReactNativeCliTest/AppDelegate.swift',
-    await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-after.swift')),
+    await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-after-078.swift')),
+    'utf8'
+  )
+})
+
+test('insertIos(): success (swift 0.79+)', async () => {
+  type readdir = (path: string) => Promise<string[]>
+  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
+
+  readdirMock
+    .mockResolvedValueOnce(['BugsnagReactNativeCliTest.xcodeproj'])
+    .mockResolvedValueOnce(['a', 'b', 'AppDelegate.swift', 'c', 'd'])
+
+  const appDelegate = await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-before-079.swift'))
+  const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
+  readFileMock.mockResolvedValue(appDelegate)
+
+  const writeFileMock = fs.writeFile as jest.MockedFunction<typeof fs.writeFile>
+  writeFileMock.mockResolvedValue()
+
+  await insertIos('/random/path', logger)
+  expect(readFileMock).toHaveBeenCalledWith('/random/path/ios/BugsnagReactNativeCliTest/AppDelegate.swift', 'utf8')
+  expect(writeFileMock).toHaveBeenCalledWith(
+    '/random/path/ios/BugsnagReactNativeCliTest/AppDelegate.swift',
+    await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-after-079.swift')),
     'utf8'
   )
 })
@@ -140,15 +164,37 @@ test('insertIos(): already present', async () => {
   expect(logger.warn).toHaveBeenCalledWith('Bugsnag is already included, skipping')
 })
 
-test('insertIos(): already present (swift)', async () => {
+test('insertIos(): already present (swift 0.78)', async () => {
+  type readdir = (path: string) => Promise<string[]>
+  const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
+
+  readdirMock
+    .mockResolvedValueOnce(['BugsnagReactNativeCliTest.xcodeproj'])
+    .mockResolvedValueOnce(['a', 'b', 'AppDelegate.swift', 'c', 'd'])
+
+  const appDelegate = await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-after-078.swift'))
+  const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
+  readFileMock.mockResolvedValue(appDelegate)
+
+  const writeFileMock = fs.writeFile as jest.MockedFunction<typeof fs.writeFile>
+  writeFileMock.mockResolvedValue()
+
+  await insertIos('/random/path', logger)
+  expect(readFileMock).toHaveBeenCalledWith('/random/path/ios/BugsnagReactNativeCliTest/AppDelegate.swift', 'utf8')
+  expect(writeFileMock).not.toHaveBeenCalled()
+
+  expect(logger.warn).toHaveBeenCalledWith('Bugsnag is already included, skipping')
+})
+
+test('insertIos(): already present (swift 0.79+)', async () => {
   type readdir = (path: string) => Promise<string[]>
   const readdirMock = fs.readdir as unknown as jest.MockedFunction<readdir>
 
   readdirMock
     .mockResolvedValueOnce(['BugsnagReactNativeCliTest.xcodeproj'])
     .mockResolvedValueOnce(['a', 'b', 'AppDelegate.swift', 'c', 'd'])
 
-  const appDelegate = await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-after.swift'))
+  const appDelegate = await loadFixture(path.join(__dirname, 'fixtures', 'AppDelegate-after-079.swift'))
   const readFileMock = fs.readFile as jest.MockedFunction<typeof fs.readFile>
   readFileMock.mockResolvedValue(appDelegate)
 
diff --git a/packages/react-native-cli/src/lib/__test__/fixtures/AppDelegate-after-078.swift b/packages/react-native-cli/src/lib/__test__/fixtures/AppDelegate-after-078.swift
diff --git a/packages/react-native-cli/src/lib/__test__/fixtures/AppDelegate-after-079.swift b/packages/react-native-cli/src/lib/__test__/fixtures/AppDelegate-after-079.swift
@@ -0,0 +1,51 @@
+import Bugsnag
+import UIKit
+import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+  var window: UIWindow?
+
+  var reactNativeDelegate: ReactNativeDelegate?
+  var reactNativeFactory: RCTReactNativeFactory?
+
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    Bugsnag.start()
+
+    let delegate = ReactNativeDelegate()
+    let factory = RCTReactNativeFactory(delegate: delegate)
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+
+    reactNativeDelegate = delegate
+    reactNativeFactory = factory
+
+    window = UIWindow(frame: UIScreen.main.bounds)
+
+    factory.startReactNative(
+      withModuleName: "reactnative",
+      in: window,
+      launchOptions: launchOptions
+    )
+
+    return true
+  }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+#if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+#else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+}
diff --git a/packages/react-native-cli/src/lib/__test__/fixtures/AppDelegate-before-078.swift b/packages/react-native-cli/src/lib/__test__/fixtures/AppDelegate-before-078.swift
diff --git a/packages/react-native-cli/src/lib/__test__/fixtures/AppDelegate-before-079.swift b/packages/react-native-cli/src/lib/__test__/fixtures/AppDelegate-before-079.swift
@@ -0,0 +1,48 @@
+import UIKit
+import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+  var window: UIWindow?
+
+  var reactNativeDelegate: ReactNativeDelegate?
+  var reactNativeFactory: RCTReactNativeFactory?
+
+  func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    let delegate = ReactNativeDelegate()
+    let factory = RCTReactNativeFactory(delegate: delegate)
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+
+    reactNativeDelegate = delegate
+    reactNativeFactory = factory
+
+    window = UIWindow(frame: UIScreen.main.bounds)
+
+    factory.startReactNative(
+      withModuleName: "reactnative",
+      in: window,
+      launchOptions: launchOptions
+    )
+
+    return true
+  }
+}
+
+class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+
+  override func bundleURL() -> URL? {
+#if DEBUG
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+#else
+    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+}
diff --git a/test/react-native/features/native-stack.feature b/test/react-native/features/native-stack.feature
diff --git a/test/react-native/features/unhandled-android.feature b/test/react-native/features/unhandled-android.feature
diff --git a/test/react-native/features/unhandled-ios.feature b/test/react-native/features/unhandled-ios.feature

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,10 @@`
`138`	`138`	`{`
`139`	`139`	`"pipeline": ".buildkite/basic/react-native-cli-pipeline.yml",`
`140`	`140`	`"block": ".buildkite/block/react-native-cli-pipeline.block.yml",`
`141`		`- "paths": []`
	`141`	`+ "paths": [`
	`142`	`+ "test/react-native-cli",`
	`143`	`+ "packages/react-native-cli"`
	`144`	`+ ]`
`142`	`145`	`},`
`143`	`146`	`{`
`144`	`147`	`"pipeline": ".buildkite/basic/expo-pipeline.yml",`