@sentry/react-native 7.0.0-beta.2 → 7.0.0-rc.2

package/ios/RNSentry.mm

@@ -21,10 +21,22 @@
 #import <Sentry/PrivateSentrySDKOnly.h>
 #import <Sentry/SentryAppStartMeasurement.h>
 #import <Sentry/SentryBinaryImageCache.h>
+#import <Sentry/SentryBreadcrumb.h>
 #import <Sentry/SentryDebugImageProvider+HybridSDKs.h>
+#import <Sentry/SentryDebugMeta.h>
 #import <Sentry/SentryDependencyContainer.h>
+#import <Sentry/SentryEvent.h>
+#import <Sentry/SentryException.h>
 #import <Sentry/SentryFormatter.h>
-#import <Sentry/SentryOptions+HybridSDKs.h>
+#import <Sentry/SentryOptions.h>
+#import <Sentry/SentryUser.h>
+#if __has_include(<Sentry/SentryOptions+HybridSDKs.h>)
+#    define USE_SENTRY_OPTIONS 1
+#    import <Sentry/SentryOptions+HybridSDKs.h>
+#else
+#    define USE_SENTRY_OPTIONS 0
+#    import <Sentry/SentryOptionsInternal.h>
+#endif
 #import <Sentry/SentryScreenFrames.h>
 
 // This guard prevents importing Hermes in JSC apps
@@ -51,15 +63,7 @@
 
 #import "RNSentryExperimentalOptions.h"
 #import "RNSentryVersion.h"
-
-@interface
-SentrySDK (RNSentry)
-
-+ (void)captureEnvelope:(SentryEnvelope *)envelope;
-
-+ (void)storeEnvelope:(SentryEnvelope *)envelope;
-
-@end
+#import "SentrySDKWrapper.h"
 
 static bool hasFetchedAppStart;
 
@@ -107,7 +111,7 @@ RCT_EXPORT_METHOD(initNativeSdk
     [PrivateSentrySDKOnly addSdkPackage:REACT_NATIVE_SDK_PACKAGE_NAME
                                 version:REACT_NATIVE_SDK_PACKAGE_VERSION];
 
-    [SentrySDK startWithOptions:sentryOptions];
+    [SentrySDKWrapper startWithOptions:sentryOptions];
 
 #if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
     BOOL appIsActive =
@@ -243,8 +247,13 @@ RCT_EXPORT_METHOD(initNativeSdk
     [RNSentryReplay updateOptions:mutableOptions];
 #endif
 
+#if USE_SENTRY_OPTIONS
     SentryOptions *sentryOptions = [[SentryOptions alloc] initWithDict:mutableOptions
                                                       didFailWithError:errorPointer];
+#else
+    SentryOptions *sentryOptions = [SentryOptionsInternal initWithDict:mutableOptions
+                                                      didFailWithError:errorPointer];
+#endif
     if (*errorPointer != nil) {
         return nil;
     }
@@ -432,7 +441,11 @@ RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSString *, fetchNativePackageName)
 - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAddr
                                symbolicate:(SymbolicateCallbackType)symbolicate
 {
+#if CROSS_PLATFORM_TEST
+    BOOL shouldSymbolicateLocally = [SentrySDKInternal.options debug];
+#else
     BOOL shouldSymbolicateLocally = [SentrySDK.options debug];
+#endif
     NSString *appPackageName = [[NSBundle mainBundle] executablePath];
 
     NSMutableSet<NSString *> *_Nonnull imagesAddrToRetrieveDebugMetaImages =
@@ -510,6 +523,58 @@ RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, fetchNativeStackFramesBy
     return [self fetchNativeStackFramesBy:instructionsAddr symbolicate:dladdr];
 }
 
+RCT_EXPORT_METHOD(fetchNativeLogAttributes
+                  : (RCTPromiseResolveBlock)resolve rejecter
+                  : (RCTPromiseRejectBlock)reject)
+{
+    __block NSMutableDictionary<NSString *, id> *result = [NSMutableDictionary new];
+
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
+        // Serialize to get contexts dictionary
+        NSDictionary *serializedScope = [scope serialize];
+        NSDictionary *allContexts = serializedScope[@"context"]; // It's singular here, annoyingly
+
+        NSMutableDictionary *contexts = [NSMutableDictionary new];
+
+        NSDictionary *device = allContexts[@"device"];
+        if ([device isKindOfClass:[NSDictionary class]]) {
+            contexts[@"device"] = device;
+        }
+
+        NSDictionary *os = allContexts[@"os"];
+        if ([os isKindOfClass:[NSDictionary class]]) {
+            contexts[@"os"] = os;
+        }
+
+        NSString *releaseName = [SentrySDK options].releaseName;
+        if (releaseName) {
+            contexts[@"release"] = releaseName;
+        }
+        // Merge extra context
+        NSDictionary *extraContext = [PrivateSentrySDKOnly getExtraContext];
+
+        if (extraContext) {
+            NSDictionary *extraDevice = extraContext[@"device"];
+            if ([extraDevice isKindOfClass:[NSDictionary class]]) {
+                NSMutableDictionary *mergedDevice =
+                    [contexts[@"device"] mutableCopy] ?: [NSMutableDictionary new];
+                [mergedDevice addEntriesFromDictionary:extraDevice];
+                contexts[@"device"] = mergedDevice;
+            }
+
+            NSDictionary *extraOS = extraContext[@"os"];
+            if ([extraOS isKindOfClass:[NSDictionary class]]) {
+                NSMutableDictionary *mergedOS =
+                    [contexts[@"os"] mutableCopy] ?: [NSMutableDictionary new];
+                [mergedOS addEntriesFromDictionary:extraOS];
+                contexts[@"os"] = mergedOS;
+            }
+        }
+        result[@"contexts"] = contexts;
+    }];
+    resolve(result);
+}
+
 RCT_EXPORT_METHOD(fetchNativeDeviceContexts
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject)
@@ -520,7 +585,7 @@ RCT_EXPORT_METHOD(fetchNativeDeviceContexts
     __block NSMutableDictionary<NSString *, id> *serializedScope;
     // Temp work around until sorted out this API in sentry-cocoa.
     // TODO: If the callback isnt' executed the promise wouldn't be resolved.
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         serializedScope = [[scope serialize] mutableCopy];
 
         NSDictionary<NSString *, id> *user = [serializedScope valueForKey:@"user"];
@@ -724,7 +789,7 @@ RCT_EXPORT_METHOD(fetchViewHierarchy
 
 RCT_EXPORT_METHOD(setUser : (NSDictionary *)userKeys otherUserKeys : (NSDictionary *)userDataKeys)
 {
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         [scope setUser:[RNSentry userFrom:userKeys otherUserKeys:userDataKeys]];
     }];
 }
@@ -773,7 +838,7 @@ RCT_EXPORT_METHOD(setUser : (NSDictionary *)userKeys otherUserKeys : (NSDictiona
 
 RCT_EXPORT_METHOD(addBreadcrumb : (NSDictionary *)breadcrumb)
 {
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         [scope addBreadcrumb:[RNSentryBreadcrumb from:breadcrumb]];
     }];
 
@@ -787,12 +852,12 @@ RCT_EXPORT_METHOD(addBreadcrumb : (NSDictionary *)breadcrumb)
 
 RCT_EXPORT_METHOD(clearBreadcrumbs)
 {
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) { [scope clearBreadcrumbs]; }];
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) { [scope clearBreadcrumbs]; }];
 }
 
 RCT_EXPORT_METHOD(setExtra : (NSString *)key extra : (NSString *)extra)
 {
-    [SentrySDK
+    [SentrySDKWrapper
         configureScope:^(SentryScope *_Nonnull scope) { [scope setExtraValue:extra forKey:key]; }];
 }
 
@@ -802,7 +867,7 @@ RCT_EXPORT_METHOD(setContext : (NSString *)key context : (NSDictionary *)context
         return;
     }
 
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
+    [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         if (context == nil) {
             [scope removeContextForKey:key];
         } else {
@@ -813,17 +878,17 @@ RCT_EXPORT_METHOD(setContext : (NSString *)key context : (NSDictionary *)context
 
 RCT_EXPORT_METHOD(setTag : (NSString *)key value : (NSString *)value)
 {
-    [SentrySDK
+    [SentrySDKWrapper
         configureScope:^(SentryScope *_Nonnull scope) { [scope setTagValue:value forKey:key]; }];
 }
 
-RCT_EXPORT_METHOD(crash) { [SentrySDK crash]; }
+RCT_EXPORT_METHOD(crash) { [SentrySDKWrapper crash]; }
 
 RCT_EXPORT_METHOD(closeNativeSdk
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject)
 {
-    [SentrySDK close];
+    [SentrySDKWrapper close];
     resolve(@YES);
 }
 
@@ -1026,7 +1091,7 @@ RCT_EXPORT_METHOD(crashedLastRun
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject)
 {
-    resolve(@([SentrySDK crashedLastRun]));
+    resolve(@([SentrySDKWrapper crashedLastRun]));
 }
 
 // Thanks to this guard, we won't compile this code when we build for the old architecture.

package/ios/RNSentryReplay.mm

@@ -1,5 +1,6 @@
 #import "RNSentryReplay.h"
 #import "RNSentryReplayBreadcrumbConverterHelper.h"
+#import "RNSentryReplayQuality.h"
 #import "RNSentryVersion.h"
 #import "React/RCTTextView.h"
 #import "Replay/RNSentryReplayMask.h"
@@ -22,9 +23,12 @@
     NSLog(@"Setting up session replay");
     NSDictionary *replayOptions = options[@"mobileReplayOptions"] ?: @{};
 
+    NSString *qualityString = options[@"replaysSessionQuality"];
+
     [options setValue:@{
         @"sessionSampleRate" : options[@"replaysSessionSampleRate"] ?: [NSNull null],
         @"errorSampleRate" : options[@"replaysOnErrorSampleRate"] ?: [NSNull null],
+        @"quality" : @([RNSentryReplayQuality parseReplayQuality:qualityString]),
         @"maskAllImages" : replayOptions[@"maskAllImages"] ?: [NSNull null],
         @"maskAllText" : replayOptions[@"maskAllText"] ?: [NSNull null],
         @"enableViewRendererV2" : replayOptions[@"enableViewRendererV2"] ?: [NSNull null],

package/ios/RNSentryReplayBreadcrumbConverter.h

@@ -1,7 +1,7 @@
 @import Sentry;
 
 #if SENTRY_TARGET_REPLAY_SUPPORTED
-@class SentryRRWebEvent;
+@protocol SentryRRWebEvent;
 
 @interface RNSentryReplayBreadcrumbConverter : NSObject <SentryReplayBreadcrumbConverter>
 

package/ios/RNSentryReplayBreadcrumbConverter.m

@@ -50,10 +50,23 @@
     SentryRRWebEvent *nativeBreadcrumb = [self->defaultConverter convertFrom:breadcrumb];
 
     // ignore native navigation breadcrumbs
-    if (nativeBreadcrumb && nativeBreadcrumb.data && nativeBreadcrumb.data[@"payload"]
-        && nativeBreadcrumb.data[@"payload"][@"category"] &&
-        [nativeBreadcrumb.data[@"payload"][@"category"] isEqualToString:@"navigation"]) {
-        return nil;
+    if (nativeBreadcrumb) {
+        @try {
+            id data = [nativeBreadcrumb valueForKey:@"data"];
+            if (data && [data isKindOfClass:[NSDictionary class]]) {
+                NSDictionary *dataDict = (NSDictionary *)data;
+                id payload = dataDict[@"payload"];
+                if (payload && [payload isKindOfClass:[NSDictionary class]]) {
+                    NSDictionary *payloadDict = (NSDictionary *)payload;
+                    NSString *category = payloadDict[@"category"];
+                    if ([category isEqualToString:@"navigation"]) {
+                        return nil;
+                    }
+                }
+            }
+        } @catch (NSException *exception) {
+            // Just continue without ignoring native navigation breadcrumbs
+        }
     }
 
     return nativeBreadcrumb;

package/ios/RNSentryReplayQuality.h

@@ -0,0 +1,13 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, SentryReplayQuality);
+
+@interface RNSentryReplayQuality : NSObject
+
++ (SentryReplayQuality)parseReplayQuality:(NSString *_Nullable)qualityString;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNSentryReplayQuality.m

@@ -0,0 +1,25 @@
+#import "RNSentryReplayQuality.h"
+@import Sentry;
+
+@implementation RNSentryReplayQuality
+
++ (SentryReplayQuality)parseReplayQuality:(NSString *_Nullable)qualityString
+{
+    if (qualityString == nil) {
+        return SentryReplayQualityMedium;
+    }
+
+    NSString *lowercaseQuality = [qualityString lowercaseString];
+
+    if ([lowercaseQuality isEqualToString:@"low"]) {
+        return SentryReplayQualityLow;
+    } else if ([lowercaseQuality isEqualToString:@"medium"]) {
+        return SentryReplayQualityMedium;
+    } else if ([lowercaseQuality isEqualToString:@"high"]) {
+        return SentryReplayQualityHigh;
+    } else {
+        return SentryReplayQualityMedium;
+    }
+}
+
+@end

package/ios/RNSentryVersion.m

@@ -3,4 +3,4 @@
 NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
 NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native";
 NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
-NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"7.0.0-beta.2";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"7.0.0-rc.2";

package/ios/SentrySDKWrapper.h

@@ -0,0 +1,18 @@
+#import <Foundation/Foundation.h>
+
+@class SentryOptions;
+@class SentryScope;
+
+@interface SentrySDKWrapper : NSObject
+
++ (void)configureScope:(void (^)(SentryScope *scope))callback;
+
++ (void)crash;
+
++ (void)close;
+
++ (BOOL)crashedLastRun;
+
++ (void)startWithOptions:(SentryOptions *)options;
+
+@end

package/ios/SentrySDKWrapper.m

@@ -0,0 +1,31 @@
+#import "SentrySDKWrapper.h"
+@import Sentry;
+
+@implementation SentrySDKWrapper
+
++ (void)startWithOptions:(SentryOptions *)options
+{
+    [SentrySDK startWithOptions:options];
+}
+
++ (void)crash
+{
+    [SentrySDK crash];
+}
+
++ (void)close
+{
+    [SentrySDK close];
+}
+
++ (BOOL)crashedLastRun
+{
+    return [SentrySDK crashedLastRun];
+}
+
++ (void)configureScope:(void (^)(SentryScope *scope))callback
+{
+    [SentrySDK configureScope:callback];
+}
+
+@end

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-rc.2",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -65,22 +65,22 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/babel-plugin-component-annotate": "3.5.0",
-    "@sentry/browser": "9.22.0",
-    "@sentry/cli": "2.47.0",
-    "@sentry/core": "9.22.0",
-    "@sentry/react": "9.22.0",
-    "@sentry/types": "9.22.0"
+    "@sentry/babel-plugin-component-annotate": "4.0.2",
+    "@sentry/browser": "10.7.0",
+    "@sentry/cli": "2.50.2",
+    "@sentry/core": "10.7.0",
+    "@sentry/react": "10.7.0",
+    "@sentry/types": "10.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@expo/metro-config": "~0.20.0",
     "@mswjs/interceptors": "^0.25.15",
     "@react-native/babel-preset": "0.77.1",
-    "@sentry-internal/eslint-config-sdk": "9.22.0",
-    "@sentry-internal/eslint-plugin-sdk": "9.22.0",
-    "@sentry-internal/typescript": "9.22.0",
-    "@sentry/wizard": "5.3.0",
+    "@sentry-internal/eslint-config-sdk": "10.7.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.7.0",
+    "@sentry-internal/typescript": "10.7.0",
+    "@sentry/wizard": "6.1.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.9.3",

package/scripts/expo-upload-sourcemaps.js

@@ -129,7 +129,10 @@ try {
   console.warn(error);
 }
 
-loadDotenv(path.join(projectRoot, '.env.sentry-build-plugin'));
+const sentryBuildPluginPath = path.join(projectRoot, '.env.sentry-build-plugin');
+if (fs.existsSync(sentryBuildPluginPath)) {
+  loadDotenv();
+}
 
 let sentryOrg = getEnvVar(SENTRY_ORG);
 let sentryUrl = getEnvVar(SENTRY_URL);

package/scripts/sentry-xcode-debug-files.sh

@@ -24,10 +24,33 @@ LOCAL_NODE_BINARY=${NODE_BINARY:-node}
 RN_PROJECT_ROOT="${PROJECT_DIR}/.."
 
 [ -z "$SENTRY_PROPERTIES" ] && export SENTRY_PROPERTIES=sentry.properties
-[ -z "$SENTRY_DOTENV_PATH" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin"
+[ -z "$SENTRY_DOTENV_PATH" ] && [ -f "$RN_PROJECT_ROOT/.env.sentry-build-plugin" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin"
 
 [ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_PACKAGE_PATH=$("$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))")
-[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="${SENTRY_CLI_PACKAGE_PATH}/bin/sentry-cli"
+[ -z "$SOURCEMAP_FILE" ] && export SOURCEMAP_FILE="$DERIVED_FILE_DIR/main.jsbundle.map"
+
+if [ -z "$SENTRY_CLI_EXECUTABLE" ]; then
+  # Try standard resolution safely
+  RESOLVED_PATH=$(
+    "$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))" 2>/dev/null
+  ) || true
+  if [ -n "$RESOLVED_PATH" ]; then
+    SENTRY_CLI_PACKAGE_PATH="$RESOLVED_PATH/bin/sentry-cli"
+  else
+    # Fallback: parse NODE_PATH from the .bin/sentry-cli shim (file generated by PNPM)
+    PNPM_BIN_PATH="$PWD/../node_modules/@sentry/react-native/node_modules/.bin/sentry-cli"
+
+    if [ -f "$PNPM_BIN_PATH" ]; then
+      CLI_FILE_TEXT=$(cat "$PNPM_BIN_PATH")
+
+      # Filter where PNPM stored Sentry CLI
+      NODE_PATH_LINE=$(echo "$CLI_FILE_TEXT" | grep -oE 'NODE_PATH="[^"]+"' | head -n1)
+      NODE_PATH_VALUE=$(echo "$NODE_PATH_LINE" | sed -E 's/^NODE_PATH="([^"]+)".*/\1/')
+      SENTRY_CLI_PACKAGE_PATH=${NODE_PATH_VALUE%%/bin*}
+    fi
+  fi
+fi
+[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="$SENTRY_CLI_PACKAGE_PATH"
 
 [[ $SENTRY_INCLUDE_NATIVE_SOURCES == "true" ]] && INCLUDE_SOURCES_FLAG="--include-sources" || INCLUDE_SOURCES_FLAG=""
 

package/scripts/sentry-xcode.sh

@@ -13,11 +13,31 @@ LOCAL_NODE_BINARY=${NODE_BINARY:-node}
 RN_PROJECT_ROOT="${PROJECT_DIR}/.."
 
 [ -z "$SENTRY_PROPERTIES" ] && export SENTRY_PROPERTIES=sentry.properties
-[ -z "$SENTRY_DOTENV_PATH" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin"
+[ -z "$SENTRY_DOTENV_PATH" ] && [ -f "$RN_PROJECT_ROOT/.env.sentry-build-plugin" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin"
 [ -z "$SOURCEMAP_FILE" ] && export SOURCEMAP_FILE="$DERIVED_FILE_DIR/main.jsbundle.map"
 
-[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_PACKAGE_PATH=$("$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))")
-[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="${SENTRY_CLI_PACKAGE_PATH}/bin/sentry-cli"
+if [ -z "$SENTRY_CLI_EXECUTABLE" ]; then
+  # Try standard resolution safely
+  RESOLVED_PATH=$(
+    "$LOCAL_NODE_BINARY" --print "require('path').dirname(require.resolve('@sentry/cli/package.json'))" 2>/dev/null
+  ) || true
+  if [ -n "$RESOLVED_PATH" ]; then
+    SENTRY_CLI_PACKAGE_PATH="$RESOLVED_PATH/bin/sentry-cli"
+  else
+    # Fallback: parse NODE_PATH from the .bin/sentry-cli shim (file generated by PNPM)
+    PNPM_BIN_PATH="$PWD/../node_modules/@sentry/react-native/node_modules/.bin/sentry-cli"
+
+    if [ -f "$PNPM_BIN_PATH" ]; then
+      CLI_FILE_TEXT=$(cat "$PNPM_BIN_PATH")
+
+      # Filter where PNPM stored Sentry CLI
+      NODE_PATH_LINE=$(echo "$CLI_FILE_TEXT" | grep -oE 'NODE_PATH="[^"]+"' | head -n1)
+      NODE_PATH_VALUE=$(echo "$NODE_PATH_LINE" | sed -E 's/^NODE_PATH="([^"]+)".*/\1/')
+      SENTRY_CLI_PACKAGE_PATH=${NODE_PATH_VALUE%%/bin*}
+    fi
+  fi
+fi
+[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="$SENTRY_CLI_PACKAGE_PATH"
 
 REACT_NATIVE_XCODE=$1
 

package/sentry.gradle

@@ -167,11 +167,7 @@ project.afterEvaluate {
                           project.logger.info("file not found '$propertiesFile' for '$variant'")
                       }
 
-                      def resolvedCliPackage = null
-                      try {
-                          resolvedCliPackage = new File(["node", "--print", "require.resolve('@sentry/cli/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
-                      } catch (Throwable ignored) {}
-                      def cliPackage = resolvedCliPackage != null && resolvedCliPackage.exists() ? resolvedCliPackage.getAbsolutePath() : "$reactRoot/node_modules/@sentry/cli"
+                      def cliPackage = resolveSentryCliPackagePath(reactRoot)
                       def cliExecutable = sentryProps.get("cli.executable", "$cliPackage/bin/sentry-cli")
 
                       // fix path separator for Windows
@@ -205,7 +201,7 @@ project.afterEvaluate {
 
                       project.logger.lifecycle("Sentry-CLI arguments: ${args}")
                       def osCompatibility = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c', 'node'] : []
-                      if (!System.getenv('SENTRY_DOTENV_PATH')) {
+                      if (!System.getenv('SENTRY_DOTENV_PATH') && file("$reactRoot/.env.sentry-build-plugin").exists()) {
                           environment('SENTRY_DOTENV_PATH', "$reactRoot/.env.sentry-build-plugin")
                       }
                       commandLine(*osCompatibility, *args)
@@ -306,6 +302,31 @@ def resolveSentryReactNativeSDKPath(reactRoot) {
     return sentryPackage
 }
 
+def resolveSentryCliPackagePath(reactRoot) {
+    def resolvedCliPath = null
+    try {
+        resolvedCliPath = new File(["node", "--print", "require.resolve('@sentry/cli/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
+    } catch (Throwable ignored) { // Check if it's located in .pnpm
+        try {
+            def pnpmRefPath = reactRoot.toString() + "/node_modules/@sentry/react-native/node_modules/.bin/sentry-cli"
+            def sentryCliFile = new File(pnpmRefPath)
+
+            if (sentryCliFile.exists()) {
+                def cliFileText = sentryCliFile.text
+                def matcher = cliFileText =~ /NODE_PATH="([^"]*?)@sentry\/cli\//
+
+                if (matcher.find()) {
+                    def match = matcher.group(1)
+                    resolvedCliPath = new File(match + "@sentry/cli")
+                }
+            }
+        } catch (Throwable ignored2) {} // if the resolve fails we fallback to the default path
+    }
+
+    def cliPackage = resolvedCliPath != null && resolvedCliPath.exists() ? resolvedCliPath.getAbsolutePath() : "$reactRoot/node_modules/@sentry/cli"
+    return cliPackage
+}
+
 /** Compose lookup map of build variants - to - outputs. */
 def extractReleasesInfo() {
     def releases = [:]

package/src/js/NativeRNSentry.ts

@@ -24,6 +24,7 @@ export interface Spec extends TurboModule {
   fetchNativeRelease(): Promise<NativeReleaseResponse>;
   fetchNativeSdkInfo(): Promise<Package | null>;
   fetchNativeDeviceContexts(): Promise<NativeDeviceContextsResponse | null>;
+  fetchNativeLogAttributes(): Promise<NativeDeviceContextsResponse | null>;
   fetchNativeAppStart(): Promise<NativeAppStartResponse | null>;
   fetchNativeFrames(): Promise<NativeFramesResponse | null>;
   initNativeSdk(options: UnsafeObject): Promise<boolean>;

package/ts3.8/dist/js/NativeRNSentry.d.ts

@@ -17,6 +17,7 @@ export interface Spec extends TurboModule {
     fetchNativeRelease(): Promise<NativeReleaseResponse>;
     fetchNativeSdkInfo(): Promise<Package | null>;
     fetchNativeDeviceContexts(): Promise<NativeDeviceContextsResponse | null>;
+    fetchNativeLogAttributes(): Promise<NativeDeviceContextsResponse | null>;
     fetchNativeAppStart(): Promise<NativeAppStartResponse | null>;
     fetchNativeFrames(): Promise<NativeFramesResponse | null>;
     initNativeSdk(options: UnsafeObject): Promise<boolean>;

package/ts3.8/dist/js/client.d.ts

@@ -1,5 +1,5 @@
 import type { Envelope, Event, EventHint, SeverityLevel, TransportMakeRequestResponse, UserFeedback } from '@sentry/core';
-import { BaseClient } from '@sentry/core';
+import { Client } from '@sentry/core';
 import type { ReactNativeClientOptions } from './options';
 /**
  * The Sentry React Native SDK Client.
@@ -7,7 +7,7 @@ import type { ReactNativeClientOptions } from './options';
  * @see ReactNativeClientOptions for documentation on configuration options.
  * @see SentryClient for usage documentation.
  */
-export declare class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
+export declare class ReactNativeClient extends Client<ReactNativeClientOptions> {
     private _outcomesBuffer;
     private _logFlushIdleTimeout;
     /**

package/ts3.8/dist/js/index.d.ts

@@ -1,5 +1,5 @@
 export type { Breadcrumb, SdkInfo, Event, Exception, SendFeedbackParams, SeverityLevel, Span, StackFrame, Stacktrace, Thread, User, UserFeedback, ErrorEvent, TransactionEvent, } from '@sentry/core';
-export { addBreadcrumb, captureException, captureEvent, captureFeedback, captureMessage, Scope, setContext, setExtra, setExtras, setTag, setTags, setUser, startInactiveSpan, startSpan, startSpanManual, getActiveSpan, getRootSpan, withActiveSpan, suppressTracing, spanToJSON, spanIsSampled, setMeasurement, getCurrentScope, getGlobalScope, getIsolationScope, getClient, setCurrentClient, addEventProcessor, lastEventId, } from '@sentry/core';
+export { addBreadcrumb, addIntegration, captureException, captureEvent, captureFeedback, captureMessage, Scope, setContext, setExtra, setExtras, setTag, setTags, setUser, startInactiveSpan, startSpan, startSpanManual, getActiveSpan, getRootSpan, withActiveSpan, suppressTracing, spanToJSON, spanIsSampled, setMeasurement, getCurrentScope, getGlobalScope, getIsolationScope, getClient, setCurrentClient, addEventProcessor, lastEventId, } from '@sentry/core';
 export { ErrorBoundary, withErrorBoundary, createReduxEnhancer, Profiler, useProfiler, withProfiler, } from '@sentry/react';
 export type { FeatureFlagsIntegration } from '@sentry/browser';
 export { logger, consoleLoggingIntegration, featureFlagsIntegration } from '@sentry/browser';

package/ts3.8/dist/js/integrations/exports.d.ts

@@ -24,5 +24,6 @@ export { appRegistryIntegration } from './appRegistry';
 export { timeToDisplayIntegration } from '../tracing/integrations/timeToDisplayIntegration';
 export { breadcrumbsIntegration } from './breadcrumbs';
 export { primitiveTagIntegration } from './primitiveTagIntegration';
+export { logEnricherIntegration } from './logEnricherIntegration';
 export { browserApiErrorsIntegration, dedupeIntegration, functionToStringIntegration, globalHandlersIntegration as browserGlobalHandlersIntegration, httpClientIntegration, httpContextIntegration, inboundFiltersIntegration, linkedErrorsIntegration as browserLinkedErrorsIntegration, rewriteFramesIntegration, extraErrorDataIntegration, } from '@sentry/react';
 //# sourceMappingURL=exports.d.ts.map

package/ts3.8/dist/js/integrations/logEnricherIntegration.d.ts

@@ -0,0 +1,3 @@
+import type { Integration } from '@sentry/core';
+export declare const logEnricherIntegration: () => Integration;
+//# sourceMappingURL=logEnricherIntegration.d.ts.map

package/ts3.8/dist/js/options.d.ts

@@ -207,6 +207,13 @@ export interface BaseReactNativeOptions {
      * problems.
      */
     shutdownTimeout?: number;
+    /**
+     * Defines the quality of the session replay. The higher the quality, the more accurate the replay
+     * will be, but also more data to transfer and more CPU load.
+     *
+     * @default 'medium'
+     */
+    replaysSessionQuality?: SentryReplayQuality;
     /**
      * Options which are in beta, or otherwise not guaranteed to be stable.
      */
@@ -243,6 +250,7 @@ export interface BaseReactNativeOptions {
      */
     useThreadsForMessageStack?: boolean;
 }
+export type SentryReplayQuality = 'low' | 'medium' | 'high';
 export interface ReactNativeTransportOptions extends BrowserTransportOptions {
     /**
      * @deprecated use `maxQueueSize` in the root of the SDK options.

package/ts3.8/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "7.0.0-beta.2";
+export declare const SDK_VERSION = "7.0.0-rc.2";
 //# sourceMappingURL=version.d.ts.map

package/ts3.8/dist/js/wrapper.d.ts

@@ -45,6 +45,7 @@ interface SentryNativeWrapper {
     captureScreenshot(): Promise<Screenshot[] | null>;
     fetchNativeRelease(): PromiseLike<NativeReleaseResponse>;
     fetchNativeDeviceContexts(): PromiseLike<NativeDeviceContextsResponse | null>;
+    fetchNativeLogAttributes(): Promise<NativeDeviceContextsResponse | null>;
     fetchNativeAppStart(): PromiseLike<NativeAppStartResponse | null>;
     fetchNativeFrames(): PromiseLike<NativeFramesResponse | null>;
     fetchNativeSdkInfo(): PromiseLike<Package | null>;