@sentry/react-native 3.2.2 → 3.2.6

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 3.2.6
+
+- feat(android): Support monorepo in gradle plugin #1917
+- fix: Remove dependency on promiseRejectionTrackingOptions #1928
+
+## 3.2.5
+
+- fix: Fix dynamic require for promise options bypassing try catch block and crashing apps #1923
+
+## 3.2.4
+
+- fix: Warn when promise rejections won't be caught #1886
+- Bump: Sentry Android to 5.4.3 and Sentry Cocoa to 7.5.4 #1920
+
+## 3.2.3
+
+### Various fixes & improvements
+
+- fix(ios): tracesSampler becomes NSNull in iOS and the app cannot be started (#1872) by @marandaneto
+
 ## 3.2.2
 
 - Bump Sentry Android SDK to 5.3.0 #1860

package/RNSentry.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = '*.js'
 
   s.dependency 'React-Core'
-  s.dependency 'Sentry', '7.4.8'
+  s.dependency 'Sentry', '7.5.4'
 
   s.source_files = 'ios/RNSentry.{h,m}'
   s.public_header_files = 'ios/RNSentry.h'

package/android/build.gradle

@@ -24,5 +24,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:5.3.0'
+    api 'io.sentry:sentry-android:5.4.3'
 }

package/dist/js/integrations/reactnativeerrorhandlers.d.ts

@@ -26,6 +26,14 @@ export declare class ReactNativeErrorHandlers implements Integration {
      * Handle Promises
      */
     private _handleUnhandledRejections;
+    /**
+     * Gets the promise rejection handlers, tries to get React Native's default one but otherwise will default to console.logging unhandled rejections.
+     */
+    private _getPromiseRejectionTrackingOptions;
+    /**
+     * Checks if the promise is the same one or not, if not it will warn the user
+     */
+    private _checkPromiseVersion;
     /**
      * Handle errors
      */

package/dist/js/integrations/reactnativeerrorhandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reactnativeerrorhandlers.d.ts","sourceRoot":"","sources":["../../../src/js/integrations/reactnativeerrorhandlers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAY,MAAM,eAAe,CAAC;AAKtD,uCAAuC;AACvC,UAAU,+BAA+B;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAKD,2CAA2C;AAC3C,qBAAa,wBAAyB,YAAW,WAAW;IAC1D;;OAEG;IACH,OAAc,EAAE,EAAE,MAAM,CAA8B;IAEtD;;OAEG;IACI,IAAI,EAAE,MAAM,CAA+B;IAElD,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAE3D,kBAAkB;gBACC,OAAO,CAAC,EAAE,+BAA+B;IAQ5D;;OAEG;IACI,SAAS,IAAI,IAAI;IAKxB;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAgElC;;OAEG;IACH,OAAO,CAAC,cAAc;CAkEvB"}
+{"version":3,"file":"reactnativeerrorhandlers.d.ts","sourceRoot":"","sources":["../../../src/js/integrations/reactnativeerrorhandlers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAY,MAAM,eAAe,CAAC;AAKtD,uCAAuC;AACvC,UAAU,+BAA+B;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAUD,2CAA2C;AAC3C,qBAAa,wBAAyB,YAAW,WAAW;IAC1D;;OAEG;IACH,OAAc,EAAE,EAAE,MAAM,CAA8B;IAEtD;;OAEG;IACI,IAAI,EAAE,MAAM,CAA+B;IAElD,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAE3D,kBAAkB;gBACC,OAAO,CAAC,EAAE,+BAA+B;IAQ5D;;OAEG;IACI,SAAS,IAAI,IAAI;IAKxB;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAoClC;;OAEG;IACH,OAAO,CAAC,mCAAmC;IAkB3C;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAqB5B;;OAEG;IACH,OAAO,CAAC,cAAc;CAkEvB"}

package/dist/js/integrations/reactnativeerrorhandlers.js

@@ -24,59 +24,68 @@ export class ReactNativeErrorHandlers {
      * Handle Promises
      */
     _handleUnhandledRejections() {
-        var _a, _b;
         if (this._options.onunhandledrejection) {
+            /*
+              In newer RN versions >=0.63, the global promise is not the same reference as the one imported from the promise library.
+              This is due to a version mismatch between promise versions. The version will need to be fixed with a package resolution.
+              We first run a check and show a warning if needed.
+            */
+            this._checkPromiseVersion();
             const tracking = require("promise/setimmediate/rejection-tracking");
+            const promiseRejectionTrackingOptions = this._getPromiseRejectionTrackingOptions();
             tracking.disable();
             tracking.enable({
                 allRejections: true,
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 onUnhandled: (id, error) => {
                     if (__DEV__) {
-                        // We mimic the behavior of unhandled promise rejections showing up as a warning.
-                        // eslint-disable-next-line no-console
-                        console.warn(id, error);
+                        promiseRejectionTrackingOptions.onUnhandled(id, error);
                     }
                     getCurrentHub().captureException(error, {
                         data: { id },
                         originalException: error,
                     });
                 },
+                onHandled: (id) => {
+                    promiseRejectionTrackingOptions.onHandled(id);
+                },
             });
-            /* eslint-disable
-              @typescript-eslint/no-var-requires,
-              import/no-extraneous-dependencies,
-              @typescript-eslint/no-explicit-any,
-              @typescript-eslint/no-unsafe-member-access
-            */
+        }
+    }
+    /**
+     * Gets the promise rejection handlers, tries to get React Native's default one but otherwise will default to console.logging unhandled rejections.
+     */
+    _getPromiseRejectionTrackingOptions() {
+        return {
+            onUnhandled: (id, rejection = {}) => {
+                // eslint-disable-next-line no-console
+                console.warn(`Possible Unhandled Promise Rejection (id: ${id}):\n${rejection}`);
+            },
+            onHandled: (id) => {
+                // eslint-disable-next-line no-console
+                console.warn(`Promise Rejection Handled (id: ${id})\n` +
+                    "This means you can ignore any previous messages of the form " +
+                    `"Possible Unhandled Promise Rejection (id: ${id}):"`);
+            },
+        };
+    }
+    /**
+     * Checks if the promise is the same one or not, if not it will warn the user
+     */
+    _checkPromiseVersion() {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires,import/no-extraneous-dependencies
             const Promise = require("promise/setimmediate/core");
             const _global = getGlobalObject();
-            /* In newer RN versions >=0.63, the global promise is not the same reference as the one imported from the promise library.
-              Due to this, we need to take the methods that tracking.enable sets, and then set them on the global promise.
-              Note: We do not want to overwrite the whole promise in case there are extensions present.
-      
-              If the global promise is the same as the imported promise (expected in RN <0.63), we do nothing.
-            */
-            const _onHandle = (_a = Promise._onHandle) !== null && _a !== void 0 ? _a : Promise._Y;
-            const _onReject = (_b = Promise._onReject) !== null && _b !== void 0 ? _b : Promise._Z;
-            if (Promise !== _global.Promise &&
-                typeof _onHandle !== "undefined" &&
-                typeof _onReject !== "undefined") {
-                if ("_onHandle" in _global.Promise && "_onReject" in _global.Promise) {
-                    _global.Promise._onHandle = _onHandle;
-                    _global.Promise._onReject = _onReject;
-                }
-                else if ("_Y" in _global.Promise && "_Z" in _global.Promise) {
-                    _global.Promise._Y = _onHandle;
-                    _global.Promise._Z = _onReject;
-                }
+            if (Promise !== _global.Promise) {
+                logger.warn("Unhandled promise rejections will not be caught by Sentry. Read about how to fix this on our troubleshooting page.");
             }
-            /* eslint-enable
-              @typescript-eslint/no-var-requires,
-              import/no-extraneous-dependencies,
-              @typescript-eslint/no-explicit-any,
-              @typescript-eslint/no-unsafe-member-access
-            */
+            else {
+                logger.log("Unhandled promise rejections will be caught by Sentry.");
+            }
+        }
+        catch (e) {
+            // Do Nothing
+            logger.warn("Unhandled promise rejections will not be caught by Sentry. Read about how to fix this on our troubleshooting page.");
         }
     }
     /**

package/dist/js/integrations/reactnativeerrorhandlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactnativeerrorhandlers.js","sourceRoot":"","sources":["../../../src/js/integrations/reactnativeerrorhandlers.ts"],"names":[],"mappings":"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","sourcesContent":["import { eventFromException } from \"@sentry/browser\";\nimport { getCurrentHub } from \"@sentry/core\";\nimport { Integration, Severity } from \"@sentry/types\";\nimport { addExceptionMechanism, getGlobalObject, logger } from \"@sentry/utils\";\n\nimport { ReactNativeClient } from \"../client\";\n\n/** ReactNativeErrorHandlers Options */\ninterface ReactNativeErrorHandlersOptions {\n  onerror: boolean;\n  onunhandledrejection: boolean;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ndeclare const global: any;\n\n/** ReactNativeErrorHandlers Integration */\nexport class ReactNativeErrorHandlers implements Integration {\n  /**\n   * @inheritDoc\n   */\n  public static id: string = \"ReactNativeErrorHandlers\";\n\n  /**\n   * @inheritDoc\n   */\n  public name: string = ReactNativeErrorHandlers.id;\n\n  /** ReactNativeOptions */\n  private readonly _options: ReactNativeErrorHandlersOptions;\n\n  /** Constructor */\n  public constructor(options?: ReactNativeErrorHandlersOptions) {\n    this._options = {\n      onerror: true,\n      onunhandledrejection: true,\n      ...options,\n    };\n  }\n\n  /**\n   * @inheritDoc\n   */\n  public setupOnce(): void {\n    this._handleUnhandledRejections();\n    this._handleOnError();\n  }\n\n  /**\n   * Handle Promises\n   */\n  private _handleUnhandledRejections(): void {\n    if (this._options.onunhandledrejection) {\n      const tracking: {\n        disable: () => void;\n        enable: (arg: unknown) => void;\n        // eslint-disable-next-line @typescript-eslint/no-var-requires,import/no-extraneous-dependencies\n      } = require(\"promise/setimmediate/rejection-tracking\");\n\n      tracking.disable();\n      tracking.enable({\n        allRejections: true,\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        onUnhandled: (id: any, error: any) => {\n          if (__DEV__) {\n            // We mimic the behavior of unhandled promise rejections showing up as a warning.\n            // eslint-disable-next-line no-console\n            console.warn(id, error);\n          }\n          getCurrentHub().captureException(error, {\n            data: { id },\n            originalException: error,\n          });\n        },\n      });\n\n      /* eslint-disable\n        @typescript-eslint/no-var-requires,\n        import/no-extraneous-dependencies,\n        @typescript-eslint/no-explicit-any,\n        @typescript-eslint/no-unsafe-member-access\n      */\n      const Promise = require(\"promise/setimmediate/core\");\n      const _global = getGlobalObject<any>();\n\n      /* In newer RN versions >=0.63, the global promise is not the same reference as the one imported from the promise library.\n        Due to this, we need to take the methods that tracking.enable sets, and then set them on the global promise.\n        Note: We do not want to overwrite the whole promise in case there are extensions present.\n\n        If the global promise is the same as the imported promise (expected in RN <0.63), we do nothing.\n      */\n      const _onHandle = Promise._onHandle ?? Promise._Y;\n      const _onReject = Promise._onReject ?? Promise._Z;\n\n      if (\n        Promise !== _global.Promise &&\n        typeof _onHandle !== \"undefined\" &&\n        typeof _onReject !== \"undefined\"\n      ) {\n        if (\"_onHandle\" in _global.Promise && \"_onReject\" in _global.Promise) {\n          _global.Promise._onHandle = _onHandle;\n          _global.Promise._onReject = _onReject;\n        } else if (\"_Y\" in _global.Promise && \"_Z\" in _global.Promise) {\n          _global.Promise._Y = _onHandle;\n          _global.Promise._Z = _onReject;\n        }\n      }\n      /* eslint-enable\n        @typescript-eslint/no-var-requires,\n        import/no-extraneous-dependencies,\n        @typescript-eslint/no-explicit-any,\n        @typescript-eslint/no-unsafe-member-access\n      */\n    }\n  }\n  /**\n   * Handle errors\n   */\n  private _handleOnError(): void {\n    if (this._options.onerror) {\n      let handlingFatal = false;\n\n      const defaultHandler =\n        ErrorUtils.getGlobalHandler && ErrorUtils.getGlobalHandler();\n\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      ErrorUtils.setGlobalHandler(async (error: any, isFatal?: boolean) => {\n        // We want to handle fatals, but only in production mode.\n        const shouldHandleFatal = isFatal && !__DEV__;\n        if (shouldHandleFatal) {\n          if (handlingFatal) {\n            logger.log(\n              \"Encountered multiple fatals in a row. The latest:\",\n              error\n            );\n            return;\n          }\n          handlingFatal = true;\n        }\n\n        const currentHub = getCurrentHub();\n        const client = currentHub.getClient<ReactNativeClient>();\n\n        if (!client) {\n          logger.error(\n            \"Sentry client is missing, the error event might be lost.\",\n            error\n          );\n\n          // If there is no client something is fishy, anyway we call the default handler\n          defaultHandler(error, isFatal);\n\n          return;\n        }\n\n        const options = client.getOptions();\n\n        const event = await eventFromException(options, error, {\n          originalException: error,\n        });\n\n        if (isFatal) {\n          event.level = Severity.Fatal;\n\n          addExceptionMechanism(event, {\n            handled: false,\n            type: \"onerror\",\n          });\n        }\n\n        currentHub.captureEvent(event);\n\n        if (!__DEV__) {\n          void client.flush(options.shutdownTimeout || 2000).then(() => {\n            defaultHandler(error, isFatal);\n          });\n        } else {\n          // If in dev, we call the default handler anyway and hope the error will be sent\n          // Just for a better dev experience\n          defaultHandler(error, isFatal);\n        }\n      });\n    }\n  }\n}\n"]}
+{"version":3,"file":"reactnativeerrorhandlers.js","sourceRoot":"","sources":["../../../src/js/integrations/reactnativeerrorhandlers.ts"],"names":[],"mappings":"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","sourcesContent":["import { eventFromException } from \"@sentry/browser\";\nimport { getCurrentHub } from \"@sentry/core\";\nimport { Integration, Severity } from \"@sentry/types\";\nimport { addExceptionMechanism, getGlobalObject, logger } from \"@sentry/utils\";\n\nimport { ReactNativeClient } from \"../client\";\n\n/** ReactNativeErrorHandlers Options */\ninterface ReactNativeErrorHandlersOptions {\n  onerror: boolean;\n  onunhandledrejection: boolean;\n}\n\ninterface PromiseRejectionTrackingOptions {\n  onUnhandled: (id: string, error: unknown) => void;\n  onHandled: (id: string) => void;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ndeclare const global: any;\n\n/** ReactNativeErrorHandlers Integration */\nexport class ReactNativeErrorHandlers implements Integration {\n  /**\n   * @inheritDoc\n   */\n  public static id: string = \"ReactNativeErrorHandlers\";\n\n  /**\n   * @inheritDoc\n   */\n  public name: string = ReactNativeErrorHandlers.id;\n\n  /** ReactNativeOptions */\n  private readonly _options: ReactNativeErrorHandlersOptions;\n\n  /** Constructor */\n  public constructor(options?: ReactNativeErrorHandlersOptions) {\n    this._options = {\n      onerror: true,\n      onunhandledrejection: true,\n      ...options,\n    };\n  }\n\n  /**\n   * @inheritDoc\n   */\n  public setupOnce(): void {\n    this._handleUnhandledRejections();\n    this._handleOnError();\n  }\n\n  /**\n   * Handle Promises\n   */\n  private _handleUnhandledRejections(): void {\n    if (this._options.onunhandledrejection) {\n      /*\n        In newer RN versions >=0.63, the global promise is not the same reference as the one imported from the promise library.\n        This is due to a version mismatch between promise versions. The version will need to be fixed with a package resolution.\n        We first run a check and show a warning if needed.\n      */\n      this._checkPromiseVersion();\n\n      const tracking: {\n        disable: () => void;\n        enable: (arg: unknown) => void;\n        // eslint-disable-next-line @typescript-eslint/no-var-requires,import/no-extraneous-dependencies\n      } = require(\"promise/setimmediate/rejection-tracking\");\n\n      const promiseRejectionTrackingOptions = this._getPromiseRejectionTrackingOptions();\n\n      tracking.disable();\n      tracking.enable({\n        allRejections: true,\n        onUnhandled: (id: string, error: Error) => {\n          if (__DEV__) {\n            promiseRejectionTrackingOptions.onUnhandled(id, error);\n          }\n\n          getCurrentHub().captureException(error, {\n            data: { id },\n            originalException: error,\n          });\n        },\n        onHandled: (id: string) => {\n          promiseRejectionTrackingOptions.onHandled(id);\n        },\n      });\n    }\n  }\n  /**\n   * Gets the promise rejection handlers, tries to get React Native's default one but otherwise will default to console.logging unhandled rejections.\n   */\n  private _getPromiseRejectionTrackingOptions(): PromiseRejectionTrackingOptions {\n    return {\n      onUnhandled: (id, rejection = {}) => {\n        // eslint-disable-next-line no-console\n        console.warn(\n          `Possible Unhandled Promise Rejection (id: ${id}):\\n${rejection}`\n        );\n      },\n      onHandled: (id) => {\n        // eslint-disable-next-line no-console\n        console.warn(\n          `Promise Rejection Handled (id: ${id})\\n` +\n            \"This means you can ignore any previous messages of the form \" +\n            `\"Possible Unhandled Promise Rejection (id: ${id}):\"`\n        );\n      },\n    };\n  }\n  /**\n   * Checks if the promise is the same one or not, if not it will warn the user\n   */\n  private _checkPromiseVersion(): void {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-var-requires,import/no-extraneous-dependencies\n      const Promise = require(\"promise/setimmediate/core\");\n\n      const _global = getGlobalObject<{ Promise: typeof Promise }>();\n\n      if (Promise !== _global.Promise) {\n        logger.warn(\n          \"Unhandled promise rejections will not be caught by Sentry. Read about how to fix this on our troubleshooting page.\"\n        );\n      } else {\n        logger.log(\"Unhandled promise rejections will be caught by Sentry.\");\n      }\n    } catch (e) {\n      // Do Nothing\n      logger.warn(\n        \"Unhandled promise rejections will not be caught by Sentry. Read about how to fix this on our troubleshooting page.\"\n      );\n    }\n  }\n  /**\n   * Handle errors\n   */\n  private _handleOnError(): void {\n    if (this._options.onerror) {\n      let handlingFatal = false;\n\n      const defaultHandler =\n        ErrorUtils.getGlobalHandler && ErrorUtils.getGlobalHandler();\n\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      ErrorUtils.setGlobalHandler(async (error: any, isFatal?: boolean) => {\n        // We want to handle fatals, but only in production mode.\n        const shouldHandleFatal = isFatal && !__DEV__;\n        if (shouldHandleFatal) {\n          if (handlingFatal) {\n            logger.log(\n              \"Encountered multiple fatals in a row. The latest:\",\n              error\n            );\n            return;\n          }\n          handlingFatal = true;\n        }\n\n        const currentHub = getCurrentHub();\n        const client = currentHub.getClient<ReactNativeClient>();\n\n        if (!client) {\n          logger.error(\n            \"Sentry client is missing, the error event might be lost.\",\n            error\n          );\n\n          // If there is no client something is fishy, anyway we call the default handler\n          defaultHandler(error, isFatal);\n\n          return;\n        }\n\n        const options = client.getOptions();\n\n        const event = await eventFromException(options, error, {\n          originalException: error,\n        });\n\n        if (isFatal) {\n          event.level = Severity.Fatal;\n\n          addExceptionMechanism(event, {\n            handled: false,\n            type: \"onerror\",\n          });\n        }\n\n        currentHub.captureEvent(event);\n\n        if (!__DEV__) {\n          void client.flush(options.shutdownTimeout || 2000).then(() => {\n            defaultHandler(error, isFatal);\n          });\n        } else {\n          // If in dev, we call the default handler anyway and hope the error will be sent\n          // Just for a better dev experience\n          defaultHandler(error, isFatal);\n        }\n      });\n    }\n  }\n}\n"]}

package/dist/js/version.d.ts

@@ -1,3 +1,3 @@
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "3.2.2";
+export declare const SDK_VERSION = "3.2.6";
 //# sourceMappingURL=version.d.ts.map

package/dist/js/version.js

@@ -1,3 +1,3 @@
 export const SDK_NAME = "sentry.javascript.react-native";
-export const SDK_VERSION = "3.2.2";
+export const SDK_VERSION = "3.2.6";
 //# sourceMappingURL=version.js.map

package/dist/js/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC","sourcesContent":["export const SDK_NAME = \"sentry.javascript.react-native\";\nexport const SDK_VERSION = \"3.2.2\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC","sourcesContent":["export const SDK_NAME = \"sentry.javascript.react-native\";\nexport const SDK_VERSION = \"3.2.6\";\n"]}

package/ios/RNSentry.m

@@ -62,7 +62,14 @@ RCT_EXPORT_METHOD(initNativeSdk:(NSDictionary *_Nonnull)options
         return event;
     };
 
-    [options setValue:beforeSend forKey:@"beforeSend"];
+    NSMutableDictionary * mutableOptions =[options mutableCopy];
+    [mutableOptions setValue:beforeSend forKey:@"beforeSend"];
+
+    // remove performance traces sample rate and traces sampler since we don't want to synchronize these configurations
+    // to the Native SDKs.
+    // The user could tho initialize the SDK manually and set themselves.
+    [mutableOptions removeObjectForKey:@"tracesSampleRate"];
+    [mutableOptions removeObjectForKey:@"tracesSampler"];
 
     sentryOptions = [[SentryOptions alloc] initWithDict:options didFailWithError:&error];
     if (error) {

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": "3.2.2",
+  "version": "3.2.6",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -41,20 +41,20 @@
   },
   "dependencies": {
     "@sentry/browser": "6.12.0",
+    "@sentry/cli": "^1.68.0",
     "@sentry/core": "6.12.0",
     "@sentry/hub": "6.12.0",
     "@sentry/integrations": "6.12.0",
     "@sentry/react": "6.12.0",
     "@sentry/tracing": "6.12.0",
     "@sentry/types": "6.12.0",
-    "@sentry/utils": "6.12.0",
-    "@sentry/cli": "^1.68.0"
+    "@sentry/utils": "6.12.0"
   },
   "devDependencies": {
     "@sentry-internal/eslint-config-sdk": "6.12.0",
     "@sentry-internal/eslint-plugin-sdk": "6.12.0",
     "@sentry/typescript": "^5.20.0",
-    "@sentry/wizard": "^1.2.2",
+    "@sentry/wizard": "^1.2.15",
     "@types/jest": "^26.0.15",
     "@types/react": "^16.9.49",
     "@types/react-native": "^0.65.3",

package/sentry.gradle

@@ -92,7 +92,13 @@ gradle.projectsEvaluated {
               } catch (FileNotFoundException e) {
                   project.logger.info("file not found '$propertiesFile' for '$variant'")
               }
-              def cliExecutable = sentryProps.get("cli.executable", "$reactRoot/node_modules/@sentry/cli/bin/sentry-cli")
+
+              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 cliExecutable = sentryProps.get("cli.executable", "$cliPackage/bin/sentry-cli")
 
               // fix path separator for Windows
               if (Os.isFamily(Os.FAMILY_WINDOWS)) {