Merge branch 'main' 4.13.0 into 5.0.0

Author: krystofwoldrich

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Latest changes from 4.12.0
+- Latest changes from 4.13.0
 
 ### Breaking changes
 
@@ -12,6 +12,11 @@
 ### Fixes
 
 - Unreachable fallback to fetch transport if native is not available ([#2695](https://github.com/getsentry/sentry-react-native/pull/2695))
+
+## 4.13.0
+
+### Fixes
+
 - Missing `originalException` in `beforeSend` for events from react native error handler ([#2706](https://github.com/getsentry/sentry-react-native/pull/2706))
 - ModulesLoader integration returns original event if native is not available and event modules overwrite native modules ([#2730](https://github.com/getsentry/sentry-react-native/pull/2730))
 
@@ -20,9 +25,9 @@
 - Bump Cocoa SDK from v7.31.3 to v7.31.5 ([#2699](https://github.com/getsentry/sentry-react-native/pull/2699), [#2714](https://github.com/getsentry/sentry-react-native/pull/2714))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/8.0.0/CHANGELOG.md#7315)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.31.3...7.31.5)
-- Bump JavaScript SDK from v7.26.0 to v7.28.1 ([#2705](https://github.com/getsentry/sentry-react-native/pull/2705), [#2709](https://github.com/getsentry/sentry-react-native/pull/2709), [#2715](https://github.com/getsentry/sentry-react-native/pull/2715))
-  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7281)
-  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.26.0...7.28.1)
+- Bump JavaScript SDK from v7.26.0 to v7.29.0 ([#2705](https://github.com/getsentry/sentry-react-native/pull/2705), [#2709](https://github.com/getsentry/sentry-react-native/pull/2709), [#2715](https://github.com/getsentry/sentry-react-native/pull/2715), [#2736](https://github.com/getsentry/sentry-react-native/pull/2736))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7290)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.26.0...7.29.0)
 - Bump Android SDK from v6.9.2 to v6.11.0 ([#2704](https://github.com/getsentry/sentry-react-native/pull/2704), [#2724](https://github.com/getsentry/sentry-react-native/pull/2724))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6110)
   - [diff](https://github.com/getsentry/sentry-java/compare/6.9.2...6.11.0)

package.json

@@ -42,19 +42,19 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.28.1",
+    "@sentry/browser": "7.29.0",
     "@sentry/cli": "2.10.0",
-    "@sentry/core": "7.28.1",
-    "@sentry/hub": "7.28.1",
-    "@sentry/integrations": "7.28.1",
-    "@sentry/react": "7.28.1",
-    "@sentry/tracing": "7.28.1",
-    "@sentry/types": "7.28.1",
-    "@sentry/utils": "7.28.1"
+    "@sentry/core": "7.29.0",
+    "@sentry/hub": "7.29.0",
+    "@sentry/integrations": "7.29.0",
+    "@sentry/react": "7.29.0",
+    "@sentry/tracing": "7.29.0",
+    "@sentry/types": "7.29.0",
+    "@sentry/utils": "7.29.0"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.28.1",
-    "@sentry-internal/eslint-plugin-sdk": "7.28.1",
+    "@sentry-internal/eslint-config-sdk": "7.29.0",
+    "@sentry-internal/eslint-plugin-sdk": "7.29.0",
     "@sentry/typescript": "^5.20.1",
     "@sentry/wizard": "2.2.0",
     "@types/jest": "^26.0.15",

sample/metro.config.js

@@ -11,7 +11,11 @@ const parentDir = path.resolve(__dirname, '..');
 
 module.exports = {
   projectRoot: __dirname,
-  watchFolders: [path.resolve(__dirname, 'node_modules'), parentDir],
+  watchFolders: [
+    path.resolve(__dirname, 'node_modules'),
+    `${parentDir}/dist`,
+    `${parentDir}/node_modules`,
+  ],
   resolver: {
     blacklistRE: blacklist([
       new RegExp(`${parentDir}/node_modules/react-native/.*`),

test/client.test.ts

@@ -4,7 +4,7 @@ import { rejectedSyncPromise, SentryError } from '@sentry/utils';
 import * as RN from 'react-native';
 
 import { ReactNativeClient } from '../src/js/client';
-import { ReactNativeClientOptions, ReactNativeOptions } from '../src/js/options';
+import { ReactNativeClientOptions } from '../src/js/options';
 import { NativeTransport } from '../src/js/transports/native';
 import { SDK_NAME, SDK_PACKAGE_NAME, SDK_VERSION } from '../src/js/version';
 import { NATIVE } from '../src/js/wrapper';
@@ -67,14 +67,20 @@ jest.mock(
   { virtual: true }
 );
 
-const DEFAULT_OPTIONS: ReactNativeOptions = {
+const DEFAULT_OPTIONS: ReactNativeClientOptions = {
   enableNative: true,
   enableNativeCrashHandling: true,
   enableNativeNagger: true,
   autoInitializeNativeSdk: true,
   enableAutoPerformanceTracking: true,
   enableOutOfMemoryTracking: true,
-  patchGlobalPromise: true
+  patchGlobalPromise: true,
+  integrations: [],
+  transport: () => ({
+    send: jest.fn(),
+    flush: jest.fn(),
+  }),
+  stackParser: jest.fn().mockReturnValue([]),
 };
 
 afterEach(() => {
@@ -89,7 +95,7 @@ describe('Tests ReactNativeClient', () => {
         ...DEFAULT_OPTIONS,
         dsn: EXAMPLE_DSN,
         transport: () => new NativeTransport()
-      } as ReactNativeClientOptions);
+      });
 
       await expect(client.eventFromMessage('test')).resolves.toBeDefined();
       // @ts-ignore: Is Mocked
@@ -103,7 +109,7 @@ describe('Tests ReactNativeClient', () => {
           ...DEFAULT_OPTIONS,
           dsn: 'not a dsn',
           transport: () => new NativeTransport()
-        } as ReactNativeClientOptions);
+        });
       } catch (e: any) {
         expect(e.message).toBe('Invalid Sentry Dsn: not a dsn');
       }
@@ -115,7 +121,7 @@ describe('Tests ReactNativeClient', () => {
           ...DEFAULT_OPTIONS,
           dsn: undefined,
           transport: () => new NativeTransport()
-        } as ReactNativeClientOptions);
+        });
 
         return expect(backend.eventFromMessage('test')).resolves.toBeDefined();
       }).not.toThrow();
@@ -132,7 +138,7 @@ describe('Tests ReactNativeClient', () => {
         ...DEFAULT_OPTIONS,
         dsn: EXAMPLE_DSN,
         transport: myCustomTransportFn
-      } as ReactNativeClientOptions);
+      });
       // eslint-disable-next-line @typescript-eslint/unbound-method
       expect(client.getTransport()?.flush).toBe(myFlush);
       // eslint-disable-next-line @typescript-eslint/unbound-method
@@ -142,7 +148,7 @@ describe('Tests ReactNativeClient', () => {
 
   describe('onReady', () => {
     test('calls onReady callback with true if Native SDK is initialized', (done) => {
-      new ReactNativeClient({
+      new ReactNativeClient(mockedOptions({
         dsn: EXAMPLE_DSN,
         enableNative: true,
         onReady: ({ didCallNativeInit }) => {
@@ -151,11 +157,11 @@ describe('Tests ReactNativeClient', () => {
           done();
         },
         transport: () => new NativeTransport()
-      } as ReactNativeOptions as ReactNativeClientOptions);
+      }));
     });
 
     test('calls onReady callback with false if Native SDK was not initialized', (done) => {
-      new ReactNativeClient({
+      new ReactNativeClient(mockedOptions({
         dsn: EXAMPLE_DSN,
         enableNative: false,
         onReady: ({ didCallNativeInit }) => {
@@ -164,7 +170,7 @@ describe('Tests ReactNativeClient', () => {
           done();
         },
         transport: () => new NativeTransport()
-      } as ReactNativeOptions as ReactNativeClientOptions);
+      }));
     });
 
     test('calls onReady callback with false if Native SDK failed to initialize', (done) => {
@@ -174,7 +180,7 @@ describe('Tests ReactNativeClient', () => {
         throw new Error();
       });
 
-      new ReactNativeClient({
+      new ReactNativeClient(mockedOptions({
         dsn: EXAMPLE_DSN,
         enableNative: true,
         onReady: ({ didCallNativeInit }) => {
@@ -183,7 +189,7 @@ describe('Tests ReactNativeClient', () => {
           done();
         },
         transport: () => new NativeTransport()
-      } as ReactNativeOptions as ReactNativeClientOptions);
+      }));
     });
   });
 
@@ -196,7 +202,7 @@ describe('Tests ReactNativeClient', () => {
         enableNative: true,
         transport: () => new NativeTransport()
 
-      } as ReactNativeClientOptions);
+      });
       client.nativeCrash();
 
       expect(RN.NativeModules.RNSentry.crash).toBeCalled();
@@ -213,7 +219,7 @@ describe('Tests ReactNativeClient', () => {
           send: mockTransportSend,
           flush: jest.fn(),
         }),
-      } as ReactNativeClientOptions);
+      });
 
       client.captureUserFeedback({
         comments: 'Test Comments',
@@ -281,7 +287,7 @@ describe('Tests ReactNativeClient', () => {
           send: mockTransportSend,
           flush: jest.fn(),
         }),
-      } as ReactNativeClientOptions);
+      });
     });
 
     afterEach(() => {
@@ -325,7 +331,7 @@ describe('Tests ReactNativeClient', () => {
         send: mockedSend,
         flush: jest.fn().mockResolvedValue(true),
       });
-      const client  = new ReactNativeClient(<ReactNativeClientOptions>{
+      const client = new ReactNativeClient({
         ...DEFAULT_OPTIONS,
         dsn: EXAMPLE_DSN,
         transport: mockedTransport,
@@ -351,7 +357,7 @@ describe('Tests ReactNativeClient', () => {
         send: mockedSend,
         flush: jest.fn().mockResolvedValue(true),
       });
-      const client = new ReactNativeClient(<ReactNativeClientOptions> {
+      const client = new ReactNativeClient({
         ...DEFAULT_OPTIONS,
         dsn: EXAMPLE_DSN,
         transport: mockedTransport,
@@ -386,7 +392,7 @@ describe('Tests ReactNativeClient', () => {
           flush: jest.fn(),
         }),
         sendClientReports: false,
-      } as ReactNativeClientOptions);
+      });
 
       mockDroppedEvent(client);
 
@@ -405,7 +411,7 @@ describe('Tests ReactNativeClient', () => {
           flush: jest.fn(),
         }),
         sendClientReports: true,
-      } as ReactNativeClientOptions);
+      });
 
       mockDroppedEvent(client);
 
@@ -439,7 +445,7 @@ describe('Tests ReactNativeClient', () => {
           flush: jest.fn(),
         }),
         sendClientReports: true,
-      } as ReactNativeClientOptions);
+      });
 
       client.captureMessage('message_test_value');
 
@@ -457,7 +463,7 @@ describe('Tests ReactNativeClient', () => {
           flush: jest.fn(),
         }),
         sendClientReports: true,
-      } as ReactNativeClientOptions);
+      });
 
       mockDroppedEvent(client);
 
@@ -478,7 +484,7 @@ describe('Tests ReactNativeClient', () => {
           flush: jest.fn(),
         }),
         sendClientReports: true,
-      } as ReactNativeClientOptions);
+      });
 
       mockDroppedEvent(client);
       client.captureMessage('message_test_value_1');
@@ -519,3 +525,15 @@ describe('Tests ReactNativeClient', () => {
     }
   });
 });
+
+function mockedOptions(options: Partial<ReactNativeClientOptions>): ReactNativeClientOptions {
+  return {
+    integrations: [],
+    stackParser: jest.fn().mockReturnValue([]),
+    transport: () => ({
+      send: jest.fn(),
+      flush: jest.fn(),
+    }),
+    ...options,
+  };
+}