Merge branch 'main' into v8

# Conflicts:
#	CHANGELOG.md

Author: antonis

CHANGELOG.md

@@ -47,6 +47,7 @@
 ### Fixes
 
 - Fix `SENTRY_ALLOW_FAILURE` environment variable not being respected in Xcode build scripts ([#5616](https://github.com/getsentry/sentry-react-native/pull/5616))
+- Fix iOS dSYM upload for main app in Expo EAS builds by adding inputPaths to build phase ([#5617](https://github.com/getsentry/sentry-react-native/pull/5617))
 
 ### Dependencies
 

packages/core/plugin/src/withSentryIOS.ts

@@ -28,6 +28,10 @@ export const withSentryIOS: ConfigPlugin<{ sentryProperties: string; useNativeIn
       xcodeProject.addBuildPhase([], 'PBXShellScriptBuildPhase', 'Upload Debug Symbols to Sentry', null, {
         shellPath: '/bin/sh',
         shellScript: `/bin/sh ${SENTRY_REACT_NATIVE_XCODE_DEBUG_FILES_PATH}`,
+        inputPaths: [
+          '"$(DWARF_DSYM_FOLDER_PATH)/$(DWARF_DSYM_FILE_NAME)/Contents/Resources/DWARF/$(PRODUCT_NAME)"',
+          '"$(DWARF_DSYM_FOLDER_PATH)/$(DWARF_DSYM_FILE_NAME)"',
+        ],
       });
     }
 

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

@@ -77,3 +77,101 @@ describe('Configures iOS native project correctly', () => {
     expect(warnOnce).toHaveBeenCalled();
   });
 });
+
+describe('Upload Debug Symbols to Sentry build phase', () => {
+  let mockXcodeProject: any;
+  let addBuildPhaseSpy: jest.Mock;
+  const expectedShellScript =
+    "/bin/sh `${NODE_BINARY:-node} --print \"require('path').dirname(require.resolve('@sentry/react-native/package.json')) + '/scripts/sentry-xcode-debug-files.sh'\"`";
+
+  const getOptions = () => {
+    const callArgs = addBuildPhaseSpy.mock.calls[0];
+    return callArgs[4];
+  };
+
+  beforeEach(() => {
+    addBuildPhaseSpy = jest.fn();
+    mockXcodeProject = {
+      pbxItemByComment: jest.fn().mockReturnValue(null),
+      addBuildPhase: addBuildPhaseSpy,
+    };
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('creates Upload Debug Symbols build phase with correct shell script', () => {
+    mockXcodeProject.addBuildPhase([], 'PBXShellScriptBuildPhase', 'Upload Debug Symbols to Sentry', null, {
+      shellPath: '/bin/sh',
+      shellScript: expectedShellScript,
+    });
+
+    expect(addBuildPhaseSpy).toHaveBeenCalledWith(
+      [],
+      'PBXShellScriptBuildPhase',
+      'Upload Debug Symbols to Sentry',
+      null,
+      {
+        shellPath: '/bin/sh',
+        shellScript: expectedShellScript,
+      },
+    );
+  });
+
+  it('does not include inputPaths in options before fix', () => {
+    mockXcodeProject.addBuildPhase([], 'PBXShellScriptBuildPhase', 'Upload Debug Symbols to Sentry', null, {
+      shellPath: '/bin/sh',
+      shellScript: expectedShellScript,
+    });
+
+    const options = getOptions();
+
+    expect(options.inputPaths).toBeUndefined();
+  });
+
+  it('skips creating build phase if it already exists', () => {
+    mockXcodeProject.pbxItemByComment = jest.fn().mockReturnValue({
+      shellScript: 'existing',
+    });
+
+    expect(addBuildPhaseSpy).not.toHaveBeenCalled();
+  });
+
+  it('includes inputPaths with escaped quotes to avoid pbxproj serialization issues', () => {
+    mockXcodeProject.addBuildPhase([], 'PBXShellScriptBuildPhase', 'Upload Debug Symbols to Sentry', null, {
+      shellPath: '/bin/sh',
+      shellScript: expectedShellScript,
+      inputPaths: [
+        '"$(DWARF_DSYM_FOLDER_PATH)/$(DWARF_DSYM_FILE_NAME)/Contents/Resources/DWARF/$(PRODUCT_NAME)"',
+        '"$(DWARF_DSYM_FOLDER_PATH)/$(DWARF_DSYM_FILE_NAME)"',
+      ],
+    });
+
+    const options = getOptions();
+
+    expect(options.inputPaths).toBeDefined();
+    expect(options.inputPaths).toHaveLength(2);
+  });
+
+  it('inputPaths values are wrapped in escaped quotes', () => {
+    mockXcodeProject.addBuildPhase([], 'PBXShellScriptBuildPhase', 'Upload Debug Symbols to Sentry', null, {
+      shellPath: '/bin/sh',
+      shellScript: expectedShellScript,
+      inputPaths: [
+        '"$(DWARF_DSYM_FOLDER_PATH)/$(DWARF_DSYM_FILE_NAME)/Contents/Resources/DWARF/$(PRODUCT_NAME)"',
+        '"$(DWARF_DSYM_FOLDER_PATH)/$(DWARF_DSYM_FILE_NAME)"',
+      ],
+    });
+
+    const options = getOptions();
+
+    // Verify paths are wrapped in quotes to prevent pbxproj corruption
+    expect(options.inputPaths[0]).toMatch(/^".*"$/);
+    expect(options.inputPaths[1]).toMatch(/^".*"$/);
+    expect(options.inputPaths[0]).toBe(
+      '"$(DWARF_DSYM_FOLDER_PATH)/$(DWARF_DSYM_FILE_NAME)/Contents/Resources/DWARF/$(PRODUCT_NAME)"',
+    );
+    expect(options.inputPaths[1]).toBe('"$(DWARF_DSYM_FOLDER_PATH)/$(DWARF_DSYM_FILE_NAME)"');
+  });
+});