Merge branch 'main' into cocoa-v9

Author: antonis

.github/workflows/skip-ci.yml

@@ -45,13 +45,21 @@ jobs:
         if: steps.check-pr.outputs.is-pr == 'true'
         id: check_diff
         run: |
-          skipList=(".github/CODEOWNERS" ".prettierignore")
+          skipList=(".github/CODEOWNERS" ".prettierignore" ".github/workflows/update-deps.yml" ".github/workflows/skip-ci.yml")
+          skipRegList=("(.*/)?\.gitignore" "\.github/ISSUE_TEMPLATE.*")
+
+          for s in "${skipRegList[@]}"; do
+            skipRegex+="$s|"
+          done
+          # Remove trailing |
+          skipRegex=${skipRegex%|}
+
           # Ignores changelog.md, readme.md,...
           fileChangesArray=($(git diff --name-only "$BASE_REF...$HEAD_REF" | grep -v '\.md$' || true))
           printf '%s\n' "${fileChangesArray[@]}"
           for item in "${fileChangesArray[@]}"
           do
-            if [[ ! " ${skipList[@]} " =~ " ${item} " ]]; then
+            if [[ ! " ${skipList[*]} " =~ " ${item} " ]] && [[ ! "${item}" =~ ^(${skipRegex})$ ]]; then
               echo "found '${item}' that doesn't belong to the skip list."
               exit 0
             fi

.gitignore

@@ -94,3 +94,6 @@ node_modules.bak
 
 # SwiftLint
 swiftlint/*
+
+# Sample app
+samples/*/.env

CHANGELOG.md

@@ -19,6 +19,18 @@
 - Bump Cocoa SDK from v8.57.2 to v9.0.0-alpha.0 ([#5356](https://github.com/getsentry/sentry-react-native/pull/5356))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#900-alpha0)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.57.2...9.0.0-alpha.0)
+- Bump JavaScript SDK from v10.24.0 to v10.25.0 ([#5362](https://github.com/getsentry/sentry-react-native/pull/5362))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10250)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/10.24.0...10.25.0)
+- Bump CLI from v2.58.0 to v2.58.1 ([#5363](https://github.com/getsentry/sentry-react-native/pull/5363))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2581)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.58.0...2.58.1)
+- Bump Android SDK from v8.25.0 to v8.26.0 ([#5364](https://github.com/getsentry/sentry-react-native/pull/5364))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/cursor/categorize-sentry-options-3f0a main/CHANGELOG.md#8260)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.25.0...8.26.0)
+- Bump Android SDK Stubs from v8.25.0 to v8.26.0 ([#5365](https://github.com/getsentry/sentry-react-native/pull/5365))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/cursor/categorize-sentry-options-3f0a main/CHANGELOG.md#8260)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.25.0...8.26.0)
 
 ## 7.6.0
 

dev-packages/e2e-tests/package.json

@@ -13,7 +13,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@sentry/core": "10.24.0",
+    "@sentry/core": "10.25.0",
     "@sentry/react-native": "7.6.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",

package.json

@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@naturalcycles/ktlint": "^1.13.0",
-    "@sentry/cli": "2.58.0",
+    "@sentry/cli": "2.58.1",
     "downlevel-dts": "^0.11.0",
     "google-java-format": "^1.4.0",
     "lerna": "^8.1.8",

packages/core/android/build.gradle

@@ -55,5 +55,5 @@ android {
 dependencies {
     compileOnly files('libs/replay-stubs.jar')
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:8.25.0'
+    api 'io.sentry:sentry-android:8.26.0'
 }

packages/core/android/libs/replay-stubs.jar

@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
 }
 
 dependencies {
-  compileOnly 'io.sentry:sentry:8.25.0'
+  compileOnly 'io.sentry:sentry:8.26.0'
 }

packages/core/android/replay-stubs/build.gradle

@@ -69,20 +69,20 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "4.6.0",
-    "@sentry/browser": "10.24.0",
-    "@sentry/cli": "2.58.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/react": "10.24.0",
-    "@sentry/types": "10.24.0"
+    "@sentry/browser": "10.25.0",
+    "@sentry/cli": "2.58.1",
+    "@sentry/core": "10.25.0",
+    "@sentry/react": "10.25.0",
+    "@sentry/types": "10.25.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
     "@expo/metro-config": "~0.20.0",
     "@mswjs/interceptors": "^0.25.15",
     "@react-native/babel-preset": "0.80.0",
-    "@sentry-internal/eslint-config-sdk": "10.24.0",
-    "@sentry-internal/eslint-plugin-sdk": "10.24.0",
-    "@sentry-internal/typescript": "10.24.0",
+    "@sentry-internal/eslint-config-sdk": "10.25.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.25.0",
+    "@sentry-internal/typescript": "10.25.0",
     "@sentry/wizard": "6.6.1",
     "@testing-library/react-native": "^13.2.2",
     "@types/jest": "^29.5.13",

packages/core/package.json

@@ -117,7 +117,7 @@ describe('Tests ReactNativeClient', () => {
       });
 
       await expect(client.eventFromMessage('test')).resolves.toBeDefined();
-      await expect(RN.LogBox.ignoreLogs).not.toBeCalled();
+      await expect(RN.LogBox.ignoreLogs).not.toHaveBeenCalled();
     });
 
     test('invalid dsn is thrown', () => {
@@ -168,7 +168,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureMessage('This message will never be sent because the client is disabled.');
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
     test('captureException does not call transport when enabled false', () => {
@@ -177,7 +177,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureException(new Error('This exception will never be sent because the client is disabled.'));
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
     test('captureEvent does not call transport when enabled false', () => {
@@ -188,7 +188,7 @@ describe('Tests ReactNativeClient', () => {
         message: 'This event will never be sent because the client is disabled.',
       });
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
     test('captureSession does not call transport when enabled false', () => {
@@ -197,16 +197,17 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureSession(getMockSession());
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
+    // TODO: Replacy by Sentry.captureFeedback
     test('captureUserFeedback does not call transport when enabled false', () => {
       const mockTransport = createMockTransport();
       const client = createDisabledClientWith(mockTransport);
 
       client.captureUserFeedback(getMockUserFeedback());
 
-      expect(mockTransport.send).not.toBeCalled();
+      expect(mockTransport.send).not.toHaveBeenCalled();
     });
 
     function createDisabledClientWith(transport: Transport) {
@@ -298,7 +299,7 @@ describe('Tests ReactNativeClient', () => {
       });
       client.nativeCrash();
 
-      expect(RN.NativeModules.RNSentry.crash).toBeCalled();
+      expect(RN.NativeModules.RNSentry.crash).toHaveBeenCalled();
     });
   });
 
@@ -452,7 +453,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureEvent({ message: 'test event' });
 
-      expect(mockedSend).toBeCalled();
+      expect(mockedSend).toHaveBeenCalled();
       const actualEvent: Event | undefined = <Event>(
         mockedSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload]
       );
@@ -486,7 +487,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureEvent(circularEvent);
 
-      expect(mockedSend).toBeCalled();
+      expect(mockedSend).toHaveBeenCalled();
       const actualEvent: Event | undefined = <Event>(
         mockedSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemPayload]
       );
@@ -534,7 +535,7 @@ describe('Tests ReactNativeClient', () => {
 
       client.captureMessage('message_test_value');
 
-      expect(mockTransportSend).toBeCalledTimes(1);
+      expect(mockTransportSend).toHaveBeenCalledTimes(1);
       expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][1][envelopeItemHeader]).toEqual({
         type: 'client_report',
       });
@@ -607,7 +608,7 @@ describe('Tests ReactNativeClient', () => {
       mockDroppedEvent(client);
       client.captureMessage('message_test_value_2');
 
-      expect(mockTransportSend).toBeCalledTimes(2);
+      expect(mockTransportSend).toHaveBeenCalledTimes(2);
       expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems].length).toEqual(2);
       expect(mockTransportSend.mock.calls[0][firstArg][envelopeItems][1][envelopeItemHeader]).toEqual({
         type: 'client_report',
@@ -627,7 +628,7 @@ describe('Tests ReactNativeClient', () => {
     });
 
     function expectOnlyMessageEventInEnvelope(transportSend: jest.Mock) {
-      expect(transportSend).toBeCalledTimes(1);
+      expect(transportSend).toHaveBeenCalledTimes(1);
       expect(transportSend.mock.calls[0][firstArg][envelopeItems]).toHaveLength(1);
       expect(transportSend.mock.calls[0][firstArg][envelopeItems][0][envelopeItemHeader]).toEqual(
         expect.objectContaining({ type: 'event' }),