Merge branch 'antonis/4625-expo-useNativeInit' into kw-expo-plugin-ref

Author: antonis

packages/core/plugin/src/withSentryAndroid.ts

@@ -105,7 +105,9 @@ export function modifyMainApplication(config: ExpoConfig): ExpoConfig {
         );
       }
     } else {
-      warnOnce(`Unrecognized language detected in '${fileName}', the native code won't be updated.`);
+      warnOnce(
+        `Unsupported language '${config.modResults.language}' detected in '${fileName}', the native code won't be updated.`,
+      );
     }
 
     return config;

packages/core/plugin/src/withSentryIOS.ts

@@ -104,16 +104,16 @@ export function modifyAppDelegate(config: ExpoConfig): ExpoConfig {
       // Add RNSentrySDK.start() at the beginning of application method
       const originalContents = config.modResults.contents;
       config.modResults.contents = config.modResults.contents.replace(
-        /(func application\([^)]*\) -> Bool \{)/s,
-        `$1\n    RNSentrySDK.start()`,
+        /(func application\([^)]*\) -> Bool \{)\s*\n(\s*)/s,
+        `$1\n$2RNSentrySDK.start()\n$2`,
       );
       if (config.modResults.contents === originalContents) {
         warnOnce(`Failed to insert 'RNSentrySDK.start()' in '${fileName}'.`);
       } else if (!config.modResults.contents.includes('import RNSentry')) {
         // Insert import statement after UIKit import
         config.modResults.contents = config.modResults.contents.replace(/(import UIKit\n)/, `$1import RNSentry\n`);
       }
-    } else if (config.modResults.language === 'objc') {
+    } else if (['objcpp', 'objc'].includes(config.modResults.language)) {
       if (config.modResults.contents.includes('[RNSentrySDK start]')) {
         warnOnce(`Your '${fileName}' already contains '[RNSentrySDK start]'.`);
         return config;
@@ -134,7 +134,9 @@ export function modifyAppDelegate(config: ExpoConfig): ExpoConfig {
         );
       }
     } else {
-      warnOnce(`Unsupported language detected in '${fileName}', the native code won't be updated.`);
+      warnOnce(
+        `Unsupported language '${config.modResults.language}' detected in '${fileName}', the native code won't be updated.`,
+      );
     }
 
     return config;

packages/core/test/expo-plugin/modifyAppDelegate.test.ts

@@ -17,7 +17,7 @@ interface MockedExpoConfig extends ExpoConfig {
   modResults: {
     path: string;
     contents: string;
-    language: 'swift' | 'objc';
+    language: 'swift' | 'objc' | 'objcpp' | string;
   };
 }
 
@@ -148,6 +148,30 @@ describe('modifyAppDelegate', () => {
     expect(result.modResults.contents).toBe(objcExpected);
   });
 
+  it('should modify an Objective-C++ file by adding the RNSentrySDK import and start', async () => {
+    config.modResults.language = 'objcpp';
+    config.modResults.contents = objcContents;
+
+    const result = (await modifyAppDelegate(config)) as MockedExpoConfig;
+
+    expect(result.modResults.contents).toContain('#import <RNSentry/RNSentry.h>');
+    expect(result.modResults.contents).toContain('[RNSentrySDK start];');
+    expect(result.modResults.contents).toBe(objcExpected);
+  });
+
+  it('should not modify a source file if the language is not supported', async () => {
+    config.modResults.language = 'cpp';
+    config.modResults.contents = objcContents;
+    config.modResults.path = 'samples/react-native/ios/AppDelegate.cpp';
+
+    const result = (await modifyAppDelegate(config)) as MockedExpoConfig;
+
+    expect(warnOnce).toHaveBeenCalledWith(
+      `Unsupported language 'cpp' detected in 'AppDelegate.cpp', the native code won't be updated.`,
+    );
+    expect(result).toBe(config); // No modification
+  });
+
   it('should insert import statements only once in an Swift project', async () => {
     config.modResults.contents =
       'import UIKit\nimport RNSentrySDK\n\noverride func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {';