Merge branch 'main' into 5.0.0

Author: krystofwoldrich

.eslintrc.js

@@ -14,6 +14,7 @@ module.exports = {
   },
   ignorePatterns: [
     'test/react-native/versions/*',
+    'coverage/**/*',
   ],
   overrides: [
     {
@@ -58,5 +59,7 @@ module.exports = {
   rules: {
     // Bundle size isn't too much of an issue for React Native.
     '@sentry-internal/sdk/no-async-await': 'off',
+    '@sentry-internal/sdk/no-optional-chaining': 'off',
+    '@sentry-internal/sdk/no-nullish-coalescing': 'off',
   },
 };

.github/workflows/e2e.yml

@@ -31,7 +31,7 @@ jobs:
         platform: ['ios', 'android']
         include:
           - platform: ios
-            runtime: '16.0'
+            runtime: 'latest'
             device: 'iPhone 14'
     steps:
       - uses: actions/checkout@v3
@@ -89,9 +89,8 @@ jobs:
             mkdir -p DerivedData
             defaults write com.apple.dt.Xcode ShowBuildOperationDuration YES
             buildArgs=(
-              '-destination' 'platform=iOS Simulator,name=${{ matrix.device }}'
+              '-destination' 'platform=iOS Simulator,OS=${{ matrix.runtime }},name=${{ matrix.device }}'
               'ONLY_ACTIVE_ARCH=yes'
-              '-sdk' 'iphonesimulator${{ matrix.runtime }}'
               '-derivedDataPath' $(cd "DerivedData" ; pwd -P)
             )
             echo "buildArgs = ${buildArgs[@]}"
@@ -242,7 +241,7 @@ jobs:
         build-type: ['dev', 'production']
         include:
           - platform: ios
-            runtime: '16.0'
+            runtime: 'latest'
             device: 'iPhone 14'
         # exclude all rn versions lower than 0.70.0 for new architecture
         exclude:
@@ -354,9 +353,9 @@ jobs:
             -workspace RnDiffApp.xcworkspace \
             -configuration "$CONFIG" \
             -scheme RnDiffApp \
-            -destination 'platform=iOS Simulator,name=${{ matrix.device }}' \
+            -destination 'platform=iOS Simulator,OS=${{ matrix.runtime }},name=${{ matrix.device }}' \
             ONLY_ACTIVE_ARCH=yes \
-            -sdk 'iphonesimulator${{ matrix.runtime }}' \
+            -sdk 'iphonesimulator' \
             -derivedDataPath "$derivedData" \
             build
 

CHANGELOG.md

@@ -14,6 +14,9 @@
 - Bump Android SDK from v6.11.0 to v6.12.1 ([#2755](https://github.com/getsentry/sentry-react-native/pull/2755))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6121)
   - [diff](https://github.com/getsentry/sentry-java/compare/6.11.0...6.12.1)
+- Bump JavaScript SDK from v7.29.0 to v7.31.1 ([#2738](https://github.com/getsentry/sentry-react-native/pull/2738))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7311)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.29.0...7.31.1)
 
 ## 5.0.0-alpha.11
 

package.json

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

src/js/NativeRNSentry.ts

@@ -1,5 +1,6 @@
-import { Package } from '@sentry/types';
-import { TurboModule, TurboModuleRegistry } from 'react-native';
+import type { Package } from '@sentry/types';
+import type { TurboModule} from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
 import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
 
 // There has to be only one interface and it has to be named `Spec`

src/js/breadcrumb.ts

@@ -1,4 +1,4 @@
-import { Breadcrumb, SeverityLevel } from '@sentry/types';
+import type { Breadcrumb, SeverityLevel } from '@sentry/types';
 import { severityLevelFromString } from '@sentry/utils';
 
 export const DEFAULT_BREADCRUMB_LEVEL: SeverityLevel = 'info';

src/js/client.ts

@@ -1,6 +1,6 @@
 import { eventFromException, eventFromMessage } from '@sentry/browser';
 import { BaseClient } from '@sentry/core';
-import {
+import type {
   ClientReportEnvelope,
   ClientReportItem,
   Envelope,
@@ -17,7 +17,7 @@ import { Alert } from 'react-native';
 
 import { Screenshot } from './integrations/screenshot';
 import { defaultSdkInfo } from './integrations/sdkinfo';
-import { ReactNativeClientOptions } from './options';
+import type { ReactNativeClientOptions } from './options';
 import { createUserFeedbackEnvelope, items } from './utils/envelope';
 import { ignoreRequireCycleLogs } from './utils/ignorerequirecyclelogs';
 import { mergeOutcomes } from './utils/outcome';

src/js/integrations/debugsymbolicator.ts

@@ -1,5 +1,5 @@
 import { addGlobalEventProcessor, getCurrentHub } from '@sentry/core';
-import { Event, EventHint, Integration, StackFrame } from '@sentry/types';
+import type { Event, EventHint, Integration, StackFrame } from '@sentry/types';
 import { addContextToFrame, logger } from '@sentry/utils';
 
 const INTERNAL_CALLSITES_REGEX = new RegExp(

src/js/integrations/devicecontext.ts

@@ -1,9 +1,9 @@
 /* eslint-disable complexity */
-import { Event, EventProcessor, Hub, Integration } from '@sentry/types';
+import type { Event, EventProcessor, Hub, Integration } from '@sentry/types';
 import { logger, severityLevelFromString } from '@sentry/utils';
 
 import { breadcrumbFromObject } from '../breadcrumb';
-import { NativeDeviceContextsResponse } from '../NativeRNSentry';
+import type { NativeDeviceContextsResponse } from '../NativeRNSentry';
 import { NATIVE } from '../wrapper';
 
 /** Load device context from native. */

src/js/integrations/eventorigin.ts

@@ -1,4 +1,4 @@
-import { EventProcessor, Integration } from '@sentry/types';
+import type { EventProcessor, Integration } from '@sentry/types';
 
 /** Default EventOrigin instrumentation */
 export class EventOrigin implements Integration {