@sentry/react-native 6.0.0 → 6.2.0

package/ios/RNSentryReplayBreadcrumbConverter.m

@@ -5,162 +5,169 @@
 #if SENTRY_TARGET_REPLAY_SUPPORTED
 
 @implementation RNSentryReplayBreadcrumbConverter {
-  SentrySRDefaultBreadcrumbConverter *defaultConverter;
+    SentrySRDefaultBreadcrumbConverter *defaultConverter;
 }
 
-- (instancetype _Nonnull)init {
-  if (self = [super init]) {
-    self->defaultConverter =
-        [SentrySessionReplayIntegration createDefaultBreadcrumbConverter];
-  }
-  return self;
+- (instancetype _Nonnull)init
+{
+    if (self = [super init]) {
+        self->defaultConverter = [SentrySessionReplayIntegration createDefaultBreadcrumbConverter];
+    }
+    return self;
 }
 
-- (id<SentryRRWebEvent> _Nullable)convertFrom:
-    (SentryBreadcrumb *_Nonnull)breadcrumb {
-  assert(breadcrumb.timestamp != nil);
+- (id<SentryRRWebEvent> _Nullable)convertFrom:(SentryBreadcrumb *_Nonnull)breadcrumb
+{
+    assert(breadcrumb.timestamp != nil);
 
-  if ([breadcrumb.category isEqualToString:@"sentry.event"] ||
-      [breadcrumb.category isEqualToString:@"sentry.transaction"]) {
-    // Do not add Sentry Event breadcrumbs to replay
-    return nil;
-  }
+    if ([breadcrumb.category isEqualToString:@"sentry.event"] ||
+        [breadcrumb.category isEqualToString:@"sentry.transaction"]) {
+        // Do not add Sentry Event breadcrumbs to replay
+        return nil;
+    }
 
-  if ([breadcrumb.category isEqualToString:@"http"]) {
-    // Drop native network breadcrumbs to avoid duplicates
-    return nil;
-  }
+    if ([breadcrumb.category isEqualToString:@"http"]) {
+        // Drop native network breadcrumbs to avoid duplicates
+        return nil;
+    }
 
-  if ([breadcrumb.category isEqualToString:@"touch"]) {
-    return [self convertTouch:breadcrumb];
-  }
+    if ([breadcrumb.category isEqualToString:@"touch"]) {
+        return [self convertTouch:breadcrumb];
+    }
 
-  if ([breadcrumb.category isEqualToString:@"navigation"]) {
-    return [SentrySessionReplayIntegration
-        createBreadcrumbwithTimestamp:breadcrumb.timestamp
-                             category:breadcrumb.category
-                              message:nil
-                                level:breadcrumb.level
-                                 data:breadcrumb.data];
-  }
-
-  if ([breadcrumb.category isEqualToString:@"xhr"]) {
-    return [self convertNavigation:breadcrumb];
-  }
-
-  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;
-  }
-
-  return nativeBreadcrumb;
-}
+    if ([breadcrumb.category isEqualToString:@"navigation"]) {
+        return [SentrySessionReplayIntegration createBreadcrumbwithTimestamp:breadcrumb.timestamp
+                                                                    category:breadcrumb.category
+                                                                     message:nil
+                                                                       level:breadcrumb.level
+                                                                        data:breadcrumb.data];
+    }
 
-- (id<SentryRRWebEvent> _Nullable) convertTouch:(SentryBreadcrumb *_Nonnull)breadcrumb {
-  if (breadcrumb.data == nil) {
-    return nil;
-  }
+    if ([breadcrumb.category isEqualToString:@"xhr"]) {
+        return [self convertNavigation:breadcrumb];
+    }
 
-  NSMutableArray *path = [breadcrumb.data valueForKey:@"path"];
-  NSString* message = [RNSentryReplayBreadcrumbConverter getTouchPathMessageFrom:path];
+    SentryRRWebEvent *nativeBreadcrumb = [self->defaultConverter convertFrom:breadcrumb];
 
-  return [SentrySessionReplayIntegration
-      createBreadcrumbwithTimestamp:breadcrumb.timestamp
-                           category:@"ui.tap"
-                            message:message
-                              level:breadcrumb.level
-                               data:breadcrumb.data];
+    // ignore native navigation breadcrumbs
+    if (nativeBreadcrumb && nativeBreadcrumb.data && nativeBreadcrumb.data[@"payload"]
+        && nativeBreadcrumb.data[@"payload"][@"category"] &&
+        [nativeBreadcrumb.data[@"payload"][@"category"] isEqualToString:@"navigation"]) {
+        return nil;
+    }
+
+    return nativeBreadcrumb;
 }
 
-+ (NSString* _Nullable) getTouchPathMessageFrom:(NSArray* _Nullable) path {
-  if (path == nil) {
-    return nil;
-  }
+- (id<SentryRRWebEvent> _Nullable)convertTouch:(SentryBreadcrumb *_Nonnull)breadcrumb
+{
+    if (breadcrumb.data == nil) {
+        return nil;
+    }
+
+    NSMutableArray *path = [breadcrumb.data valueForKey:@"path"];
+    NSString *message = [RNSentryReplayBreadcrumbConverter getTouchPathMessageFrom:path];
 
-  NSInteger pathCount = [path count];
-  if (pathCount <= 0) {
-    return nil;
-  }
+    return [SentrySessionReplayIntegration createBreadcrumbwithTimestamp:breadcrumb.timestamp
+                                                                category:@"ui.tap"
+                                                                 message:message
+                                                                   level:breadcrumb.level
+                                                                    data:breadcrumb.data];
+}
 
-  NSMutableString *message = [[NSMutableString alloc] init];
-  for (NSInteger i = MIN(3, pathCount - 1); i >= 0; i--) {
-    NSDictionary *item = [path objectAtIndex:i];
-    if (item == nil) {
-      return nil; // There should be no nil (undefined) from JS, but to be safe we check it here
++ (NSString *_Nullable)getTouchPathMessageFrom:(NSArray *_Nullable)path
+{
+    if (path == nil) {
+        return nil;
     }
 
-    id name = [item objectForKey:@"name"];
-    id label = [item objectForKey:@"label"];
-    BOOL hasName = [name isKindOfClass:[NSString class]];
-    BOOL hasLabel = [label isKindOfClass:[NSString class]];
-    if (!hasName && !hasLabel) {
-      return nil; // This again should never be allowed in JS, but to be safe we check it here
-    }
-    if (hasLabel) {
-      [message appendString:(NSString *)label];
-    } else if (hasName) {
-      [message appendString:(NSString *)name];
+    NSInteger pathCount = [path count];
+    if (pathCount <= 0) {
+        return nil;
     }
 
-    id element = [item objectForKey:@"element"];
-    id file = [item objectForKey:@"file"];
-    BOOL hasElement = [element isKindOfClass:[NSString class]];
-    BOOL hasFile = [file isKindOfClass:[NSString class]];
-    if (hasElement && hasFile) {
-      [message appendFormat:@"(%@, %@)", (NSString *)element, (NSString *)file];
-    } else if (hasElement) {
-      [message appendFormat:@"(%@)", (NSString *)element];
-    } else if (hasFile) {
-      [message appendFormat:@"(%@)", (NSString *)file];
+    NSMutableString *message = [[NSMutableString alloc] init];
+    for (NSInteger i = MIN(3, pathCount - 1); i >= 0; i--) {
+        NSDictionary *item = [path objectAtIndex:i];
+        if (item == nil) {
+            return nil; // There should be no nil (undefined) from JS, but to be safe we check it
+                        // here
+        }
+
+        id name = [item objectForKey:@"name"];
+        id label = [item objectForKey:@"label"];
+        BOOL hasName = [name isKindOfClass:[NSString class]];
+        BOOL hasLabel = [label isKindOfClass:[NSString class]];
+        if (!hasName && !hasLabel) {
+            return nil; // This again should never be allowed in JS, but to be safe we check it here
+        }
+        if (hasLabel) {
+            [message appendString:(NSString *)label];
+        } else if (hasName) {
+            [message appendString:(NSString *)name];
+        }
+
+        id element = [item objectForKey:@"element"];
+        id file = [item objectForKey:@"file"];
+        BOOL hasElement = [element isKindOfClass:[NSString class]];
+        BOOL hasFile = [file isKindOfClass:[NSString class]];
+        if (hasElement && hasFile) {
+            [message appendFormat:@"(%@, %@)", (NSString *)element, (NSString *)file];
+        } else if (hasElement) {
+            [message appendFormat:@"(%@)", (NSString *)element];
+        } else if (hasFile) {
+            [message appendFormat:@"(%@)", (NSString *)file];
+        }
+
+        if (i > 0) {
+            [message appendString:@" > "];
+        }
     }
 
-    if (i > 0) {
-      [message appendString:@" > "];
+    return message;
+}
+
+- (id<SentryRRWebEvent> _Nullable)convertNavigation:(SentryBreadcrumb *_Nonnull)breadcrumb
+{
+    NSNumber *startTimestamp = [breadcrumb.data[@"start_timestamp"] isKindOfClass:[NSNumber class]]
+        ? breadcrumb.data[@"start_timestamp"]
+        : nil;
+    NSNumber *endTimestamp = [breadcrumb.data[@"end_timestamp"] isKindOfClass:[NSNumber class]]
+        ? breadcrumb.data[@"end_timestamp"]
+        : nil;
+    NSString *url =
+        [breadcrumb.data[@"url"] isKindOfClass:[NSString class]] ? breadcrumb.data[@"url"] : nil;
+
+    if (startTimestamp == nil || endTimestamp == nil || url == nil) {
+        return nil;
     }
-  }
 
-  return message;
-}
+    NSMutableDictionary *data = [[NSMutableDictionary alloc] init];
+    if ([breadcrumb.data[@"method"] isKindOfClass:[NSString class]]) {
+        data[@"method"] = breadcrumb.data[@"method"];
+    }
+    if ([breadcrumb.data[@"status_code"] isKindOfClass:[NSNumber class]]) {
+        data[@"statusCode"] = breadcrumb.data[@"status_code"];
+    }
+    if ([breadcrumb.data[@"request_body_size"] isKindOfClass:[NSNumber class]]) {
+        data[@"requestBodySize"] = breadcrumb.data[@"request_body_size"];
+    }
+    if ([breadcrumb.data[@"response_body_size"] isKindOfClass:[NSNumber class]]) {
+        data[@"responseBodySize"] = breadcrumb.data[@"response_body_size"];
+    }
 
-- (id<SentryRRWebEvent> _Nullable)convertNavigation: (SentryBreadcrumb *_Nonnull)breadcrumb {
-  NSNumber* startTimestamp = [breadcrumb.data[@"start_timestamp"] isKindOfClass:[NSNumber class]]
-    ? breadcrumb.data[@"start_timestamp"] : nil;
-  NSNumber* endTimestamp = [breadcrumb.data[@"end_timestamp"] isKindOfClass:[NSNumber class]]
-    ? breadcrumb.data[@"end_timestamp"] : nil;
-  NSString* url = [breadcrumb.data[@"url"] isKindOfClass:[NSString class]]
-    ? breadcrumb.data[@"url"] : nil;
-
-  if (startTimestamp == nil || endTimestamp == nil || url == nil) {
-    return nil;
-  }
-
-  NSMutableDictionary* data = [[NSMutableDictionary alloc] init];
-  if ([breadcrumb.data[@"method"] isKindOfClass:[NSString class]]) {
-    data[@"method"] = breadcrumb.data[@"method"];
-  }
-  if ([breadcrumb.data[@"status_code"] isKindOfClass:[NSNumber class]]) {
-    data[@"statusCode"] = breadcrumb.data[@"status_code"];
-  }
-  if ([breadcrumb.data[@"request_body_size"] isKindOfClass:[NSNumber class]]) {
-    data[@"requestBodySize"] = breadcrumb.data[@"request_body_size"];
-  }
-  if ([breadcrumb.data[@"response_body_size"] isKindOfClass:[NSNumber class]]) {
-    data[@"responseBodySize"] = breadcrumb.data[@"response_body_size"];
-  }
-
-  return [SentrySessionReplayIntegration
-          createNetworkBreadcrumbWithTimestamp:[NSDate dateWithTimeIntervalSince1970:(startTimestamp.doubleValue / 1000)]
-          endTimestamp:[NSDate dateWithTimeIntervalSince1970:(endTimestamp.doubleValue / 1000)]
-          operation:@"resource.http"
-          description:url
-          data:data];
+    return [SentrySessionReplayIntegration
+        createNetworkBreadcrumbWithTimestamp:[NSDate
+                                                 dateWithTimeIntervalSince1970:(startTimestamp
+                                                                                       .doubleValue
+                                                                                   / 1000)]
+                                endTimestamp:[NSDate
+                                                 dateWithTimeIntervalSince1970:(endTimestamp
+                                                                                       .doubleValue
+                                                                                   / 1000)]
+                                   operation:@"resource.http"
+                                 description:url
+                                        data:data];
 }
 
 @end

package/ios/RNSentryTimeToDisplay.h

@@ -0,0 +1,7 @@
+#import <React/RCTBridgeModule.h>
+
+@interface RNSentryTimeToDisplay : NSObject
+
+- (void)getTimeToDisplay:(RCTResponseSenderBlock)callback;
+
+@end

package/ios/RNSentryTimeToDisplay.m

@@ -0,0 +1,44 @@
+#import "RNSentryTimeToDisplay.h"
+#import <QuartzCore/QuartzCore.h>
+#import <React/RCTLog.h>
+
+@implementation RNSentryTimeToDisplay {
+    CADisplayLink *displayLink;
+    RCTResponseSenderBlock resolveBlock;
+}
+
+// Rename requestAnimationFrame to getTimeToDisplay
+- (void)getTimeToDisplay:(RCTResponseSenderBlock)callback
+{
+    // Store the resolve block to use in the callback.
+    resolveBlock = callback;
+
+#if TARGET_OS_IOS
+    // Create and add a display link to get the callback after the screen is rendered.
+    displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(handleDisplayLink:)];
+    [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+#else
+    resolveBlock(@[]); // Return nothing if not iOS.
+#endif
+}
+
+#if TARGET_OS_IOS
+- (void)handleDisplayLink:(CADisplayLink *)link
+{
+    // Get the current time
+    NSTimeInterval currentTime =
+        [[NSDate date] timeIntervalSince1970] * 1000.0; // Convert to milliseconds
+
+    // Ensure the callback is valid and pass the current time back
+    if (resolveBlock) {
+        resolveBlock(@[ @(currentTime) ]); // Call the callback with the current time
+        resolveBlock = nil; // Clear the block after it's called
+    }
+
+    // Invalidate the display link to stop future callbacks
+    [displayLink invalidate];
+    displayLink = nil;
+}
+#endif
+
+@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": "6.0.0",
+  "version": "6.2.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -66,22 +66,23 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "2.20.1",
-    "@sentry/browser": "8.33.1",
-    "@sentry/cli": "2.37.0",
-    "@sentry/core": "8.33.1",
-    "@sentry/react": "8.33.1",
-    "@sentry/types": "8.33.1",
-    "@sentry/utils": "8.33.1"
+    "@sentry/browser": "8.37.1",
+    "@sentry/cli": "2.38.2",
+    "@sentry/core": "8.37.1",
+    "@sentry/react": "8.37.1",
+    "@sentry/types": "8.37.1",
+    "@sentry/utils": "8.37.1"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
     "@expo/metro-config": "0.17.5",
     "@mswjs/interceptors": "^0.25.15",
-    "@sentry-internal/eslint-config-sdk": "8.33.1",
-    "@sentry-internal/eslint-plugin-sdk": "8.33.1",
-    "@sentry-internal/typescript": "8.33.1",
-    "@sentry/wizard": "3.16.3",
-    "@testing-library/react-native": "^12.6.1",
+    "@react-native/babel-preset": "0.75.4",
+    "@sentry-internal/eslint-config-sdk": "8.37.1",
+    "@sentry-internal/eslint-plugin-sdk": "8.37.1",
+    "@sentry-internal/typescript": "8.37.1",
+    "@sentry/wizard": "3.34.4",
+    "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.3",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
@@ -105,9 +106,9 @@
     "madge": "^6.1.0",
     "metro": "0.80.10",
     "prettier": "^2.0.5",
-    "react": "18.2.0",
-    "react-native": "0.73.9",
-    "react-test-renderer": "^18.2.0",
+    "react": "18.3.1",
+    "react-native": "0.75.4",
+    "react-test-renderer": "^18.3.1",
     "rimraf": "^4.1.1",
     "ts-jest": "^29.1.1",
     "typescript": "4.9.5",

package/plugin/build/utils.js

@@ -23,12 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SDK_PACKAGE_NAME = exports.sdkPackage = void 0;
-exports.writeSentryPropertiesTo = writeSentryPropertiesTo;
-exports.warnOnce = warnOnce;
-exports.logPrefix = logPrefix;
-exports.yellow = yellow;
-exports.bold = bold;
+exports.SDK_PACKAGE_NAME = exports.sdkPackage = exports.bold = exports.yellow = exports.logPrefix = exports.warnOnce = exports.writeSentryPropertiesTo = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 function writeSentryPropertiesTo(filepath, sentryProperties) {
@@ -37,6 +32,7 @@ function writeSentryPropertiesTo(filepath, sentryProperties) {
     }
     fs.writeFileSync(path.resolve(filepath, 'sentry.properties'), sentryProperties);
 }
+exports.writeSentryPropertiesTo = writeSentryPropertiesTo;
 const sdkPackage = require('../../package.json');
 exports.sdkPackage = sdkPackage;
 const SDK_PACKAGE_NAME = `${sdkPackage.name}/expo`;
@@ -49,9 +45,11 @@ function warnOnce(message) {
         console.warn(yellow(`${logPrefix()} ${message}`));
     }
 }
+exports.warnOnce = warnOnce;
 function logPrefix() {
     return `› ${bold('[@sentry/react-native/expo]')}`;
 }
+exports.logPrefix = logPrefix;
 /**
  * The same as `chalk.yellow`
  * This code is part of the SDK, we don't want to introduce a dependency on `chalk` just for this.
@@ -59,6 +57,7 @@ function logPrefix() {
 function yellow(message) {
     return `\x1b[33m${message}\x1b[0m`;
 }
+exports.yellow = yellow;
 /**
  * The same as `chalk.bold`
  * This code is part of the SDK, we don't want to introduce a dependency on `chalk` just for this.
@@ -66,3 +65,4 @@ function yellow(message) {
 function bold(message) {
     return `\x1b[1m${message}\x1b[22m`;
 }
+exports.bold = bold;

package/plugin/build/withSentry.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSentry = void 0;
-exports.getSentryProperties = getSentryProperties;
+exports.withSentry = exports.getSentryProperties = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const utils_1 = require("./utils");
 const withSentryAndroid_1 = require("./withSentryAndroid");
@@ -50,6 +49,7 @@ ${organization ? `defaults.org=${organization}` : missingOrgMessage}
 ${project ? `defaults.project=${project}` : missingProjectMessage}
 ${authToken ? `${existingAuthTokenMessage}\nauth.token=${authToken}` : missingAuthTokenMessage}`;
 }
+exports.getSentryProperties = getSentryProperties;
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 const withSentry = (0, config_plugins_1.createRunOncePlugin)(withSentryPlugin, utils_1.sdkPackage.name, utils_1.sdkPackage.version);
 exports.withSentry = withSentry;

package/plugin/build/withSentryAndroid.js

@@ -23,8 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSentryAndroid = void 0;
-exports.modifyAppBuildGradle = modifyAppBuildGradle;
+exports.modifyAppBuildGradle = exports.withSentryAndroid = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const path = __importStar(require("path"));
 const utils_1 = require("./utils");
@@ -66,3 +65,4 @@ function modifyAppBuildGradle(buildGradle) {
     const applyFrom = `apply from: new File(${resolveSentryReactNativePackageJsonPath}, "sentry.gradle")`;
     return buildGradle.replace(pattern, match => `${applyFrom}\n\n${match}`);
 }
+exports.modifyAppBuildGradle = modifyAppBuildGradle;

package/plugin/build/withSentryIOS.js

@@ -23,9 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSentryIOS = void 0;
-exports.modifyExistingXcodeBuildScript = modifyExistingXcodeBuildScript;
-exports.addSentryWithBundledScriptsToBundleShellScript = addSentryWithBundledScriptsToBundleShellScript;
+exports.addSentryWithBundledScriptsToBundleShellScript = exports.modifyExistingXcodeBuildScript = exports.withSentryIOS = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const path = __importStar(require("path"));
 const utils_1 = require("./utils");
@@ -73,8 +71,10 @@ Run npx expo prebuild --clean`);
     const code = JSON.parse(script.shellScript);
     script.shellScript = JSON.stringify(addSentryWithBundledScriptsToBundleShellScript(code));
 }
+exports.modifyExistingXcodeBuildScript = modifyExistingXcodeBuildScript;
 function addSentryWithBundledScriptsToBundleShellScript(script) {
     return script.replace(/^.*?(packager|scripts)\/react-native-xcode\.sh\s*(\\'\\\\")?/m, 
     // eslint-disable-next-line no-useless-escape
     (match) => `/bin/sh ${SENTRY_REACT_NATIVE_XCODE_PATH} ${match}`);
 }
+exports.addSentryWithBundledScriptsToBundleShellScript = addSentryWithBundledScriptsToBundleShellScript;

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

@@ -35,6 +35,8 @@ XCODE_BUILD_CONFIGURATION="${CONFIGURATION}"
 
 if [ "$SENTRY_DISABLE_AUTO_UPLOAD" == true ]; then
   echo "SENTRY_DISABLE_AUTO_UPLOAD=true, skipping debug files upload"
+elif [ "$SENTRY_DISABLE_XCODE_DEBUG_UPLOAD" == true ]; then
+  echo "SENTRY_DISABLE_XCODE_DEBUG_UPLOAD=true, skipping native debug files upload"
 elif echo "$XCODE_BUILD_CONFIGURATION" | grep -iq "debug"; then # case insensitive check for "debug"
   echo "Skipping debug files upload for *Debug* configuration"
 else

package/sentry.gradle

@@ -3,10 +3,18 @@ import org.apache.tools.ant.taskdefs.condition.Os
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
-project.ext.shouldSentryAutoUpload = { ->
+project.ext.shouldSentryAutoUploadNative = { -> 
+  return System.getenv('SENTRY_DISABLE_NATIVE_DEBUG_UPLOAD') != 'true'
+}
+
+project.ext.shouldSentryAutoUploadGeneral = { ->
   return System.getenv('SENTRY_DISABLE_AUTO_UPLOAD') != 'true'
 }
 
+project.ext.shouldSentryAutoUpload = { ->
+  return shouldSentryAutoUploadGeneral() && shouldSentryAutoUploadNative()
+}
+
 def config = project.hasProperty("sentryCli") ? project.sentryCli : [];
 
 gradle.projectsEvaluated {
@@ -98,7 +106,7 @@ gradle.projectsEvaluated {
 
           /** Upload source map file to the sentry server via CLI call. */
           def cliTask = tasks.create(nameCliTask) {
-              onlyIf { shouldSentryAutoUpload() }
+              onlyIf { shouldSentryAutoUploadGeneral() }
               description = "upload debug symbols to sentry"
               group = 'sentry.io'
 

package/src/js/NativeRNSentry.ts

@@ -9,6 +9,7 @@ import type { UnsafeObject } from './utils/rnlibrariesinterface';
 export interface Spec extends TurboModule {
   addListener: (eventType: string) => void;
   removeListeners: (id: number) => void;
+  getNewScreenTimeToDisplay(): Promise<number | undefined | null>;
   addBreadcrumb(breadcrumb: UnsafeObject): void;
   captureEnvelope(
     bytes: string,

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

@@ -4,6 +4,7 @@ import type { UnsafeObject } from './utils/rnlibrariesinterface';
 export interface Spec extends TurboModule {
     addListener: (eventType: string) => void;
     removeListeners: (id: number) => void;
+    getNewScreenTimeToDisplay(): Promise<number | undefined | null>;
     addBreadcrumb(breadcrumb: UnsafeObject): void;
     captureEnvelope(bytes: string, options: {
         hardCrashed: boolean;

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

@@ -1,5 +1,5 @@
-export type { Breadcrumb, Request, SdkInfo, Event, Exception, StackFrame, Stacktrace, Thread, User, UserFeedback, } from '@sentry/types';
-export { addBreadcrumb, captureException, captureEvent, captureMessage, Scope, setContext, setExtra, setExtras, setTag, setTags, setUser, startInactiveSpan, startSpan, startSpanManual, getActiveSpan, spanToJSON, spanIsSampled, setMeasurement, getCurrentScope, getGlobalScope, getIsolationScope, getClient, setCurrentClient, addEventProcessor, metricsDefault as metrics, } from '@sentry/core';
+export type { Breadcrumb, Request, SdkInfo, Event, Exception, SeverityLevel, StackFrame, Stacktrace, Thread, User, UserFeedback, } from '@sentry/types';
+export { addBreadcrumb, captureException, captureEvent, captureMessage, Scope, setContext, setExtra, setExtras, setTag, setTags, setUser, startInactiveSpan, startSpan, startSpanManual, getActiveSpan, getRootSpan, withActiveSpan, suppressTracing, spanToJSON, spanIsSampled, setMeasurement, getCurrentScope, getGlobalScope, getIsolationScope, getClient, setCurrentClient, addEventProcessor, metricsDefault as metrics, } from '@sentry/core';
 export { ErrorBoundary, withErrorBoundary, createReduxEnhancer, Profiler, useProfiler, withProfiler, } from '@sentry/react';
 export * from './integrations/exports';
 export { SDK_NAME, SDK_VERSION } from './version';

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

@@ -14,5 +14,9 @@ type SpotlightReactNativeIntegrationOptions = {
  * Learn more about spotlight at https://spotlightjs.com
  */
 export declare function spotlightIntegration({ sidecarUrl, }?: SpotlightReactNativeIntegrationOptions): Integration;
+/**
+ * Gets the default Spotlight sidecar URL.
+ */
+export declare function getDefaultSidecarUrl(): string;
 export {};
 //# sourceMappingURL=spotlight.d.ts.map

package/ts3.8/dist/js/utils/ignorerequirecyclelogs.d.ts

@@ -1,5 +1,10 @@
+interface ReactNativeVersion {
+    major: number;
+    minor: number;
+}
 /**
  * This is a workaround for using fetch on RN, this is a known issue in react-native and only generates a warning.
  */
-export declare function ignoreRequireCycleLogs(): void;
+export declare function ignoreRequireCycleLogs(version?: ReactNativeVersion): void;
+export {};
 //# sourceMappingURL=ignorerequirecyclelogs.d.ts.map

package/ts3.8/dist/js/utils/sentryeventemitterfallback.d.ts

@@ -0,0 +1,19 @@
+import type { SentryEventEmitter } from './sentryeventemitter';
+export declare const FALLBACK_TIMEOUT_MS = 10000;
+export type FallBackNewFrameEvent = {
+    newFrameTimestampInSeconds: number;
+    isFallback?: boolean;
+};
+export interface SentryEventEmitterFallback {
+    /**
+     * Initializes the fallback event emitter
+     * This method is synchronous in JS but the event emitter starts asynchronously.
+     */
+    initAsync: () => void;
+    onceNewFrame: (listener: (event: FallBackNewFrameEvent) => void) => void;
+}
+/**
+ * Creates emitter that allows to listen to UI Frame events when ready.
+ */
+export declare function createSentryFallbackEventEmitter(emitter?: SentryEventEmitter, fallbackTimeoutMs?: number): SentryEventEmitterFallback;
+//# sourceMappingURL=sentryeventemitterfallback.d.ts.map

package/ts3.8/dist/js/vendor/react-native/index.d.ts

@@ -39,7 +39,7 @@ export type ReactNativeVersion = {
         major: number;
         minor: number;
         patch: number;
-        prerelease?: number | null | undefined;
+        prerelease?: string | null | undefined;
     };
 };
 export {};

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 = "6.0.0";
+export declare const SDK_VERSION = "6.2.0";
 //# sourceMappingURL=version.d.ts.map