Merge a57459a into 13b68d9

Author: lucas-zimerman

packages/core/package.json

@@ -66,22 +66,21 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "3.1.2",
-    "@sentry/browser": "8.54.0",
-    "@sentry/cli": "2.42.1",
-    "@sentry/core": "8.54.0",
-    "@sentry/react": "8.54.0",
-    "@sentry/types": "8.54.0",
-    "@sentry/utils": "8.54.0"
+    "@sentry/browser": "9.1.0",
+    "@sentry/cli": "2.41.1",
+    "@sentry/core": "9.1.0",
+    "@sentry/react": "9.1.0",
+    "@sentry/types": "9.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@expo/metro-config": "0.19.5",
     "@mswjs/interceptors": "^0.25.15",
     "@react-native/babel-preset": "0.77.1",
-    "@sentry-internal/eslint-config-sdk": "8.54.0",
-    "@sentry-internal/eslint-plugin-sdk": "8.54.0",
-    "@sentry-internal/typescript": "8.54.0",
-    "@sentry/wizard": "3.42.0",
+    "@sentry-internal/eslint-config-sdk": "9.1.0",
+    "@sentry-internal/eslint-plugin-sdk": "9.1.0",
+    "@sentry-internal/typescript": "9.1.0",
+    "@sentry/wizard": "3.40.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.9.3",
@@ -100,7 +99,7 @@
     "eslint-plugin-react-native": "^3.8.1",
     "expo": "^52.0.0",
     "expo-module-scripts": "3.1.0",
-    "jest": "^29.6.2",
+    "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.6.2",
     "jest-extended": "^4.0.2",
     "madge": "^6.1.0",
@@ -110,7 +109,7 @@
     "react-native": "0.77.1",
     "react-test-renderer": "^18.3.1",
     "rimraf": "^4.1.1",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.2.5",
     "typescript": "4.9.5",
     "uglify-js": "^3.17.4",
     "uuid": "^9.0.1",

packages/core/plugin/src/withSentry.ts

@@ -18,7 +18,7 @@ interface PluginProps {
 const withSentryPlugin: ConfigPlugin<PluginProps | void> = (config, props) => {
   const sentryProperties = getSentryProperties(props);
 
-  if (props && props.authToken) {
+  if (props?.authToken) {
     // If not removed, the plugin config with the authToken will be written to the application package
     delete props.authToken;
   }

packages/core/plugin/src/withSentryAndroidGradlePlugin.ts

@@ -35,7 +35,7 @@ export function withSentryAndroidGradlePlugin(
   const withSentryProjectBuildGradle = (config: any): any => {
     return withProjectBuildGradle(config, (projectBuildGradle: any) => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      if (!projectBuildGradle.modResults || !projectBuildGradle.modResults.contents) {
+      if (!projectBuildGradle.modResults?.contents) {
         warnOnce('android/build.gradle content is missing or undefined.');
         return config;
       }

packages/core/src/js/index.ts

@@ -1,6 +1,5 @@
 export type {
   Breadcrumb,
-  Request,
   SdkInfo,
   Event,
   Exception,
@@ -43,7 +42,6 @@ export {
   getClient,
   setCurrentClient,
   addEventProcessor,
-  metricsDefault as metrics,
   lastEventId,
 } from '@sentry/core';
 

packages/core/src/js/integrations/debugsymbolicator.ts

@@ -143,7 +143,7 @@ function replaceExceptionFramesInException(exception: Exception, frames: SentryS
  * @param frames StackFrame[]
  */
 function replaceThreadFramesInEvent(event: Event, frames: SentryStackFrame[]): void {
-  if (event.threads && event.threads.values && event.threads.values[0] && event.threads.values[0].stacktrace) {
+  if (event.threads?.values?.[0]?.stacktrace) {
     event.threads.values[0].stacktrace.frames = frames.reverse();
   }
 }

packages/core/src/js/integrations/default.ts

@@ -91,10 +91,7 @@ export function getDefaultIntegrations(options: ReactNativeClientOptions): Integ
   // hasTracingEnabled from `@sentry/core` only check if tracesSampler or tracesSampleRate keys are present
   // that's different from prev imp here and might lead misconfiguration
   // `tracesSampleRate: undefined` should not enable tracing
-  const hasTracingEnabled =
-    options.enableTracing ||
-    typeof options.tracesSampleRate === 'number' ||
-    typeof options.tracesSampler === 'function';
+  const hasTracingEnabled = typeof options.tracesSampleRate === 'number' || typeof options.tracesSampler === 'function';
   if (hasTracingEnabled && options.enableAppStartTracking) {
     integrations.push(appStartIntegration());
   }

packages/core/src/js/integrations/nativelinkederrors.ts

@@ -43,7 +43,7 @@ export const nativeLinkedErrorsIntegration = (options: Partial<LinkedErrorsOptio
 };
 
 function preprocessEvent(event: Event, hint: EventHint | undefined, client: Client, limit: number, key: string): void {
-  if (!event.exception || !event.exception.values || !hint || !isInstanceOf(hint.originalException, Error)) {
+  if (!event.exception?.values || !hint || !isInstanceOf(hint.originalException, Error)) {
     return;
   }
 
@@ -176,10 +176,10 @@ function exceptionFromAppleStackReturnAddresses(objCException: {
       type: objCException.name,
       value: objCException.message,
       stacktrace: {
-        frames: (nativeStackFrames && nativeStackFrames.frames.reverse()) || [],
+        frames: nativeStackFrames?.frames.reverse() || [],
       },
     },
-    appleDebugImages: (nativeStackFrames && (nativeStackFrames.debugMetaImages as DebugImage[])) || [],
+    appleDebugImages: (nativeStackFrames?.debugMetaImages as DebugImage[]) || [],
   };
 }
 

packages/core/src/js/integrations/reactnativeerrorhandlers.ts

@@ -99,7 +99,7 @@ function setupErrorUtilsGlobalHandler(): void {
     return;
   }
 
-  const defaultHandler = errorUtils.getGlobalHandler && errorUtils.getGlobalHandler();
+  const defaultHandler = errorUtils.getGlobalHandler?.();
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   errorUtils.setGlobalHandler(async (error: any, isFatal?: boolean) => {
@@ -155,7 +155,9 @@ function setupErrorUtilsGlobalHandler(): void {
       return;
     }
 
-    void client.flush(client.getOptions().shutdownTimeout || 2000).then(
+    // SEE: https://github.com/getsentry/sentry-javascript/pull/15217
+    // void client.flush(client.getOptions().shutdownTimeout || 2000).then(
+    void client.flush(2000).then(
       () => {
         defaultHandler(error, isFatal);
       },

packages/core/src/js/integrations/screenshot.ts

@@ -18,13 +18,13 @@ export const screenshotIntegration = (): Integration => {
 };
 
 async function processEvent(event: Event, hint: EventHint, client: ReactNativeClient): Promise<Event> {
-  const hasException = event.exception && event.exception.values && event.exception.values.length > 0;
+  const hasException = event.exception?.values?.length > 0;
   if (!hasException || client.getOptions().beforeScreenshot?.(event, hint) === false) {
     return event;
   }
 
   const screenshots: ScreenshotAttachment[] | null = await NATIVE.captureScreenshot();
-  if (screenshots && screenshots.length > 0) {
+  if (screenshots?.length > 0) {
     hint.attachments = [...screenshots, ...(hint?.attachments || [])];
   }
 

packages/core/src/js/integrations/spotlight.ts

@@ -103,7 +103,7 @@ function getHostnameFromString(urlString: string): string | null {
   const regex = /^(?:\w+:)?\/\/([^/:]+)(:\d+)?(.*)$/;
   const matches = urlString.match(regex);
 
-  if (matches && matches[1]) {
+  if (matches?.[1]) {
     return matches[1];
   } else {
     // Invalid URL format