@sentry/react-native 5.17.0 → 5.18.0

package/ios/RNSentry.mm

@@ -201,11 +201,10 @@ RCT_EXPORT_METHOD(fetchModules:(RCTPromiseResolveBlock)resolve
     resolve(modulesString);
 }
 
-RCT_EXPORT_METHOD(fetchNativePackageName:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSString *, fetchNativePackageName)
 {
     NSString *packageName = [[NSBundle mainBundle] executablePath];
-    resolve(packageName);
+    return packageName;
 }
 
 - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAddr
@@ -273,12 +272,10 @@ RCT_EXPORT_METHOD(fetchNativePackageName:(RCTPromiseResolveBlock)resolve
   }
 }
 
-RCT_EXPORT_METHOD(fetchNativeStackFramesBy:(NSArray *)instructionsAddr
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, fetchNativeStackFramesBy:(NSArray *)instructionsAddr)
 {
-  resolve([self fetchNativeStackFramesBy:instructionsAddr
-                             symbolicate:dladdr]);
+  return [self fetchNativeStackFramesBy:instructionsAddr
+                             symbolicate:dladdr];
 }
 
 RCT_EXPORT_METHOD(fetchNativeDeviceContexts:(RCTPromiseResolveBlock)resolve

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": "5.17.0",
+  "version": "5.18.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -78,6 +78,7 @@
   "devDependencies": {
     "@babel/core": "^7.23.5",
     "@expo/metro-config": "0.16.0",
+    "@mswjs/interceptors": "^0.25.15",
     "@sentry-internal/eslint-config-sdk": "7.81.1",
     "@sentry-internal/eslint-plugin-sdk": "7.81.1",
     "@sentry-internal/typescript": "7.80.0",
@@ -87,6 +88,7 @@
     "@types/react": "^18.2.14",
     "@types/uglify-js": "^3.17.2",
     "@types/uuid": "^9.0.4",
+    "@types/xmlhttprequest": "^1.8.2",
     "babel-jest": "^29.6.2",
     "downlevel-dts": "^0.11.0",
     "eslint": "^7.6.0",
@@ -96,6 +98,7 @@
     "expo-module-scripts": "^3.1.0",
     "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
+    "jest-extended": "^4.0.2",
     "madge": "^6.1.0",
     "metro": "0.76",
     "prettier": "^2.0.5",
@@ -106,7 +109,8 @@
     "ts-jest": "^29.1.1",
     "typescript": "4.9.5",
     "uglify-js": "^3.17.4",
-    "uuid": "^9.0.1"
+    "uuid": "^9.0.1",
+    "xmlhttprequest": "^1.8.0"
   },
   "rnpm": {
     "commands": {},

package/scripts/expo-upload-sourcemaps.js

@@ -4,8 +4,8 @@ const fs = require('fs');
 const path = require('path');
 const process = require('process');
 
+const SENTRY_ORG = 'SENTRY_ORG';
 const SENTRY_PROJECT = 'SENTRY_PROJECT';
-// The sentry org is inferred from the auth token
 const SENTRY_AUTH_TOKEN = 'SENTRY_AUTH_TOKEN';
 const SENTRY_CLI_EXECUTABLE = 'SENTRY_CLI_EXECUTABLE';
 
@@ -101,25 +101,51 @@ function groupAssets(assetPaths) {
   return groups;
 }
 
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'; // Ensures precedence .env.development > .env (the same as @expo/cli)
+const projectRoot = '.'; // Assume script is run from the project root
+try {
+  require('@expo/env').load(projectRoot);
+} catch (error) {
+  console.warn('⚠️ Failed to load environment variables using @expo/env.');
+  console.warn(error);
+}
+
+let sentryOrg = getEnvVar(SENTRY_ORG);
 let sentryProject = getEnvVar(SENTRY_PROJECT);
 let authToken = getEnvVar(SENTRY_AUTH_TOKEN);
 const sentryCliBin = getEnvVar(SENTRY_CLI_EXECUTABLE) || require.resolve('@sentry/cli/bin/sentry-cli');
 
-if (!sentryProject) {
-  console.log(`🐕 Fetching ${SENTRY_PROJECT} from expo config...`);
+if (!sentryOrg || !sentryProject) {
+  console.log('🐕 Fetching from expo config...');
   const pluginConfig = getSentryPluginPropertiesFromExpoConfig();
   if (!pluginConfig) {
     console.error("Could not fetch '@sentry/react-native' plugin properties from expo config.");
     process.exit(1);
   }
-  if (!pluginConfig.project) {
-    console.error(
-      `Could not resolve sentry project, set it in the environment variable ${SENTRY_PROJECT} or in the '@sentry/react-native' plugin properties in your expo config.`,
-    );
-    process.exit(1);
+
+  if (!sentryOrg) {
+    if (!pluginConfig.organization) {
+      console.error(
+        `Could not resolve sentry org, set it in the environment variable ${SENTRY_ORG} or in the '@sentry/react-native' plugin properties in your expo config.`,
+      );
+      process.exit(1);
+    }
+
+    sentryOrg = pluginConfig.organization;
+    console.log(`${SENTRY_ORG} resolved to ${sentryOrg} from expo config.`);
+  }
+
+  if (!sentryProject) {
+    if (!pluginConfig.project) {
+      console.error(
+        `Could not resolve sentry project, set it in the environment variable ${SENTRY_PROJECT} or in the '@sentry/react-native' plugin properties in your expo config.`,
+      );
+      process.exit(1);
+    }
+
+    sentryProject = pluginConfig.project;
+    console.log(`${SENTRY_PROJECT} resolved to ${sentryProject} from expo config.`);
   }
-  sentryProject = pluginConfig.project;
-  console.log(`${SENTRY_PROJECT} resolved to ${sentryProject} from expo config.`);
 }
 
 if (!authToken) {
@@ -137,6 +163,8 @@ if (!outputDir) {
 const files = getAssetPathsSync(outputDir);
 const groupedAssets = groupAssets(files);
 
+const totalAssets = Object.keys(groupedAssets).length;
+let numAssetsUploaded = 0;
 for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
   const sourceMapPath = assets.find(asset => asset.endsWith('.map'));
   if (sourceMapPath) {
@@ -145,16 +173,30 @@ for (const [assetGroupName, assets] of Object.entries(groupedAssets)) {
       sourceMap.debug_id = sourceMap.debugId;
     }
     writeJSONFile(sourceMapPath, sourceMap);
+    console.log(`⬆️ Uploading ${assetGroupName} bundle and sourcemap...`);
+  } else {
+    console.log(`❓ Sourcemap for ${assetGroupName} not found, skipping...`);
+    continue;
   }
-  console.log(`⬆️ Uploading ${assetGroupName} bundle and sourcemap...`);
+
   const isHermes = assets.find(asset => asset.endsWith('.hbc'));
   execSync(`${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')}`, {
     env: {
       ...process.env,
       [SENTRY_PROJECT]: sentryProject,
+      [SENTRY_ORG]: sentryOrg,
     },
     stdio: 'inherit',
   });
+  numAssetsUploaded++;
 }
 
-console.log('✅ Uploaded bundles and sourcemaps to Sentry successfully.');
+if (numAssetsUploaded === totalAssets) {
+  console.log('✅ Uploaded bundles and sourcemaps to Sentry successfully.');
+} else {
+  console.warn(
+    `⚠️  Uploaded ${numAssetsUploaded} of ${totalAssets} bundles and sourcemaps. ${
+      numAssetsUploaded === 0 ? 'Ensure you are running `expo export` with the `--dump-sourcemap` flag.' : ''
+    }`,
+  );
+}

package/src/js/NativeRNSentry.ts

@@ -34,8 +34,8 @@ export interface Spec extends TurboModule {
   fetchViewHierarchy(): Promise<number[] | undefined | null>;
   startProfiling(): { started?: boolean; error?: string };
   stopProfiling(): { profile?: string; nativeProfile?: UnsafeObject; error?: string };
-  fetchNativePackageName(): Promise<string | undefined | null>;
-  fetchNativeStackFramesBy(instructionsAddr: number[]): Promise<NativeStackFrames | undefined | null>;
+  fetchNativePackageName(): string | undefined | null;
+  fetchNativeStackFramesBy(instructionsAddr: number[]): NativeStackFrames | undefined | null;
 }
 
 export type NativeStackFrame = {

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

@@ -33,8 +33,8 @@ export interface Spec extends TurboModule {
         nativeProfile?: UnsafeObject;
         error?: string;
     };
-    fetchNativePackageName(): Promise<string | undefined | null>;
-    fetchNativeStackFramesBy(instructionsAddr: number[]): Promise<NativeStackFrames | undefined | null>;
+    fetchNativePackageName(): string | undefined | null;
+    fetchNativeStackFramesBy(instructionsAddr: number[]): NativeStackFrames | undefined | null;
 }
 export type NativeStackFrame = {
     platform: string;

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

@@ -7,4 +7,5 @@ export { SdkInfo } from './sdkinfo';
 export { ReactNativeInfo } from './reactnativeinfo';
 export { ModulesLoader } from './modulesloader';
 export { HermesProfiling } from '../profiling/integration';
+export { Spotlight } from './spotlight';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,4 +1,4 @@
-import type { EventProcessor, Hub, Integration } from '@sentry/types';
+import type { Client, Event, EventHint, EventProcessor, Hub, Integration } from '@sentry/types';
 interface LinkedErrorsOptions {
     key: string;
     limit: number;
@@ -25,7 +25,11 @@ export declare class NativeLinkedErrors implements Integration {
     /**
      * @inheritDoc
      */
-    setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void;
+    setupOnce(_addGlobalEventProcessor: (callback: EventProcessor) => void, _getCurrentHub: () => Hub): void;
+    /**
+     * @inheritDoc
+     */
+    preprocessEvent(event: Event, hint: EventHint | undefined, client: Client): void;
     /**
      * Enriches passed event with linked exceptions and native debug meta images.
      */

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

@@ -0,0 +1,18 @@
+import type { Integration } from '@sentry/types';
+type SpotlightReactNativeIntegrationOptions = {
+    /**
+     * The URL of the Sidecar instance to connect and forward events to.
+     * If not set, Spotlight will try to connect to the Sidecar running on localhost:8969.
+     *
+     * @default "http://localhost:8969/stream"
+     */
+    sidecarUrl?: string;
+};
+/**
+ * Use this integration to send errors and transactions to Spotlight.
+ *
+ * Learn more about spotlight at https://spotlightjs.com
+ */
+export declare function Spotlight({ sidecarUrl, }?: SpotlightReactNativeIntegrationOptions): Integration;
+export {};
+//# sourceMappingURL=spotlight.d.ts.map

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

@@ -134,6 +134,25 @@ export interface BaseReactNativeOptions {
      * @default false
      */
     enableCaptureFailedRequests?: boolean;
+    /**
+     * This option will enable forwarding captured Sentry events to Spotlight.
+     *
+     * More details: https://spotlightjs.com/
+     *
+     * IMPORTANT: Only set this option to `true` while developing, not in production!
+     */
+    enableSpotlight?: boolean;
+    /**
+     * This option changes the default Spotlight Sidecar URL.
+     *
+     * By default, the SDK expects the Sidecar to be running
+     * on the same host as React Native Metro Dev Server.
+     *
+     * More details: https://spotlightjs.com/
+     *
+     * @default "http://localhost:8969/stream"
+     */
+    spotlightSidecarUrl?: string;
 }
 export interface ReactNativeTransportOptions extends BrowserTransportOptions {
     /**

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

@@ -1,3 +1,4 @@
+/// <reference types="react-native" />
 import type { InternalGlobal } from '@sentry/utils';
 import type { ErrorUtils } from 'react-native/types';
 import type { ExpoGlobalObject } from './expoglobalobject';
@@ -13,6 +14,7 @@ export interface ReactNativeInternalGlobal extends InternalGlobal {
     nativeFabricUIManager: unknown;
     ErrorUtils?: ErrorUtils;
     expo?: ExpoGlobalObject;
+    XMLHttpRequest?: typeof XMLHttpRequest;
 }
 /** Get's the global object for the current JavaScript runtime */
 export declare const RN_GLOBAL_OBJ: ReactNativeInternalGlobal;

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

@@ -0,0 +1,20 @@
+/// <reference types="react-native" />
+/**
+ * The DONE ready state for XmlHttpRequest
+ *
+ * Defining it here as a constant b/c XMLHttpRequest.DONE is not always defined
+ * (e.g. during testing, it is `undefined`)
+ *
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/readyState}
+ */
+export declare const XHR_READYSTATE_DONE = 4;
+/**
+ * Creates a new XMLHttpRequest object which is not instrumented by the SDK.
+ *
+ * This request won't be captured by the HttpClient Errors integration
+ * and won't be added to breadcrumbs and won't be traced.
+ */
+export declare function createStealthXhr(customGlobal?: {
+    XMLHttpRequest?: typeof XMLHttpRequest;
+}): XMLHttpRequest | null;
+//# sourceMappingURL=xhr.d.ts.map

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

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

@@ -52,11 +52,11 @@ interface SentryNativeWrapper {
         hermesProfile: Hermes.Profile;
         nativeProfile?: NativeProfileEvent;
     } | null;
-    fetchNativePackageName(): Promise<string | null>;
+    fetchNativePackageName(): string | null;
     /**
      * Fetches native stack frames and debug images for the instructions addresses.
      */
-    fetchNativeStackFramesBy(instructionsAddr: number[]): Promise<NativeStackFrames | null>;
+    fetchNativeStackFramesBy(instructionsAddr: number[]): NativeStackFrames | null;
 }
 /**
  * Our internal interface for calling native functions