@sentry/react-native 5.10.0 → 5.11.1

package/dist/js/tracing/transaction.js

@@ -1,4 +1,5 @@
 import { logger } from '@sentry/utils';
+import { AppState } from 'react-native';
 /**
  * Idle Transaction callback to only sample transactions with child spans.
  * To avoid side effects of other callbacks this should be hooked as the last callback.
@@ -11,4 +12,20 @@ export const onlySampleIfChildSpans = (transaction) => {
         transaction.sampled = false;
     }
 };
+/**
+ * Hooks on AppState change to cancel the transaction if the app goes background.
+ */
+export const cancelInBackground = (transaction) => {
+    const subscription = AppState.addEventListener('change', (newState) => {
+        if (newState === 'background') {
+            logger.debug(`Setting ${transaction.op} transaction to cancelled because the app is in the background.`);
+            transaction.setStatus('cancelled');
+            transaction.finish();
+        }
+    });
+    transaction.registerBeforeFinishCallback(() => {
+        logger.debug(`Removing AppState listener for ${transaction.op} transaction.`);
+        subscription.remove();
+    });
+};
 //# sourceMappingURL=transaction.js.map

package/dist/js/tracing/transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/js/tracing/transaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAyB,CAAC,WAA4B,EAAQ,EAAE;IACjG,MAAM,UAAU,GACd,WAAW,CAAC,YAAY;QACxB,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IAE3F,IAAI,CAAC,UAAU,IAAI,UAAU,IAAI,CAAC,EAAE;QAClC,MAAM,CAAC,GAAG,CAAC,mBAAmB,WAAW,CAAC,EAAE,kCAAkC,CAAC,CAAC;QAChF,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC;KAC7B;AACH,CAAC,CAAC","sourcesContent":["import type { BeforeFinishCallback, IdleTransaction } from '@sentry/core';\nimport { logger } from '@sentry/utils';\n\n/**\n * Idle Transaction callback to only sample transactions with child spans.\n * To avoid side effects of other callbacks this should be hooked as the last callback.\n */\nexport const onlySampleIfChildSpans: BeforeFinishCallback = (transaction: IdleTransaction): void => {\n  const spansCount =\n    transaction.spanRecorder &&\n    transaction.spanRecorder.spans.filter(span => span.spanId !== transaction.spanId).length;\n\n  if (!spansCount || spansCount <= 0) {\n    logger.log(`Not sampling as ${transaction.op} transaction has no child spans.`);\n    transaction.sampled = false;\n  }\n};\n"]}
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/js/tracing/transaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAyB,CAAC,WAA4B,EAAQ,EAAE;IACjG,MAAM,UAAU,GACd,WAAW,CAAC,YAAY;QACxB,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IAE3F,IAAI,CAAC,UAAU,IAAI,UAAU,IAAI,CAAC,EAAE;QAClC,MAAM,CAAC,GAAG,CAAC,mBAAmB,WAAW,CAAC,EAAE,kCAAkC,CAAC,CAAC;QAChF,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC;KAC7B;AACH,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,WAA4B,EAAQ,EAAE;IACvE,MAAM,YAAY,GAAG,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,QAAwB,EAAE,EAAE;QACpF,IAAI,QAAQ,KAAK,YAAY,EAAE;YAC7B,MAAM,CAAC,KAAK,CAAC,WAAW,WAAW,CAAC,EAAE,iEAAiE,CAAC,CAAC;YACzG,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACnC,WAAW,CAAC,MAAM,EAAE,CAAC;SACtB;IACH,CAAC,CAAC,CAAC;IACH,WAAW,CAAC,4BAA4B,CAAC,GAAG,EAAE;QAC5C,MAAM,CAAC,KAAK,CAAC,kCAAkC,WAAW,CAAC,EAAE,eAAe,CAAC,CAAC;QAC9E,YAAY,CAAC,MAAM,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { type BeforeFinishCallback, type IdleTransaction } from '@sentry/core';\nimport { logger } from '@sentry/utils';\nimport type { AppStateStatus } from 'react-native';\nimport { AppState } from 'react-native';\n\n/**\n * Idle Transaction callback to only sample transactions with child spans.\n * To avoid side effects of other callbacks this should be hooked as the last callback.\n */\nexport const onlySampleIfChildSpans: BeforeFinishCallback = (transaction: IdleTransaction): void => {\n  const spansCount =\n    transaction.spanRecorder &&\n    transaction.spanRecorder.spans.filter(span => span.spanId !== transaction.spanId).length;\n\n  if (!spansCount || spansCount <= 0) {\n    logger.log(`Not sampling as ${transaction.op} transaction has no child spans.`);\n    transaction.sampled = false;\n  }\n};\n\n/**\n * Hooks on AppState change to cancel the transaction if the app goes background.\n */\nexport const cancelInBackground = (transaction: IdleTransaction): void => {\n  const subscription = AppState.addEventListener('change', (newState: AppStateStatus) => {\n    if (newState === 'background') {\n      logger.debug(`Setting ${transaction.op} transaction to cancelled because the app is in the background.`);\n      transaction.setStatus('cancelled');\n      transaction.finish();\n    }\n  });\n  transaction.registerBeforeFinishCallback(() => {\n    logger.debug(`Removing AppState listener for ${transaction.op} transaction.`);\n    subscription.remove();\n  });\n};\n"]}

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

package/dist/js/version.js

@@ -1,4 +1,4 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION = '5.10.0';
+export const SDK_VERSION = '5.11.1';
 //# 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,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC","sourcesContent":["export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';\nexport const SDK_NAME = 'sentry.javascript.react-native';\nexport const SDK_VERSION = '5.10.0';\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC","sourcesContent":["export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';\nexport const SDK_NAME = 'sentry.javascript.react-native';\nexport const SDK_VERSION = '5.11.1';\n"]}

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.10.0",
+  "version": "5.11.1",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -24,7 +24,9 @@
     "build:tools": "tsc -p tsconfig.build.tools.json",
     "downlevel": "downlevel-dts dist ts3.8/dist --to=3.8",
     "clean": "rimraf dist coverage",
-    "test": "jest",
+    "test": "yarn test:sdk && yarn test:tools",
+    "test:sdk": "jest",
+    "test:tools": "jest --config jest.config.tools.js",
     "fix": "yarn fix:eslint && yarn fix:prettier",
     "fix:eslint": "eslint --config .eslintrc.js --fix .",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/**.ts\"",
@@ -56,22 +58,24 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.69.0",
-    "@sentry/cli": "2.20.7",
-    "@sentry/core": "7.69.0",
-    "@sentry/hub": "7.69.0",
-    "@sentry/integrations": "7.69.0",
-    "@sentry/react": "7.69.0",
-    "@sentry/types": "7.69.0",
-    "@sentry/utils": "7.69.0"
+    "@sentry/browser": "7.73.0",
+    "@sentry/cli": "2.21.2",
+    "@sentry/core": "7.73.0",
+    "@sentry/hub": "7.73.0",
+    "@sentry/integrations": "7.73.0",
+    "@sentry/react": "7.73.0",
+    "@sentry/types": "7.73.0",
+    "@sentry/utils": "7.73.0"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.69.0",
-    "@sentry-internal/eslint-plugin-sdk": "7.69.0",
+    "@sentry-internal/eslint-config-sdk": "7.73.0",
+    "@sentry-internal/eslint-plugin-sdk": "7.73.0",
     "@sentry/typescript": "^5.20.1",
     "@sentry/wizard": "3.13.0",
     "@types/jest": "^29.5.3",
     "@types/react": "^18.2.14",
+    "@types/uglify-js": "^3.17.2",
+    "@types/uuid": "^9.0.4",
     "babel-jest": "^29.6.2",
     "downlevel-dts": "^0.11.0",
     "eslint": "^7.6.0",
@@ -79,13 +83,16 @@
     "eslint-plugin-react-native": "^3.8.1",
     "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
+    "metro": "0.76",
     "prettier": "^2.0.5",
     "react": "18.2.0",
     "react-native": "0.72.4",
     "replace-in-file": "^7.0.1",
     "rimraf": "^4.1.1",
     "ts-jest": "^29.1.1",
-    "typescript": "4.9.5"
+    "typescript": "4.9.5",
+    "uglify-js": "^3.17.4",
+    "uuid": "^9.0.1"
   },
   "rnpm": {
     "commands": {},
@@ -95,33 +102,6 @@
     },
     "ios": {}
   },
-  "jest": {
-    "collectCoverage": true,
-    "preset": "react-native",
-    "setupFilesAfterEnv": [
-      "<rootDir>/test/mockConsole.ts"
-    ],
-    "globals": {
-      "__DEV__": true,
-      "ts-jest": {
-        "tsConfig": "./tsconfig.json",
-        "diagnostics": false
-      }
-    },
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>/test/e2e/",
-      "<rootDir>/test/react-native/versions"
-    ],
-    "testEnvironment": "node",
-    "testMatch": [
-      "**/*.test.(ts|tsx)"
-    ]
-  },
   "codegenConfig": {
     "name": "RNSentrySpec",
     "type": "modules",

package/scripts/copy-debugid.js

@@ -0,0 +1,52 @@
+const process = require('process');
+const fs = require('fs');
+
+console.log('Copy `debugId` from packager source map to Hermes source map...');
+
+const packagerSourceMapPath = process.argv[2];
+const hermesSourceMapPath = process.argv[3];
+
+if (!packagerSourceMapPath) {
+  console.log('Please provide packager source map path (A path to copy `debugId` from).');
+  process.exit(0);
+}
+if (!hermesSourceMapPath) {
+  console.log('Please provide Hermes source map path. ((A path to copy `debugId` to))');
+  process.exit(0);
+}
+if (!fs.existsSync(packagerSourceMapPath)) {
+  console.log('Packager source map path (A path to copy `debugId` from).');
+  process.exit(0);
+}
+if (!fs.existsSync(hermesSourceMapPath)) {
+  console.log('Hermes source map not found. ((A path to copy `debugId` to))');
+  process.exit(0);
+}
+
+const from = fs.readFileSync(process.argv[2], 'utf8');
+const to = fs.readFileSync(process.argv[3], 'utf8');
+
+const fromParsed = JSON.parse(from);
+const toParsed = JSON.parse(to);
+
+if (!fromParsed.debugId && !fromParsed.debug_id) {
+  console.log('Packager source map does not have `debugId`.');
+  process.exit(0);
+}
+
+if (toParsed.debugId || toParsed.debug_id) {
+  console.log('Hermes combined source map already has `debugId`.');
+  process.exit(0);
+}
+
+if (fromParsed.debugId) {
+  toParsed.debugId = fromParsed.debugId;
+  toParsed.debug_id = fromParsed.debugId;
+} else if (fromParsed.debug_id) {
+  toParsed.debugId = fromParsed.debug_id;
+  toParsed.debug_id = fromParsed.debug_id;
+}
+
+fs.writeFileSync(process.argv[3], JSON.stringify(toParsed));
+
+console.log('Done.');

package/scripts/has-sourcemap-debugid.js

@@ -0,0 +1,31 @@
+const process = require('process');
+const fs = require('fs');
+
+const sourceMapPath = process.argv[2];
+
+if (!sourceMapPath) {
+  console.log('Add source map path as first argument of the script.');
+  process.exit(1);
+}
+
+if (!fs.existsSync(sourceMapPath)) {
+  console.log(`${sourceMapPath} does not exist.`);
+  process.exit(1);
+}
+
+let sourceMap;
+try {
+  sourceMap = JSON.parse(fs.readFileSync(sourceMapPath, 'utf8'));
+} catch (e) {
+  console.log(`Sourcemap at ${sourceMapPath} was unable to be read.`, e);
+  process.exist(1);
+}
+
+if (typeof sourceMap.debugId === 'string' && sourceMap.debugId.length > 0) {
+  console.log(sourceMap.debugId);
+} else if (typeof sourceMap.debug_id === 'string' && sourceMap.debug_id.length > 0) {
+  console.log(sourceMap.debug_id);
+} else {
+  console.log(`${sourceMapPath} does not contain 'debugId' nor 'debug_id'.`);
+  process.exist(1);
+}

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

@@ -0,0 +1,27 @@
+#!/bin/bash
+# Upload Debug Symbols to Sentry Xcode Build Phase
+# PWD=ios
+
+# print commands before executing them and stop on first error
+set -x -e
+
+# load envs if loader file exists (since rn 0.68)
+WITH_ENVIRONMENT="../node_modules/react-native/scripts/xcode/with-environment.sh"
+if [ -f "$WITH_ENVIRONMENT" ]; then
+    . "$WITH_ENVIRONMENT"
+fi
+
+[ -z "$SENTRY_PROPERTIES" ] && export SENTRY_PROPERTIES=sentry.properties
+[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="../node_modules/@sentry/cli/bin/sentry-cli"
+
+[[ $SENTRY_INCLUDE_NATIVE_SOURCES == "true" ]] && INCLUDE_SOURCES_FLAG="--include-sources" || INCLUDE_SOURCES_FLAG=""
+
+EXTRA_ARGS="$SENTRY_CLI_EXTRA_ARGS $SENTRY_CLI_DEBUG_FILES_UPLOAD_EXTRA_ARGS $INCLUDE_SOURCES_FLAG"
+
+UPLOAD_DEBUG_FILES="\"$SENTRY_CLI_EXECUTABLE\" debug-files upload $EXTRA_ARGS \"$DWARF_DSYM_FOLDER_PATH\""
+
+if [ "$SENTRY_DISABLE_AUTO_UPLOAD" != true ]; then
+  /bin/sh -c "$UPLOAD_DEBUG_FILES"
+else
+  echo "SENTRY_DISABLE_AUTO_UPLOAD=true, skipping debug files upload"
+fi

package/scripts/sentry-xcode.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# Sentry Bundle React Native code and images
+# PWD=ios
+
+# print commands before executing them and stop on first error
+set -x -e
+
+# WITH_ENVIRONMENT is executed by React Native
+
+[ -z "$SENTRY_PROPERTIES" ] && export SENTRY_PROPERTIES=sentry.properties
+[ -z "$SOURCEMAP_FILE" ] && export SOURCEMAP_FILE="$DERIVED_FILE_DIR/main.jsbundle.map"
+[ -z "$SENTRY_CLI_EXECUTABLE" ] && SENTRY_CLI_EXECUTABLE="../node_modules/@sentry/cli/bin/sentry-cli"
+
+REACT_NATIVE_XCODE=$1
+
+[[ "$AUTO_RELEASE" != true ]] && [[ -z "$BUNDLE_COMMAND" || "$BUNDLE_COMMAND" != "ram-bundle" ]] && NO_AUTO_RELEASE="--no-auto-release"
+ARGS="$NO_AUTO_RELEASE $SENTRY_CLI_EXTRA_ARGS $SENTRY_CLI_RN_XCODE_EXTRA_ARGS"
+
+REACT_NATIVE_XCODE_WITH_SENTRY="\"$SENTRY_CLI_EXECUTABLE\" react-native xcode $ARGS \"$REACT_NATIVE_XCODE\""
+
+if [ "$SENTRY_DISABLE_AUTO_UPLOAD" != true ]; then
+  /bin/sh -c "$REACT_NATIVE_XCODE_WITH_SENTRY"
+else
+  echo "SENTRY_DISABLE_AUTO_UPLOAD=true, skipping sourcemaps upload"
+  /bin/sh -c "$REACT_NATIVE_XCODE"
+fi
+
+[ -z "$SENTRY_COLLECT_MODULES" ] && SENTRY_COLLECT_MODULES="../../scripts/collect-modules.sh"
+
+if [ -f "$SENTRY_COLLECT_MODULES" ]; then
+  /bin/sh "$SENTRY_COLLECT_MODULES"
+fi

package/sentry.gradle

@@ -3,6 +3,10 @@ import org.apache.tools.ant.taskdefs.condition.Os
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
+project.ext.shouldSentryAutoUpload = { ->
+  return System.getenv('SENTRY_DISABLE_AUTO_UPLOAD') != 'true'
+}
+
 def config = project.hasProperty("sentryCli") ? project.sentryCli : [];
 
 gradle.projectsEvaluated {
@@ -39,6 +43,8 @@ gradle.projectsEvaluated {
         def shouldCleanUp
         def sourcemapOutput
         def bundleOutput
+        def packagerSourcemapOutput
+        def bundleCommand
         def props = bundleTask.getProperties()
         def reactRoot = props.get("workingDir")
         if (reactRoot == null) {
@@ -47,7 +53,7 @@ gradle.projectsEvaluated {
         def modulesOutput = "$reactRoot/android/app/src/main/assets/modules.json"
         def modulesTask = null
 
-        (shouldCleanUp, bundleOutput, sourcemapOutput) = forceSourceMapOutputFromBundleTask(bundleTask)
+        (shouldCleanUp, bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand) = forceSourceMapOutputFromBundleTask(bundleTask)
 
         // Lets leave this here if we need to debug
         // println bundleTask.properties
@@ -94,71 +100,109 @@ gradle.projectsEvaluated {
           try { tasks.named(nameCliTask); return } catch (Exception e) {}
 
           /** Upload source map file to the sentry server via CLI call. */
-          def cliTask = tasks.create(nameCliTask, Exec) {
+          def cliTask = tasks.create(nameCliTask) {
+              onlyIf { shouldSentryAutoUpload() }
               description = "upload debug symbols to sentry"
               group = 'sentry.io'
 
-              workingDir reactRoot
-
-              def propertiesFile = config.sentryProperties
-                      ? config.sentryProperties
-                      : "$reactRoot/android/sentry.properties"
-
-              if (config.flavorAware) {
-                  propertiesFile = "$reactRoot/android/sentry-${variant}.properties"
-                  project.logger.info("For $variant using: $propertiesFile")
-              } else {
-                  environment("SENTRY_PROPERTIES", propertiesFile)
+              def extraArgs = []
+
+              def sentryPackage = resolveSentryReactNativeSDKPath(reactRoot)
+              def copyDebugIdScript = config.copyDebugIdScript
+                  ? file(config.copyDebugIdScript).getAbsolutePath()
+                  : "$sentryPackage/scripts/copy-debugid.js"
+              def hasSourceMapDebugIdScript = config.hasSourceMapDebugIdScript
+                  ? file(config.hasSourceMapDebugIdScript).getAbsolutePath()
+                  : "$sentryPackage/scripts/has-sourcemap-debugid.js"
+
+              doFirst {
+                  // Copy Debug ID from packager source map to Hermes composed source map
+                  exec {
+                      def args = ["node",
+                          copyDebugIdScript,
+                          packagerSourcemapOutput,
+                          sourcemapOutput]
+                      def osCompatibilityCopyCommand = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c'] : []
+                      commandLine(*osCompatibilityCopyCommand, *args)
+                  }
+
+                  // Add release and dist for backward compatibility if no Debug ID detected in output soruce map
+                  def process = ["node", hasSourceMapDebugIdScript, sourcemapOutput].execute(null, new File("$reactRoot"))
+                  def exitValue = process.waitFor()
+                  project.logger.lifecycle("Check generated source map for Debug ID: ${process.text}")
+                  def notIncludeRelease = "$bundleCommand" == "bundle" && exitValue == 0
+                  def not = notIncludeRelease ? 'not ' : ''
+                  project.logger.lifecycle("Sentry Source Maps upload will ${not}include the release name and dist.")
+                  extraArgs.addAll(notIncludeRelease ? [] : [
+                      "--release", releaseName,
+                      "--dist", versionCode
+                  ])
               }
 
-              Properties sentryProps = new Properties()
-              try {
-                  sentryProps.load(new FileInputStream(propertiesFile))
-              } catch (FileNotFoundException e) {
-                  project.logger.info("file not found '$propertiesFile' for '$variant'")
+              doLast {
+                  exec {
+                      workingDir reactRoot
+
+                      def propertiesFile = config.sentryProperties
+                        ? config.sentryProperties
+                        : "$reactRoot/android/sentry.properties"
+
+                      if (config.flavorAware) {
+                          propertiesFile = "$reactRoot/android/sentry-${variant}.properties"
+                          project.logger.info("For $variant using: $propertiesFile")
+                      } else {
+                          environment("SENTRY_PROPERTIES", propertiesFile)
+                      }
+
+                      Properties sentryProps = new Properties()
+                      try {
+                          sentryProps.load(new FileInputStream(propertiesFile))
+                      } catch (FileNotFoundException e) {
+                          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 cliExecutable = sentryProps.get("cli.executable", "$cliPackage/bin/sentry-cli")
+
+                      // fix path separator for Windows
+                      if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                          cliExecutable = cliExecutable.replaceAll("/", "\\\\")
+                      }
+
+                      //
+                      // based on:
+                      //   https://github.com/getsentry/sentry-cli/blob/master/src/commands/react_native_gradle.rs
+                      //
+                      def args = [cliExecutable]
+
+                      args.addAll(!config.logLevel ? [] : [
+                          "--log-level", config.logLevel      // control verbosity of the output
+                      ])
+                      args.addAll(!config.flavorAware ? [] : [
+                          "--url", sentryProps.get("defaults.url"),
+                          "--auth-token", sentryProps.get("auth.token")
+                      ])
+                      args.addAll(["react-native", "gradle",
+                          "--bundle", bundleOutput,           // The path to a bundle that should be uploaded.
+                          "--sourcemap", sourcemapOutput      // The path to a sourcemap that should be uploaded.
+                      ])
+                      args.addAll(!config.flavorAware ? [] : [
+                          "--org", sentryProps.get("defaults.org"),
+                          "--project", sentryProps.get("defaults.project")
+                      ])
+
+                      args.addAll(extraArgs)
+
+                      project.logger.lifecycle("Sentry-CLI arguments: ${args}")
+                      def osCompatibility = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c', 'node'] : []
+                      commandLine(*osCompatibility, *args)
+                  }
               }
 
-              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)) {
-                  cliExecutable = cliExecutable.replaceAll("/", "\\\\")
-              }
-
-              //
-              // based on:
-              //   https://github.com/getsentry/sentry-cli/blob/master/src/commands/react_native_gradle.rs
-              //
-              def args = [cliExecutable]
-
-              args.addAll(!config.logLevel ? [] : [
-                      "--log-level", config.logLevel      // control verbosity of the output
-              ])
-              args.addAll(!config.flavorAware ? [] : [
-                      "--url", sentryProps.get("defaults.url"),
-                      "--auth-token", sentryProps.get("auth.token")
-              ])
-              args.addAll(["react-native", "gradle",
-                           "--bundle", bundleOutput,           // The path to a bundle that should be uploaded.
-                           "--sourcemap", sourcemapOutput,     // The path to a sourcemap that should be uploaded.
-                           "--release", releaseName,            // The name of the release to publish.
-                           "--dist", versionCode
-              ])
-              args.addAll(!config.flavorAware ? [] : [
-                      "--org", sentryProps.get("defaults.org"),
-                      "--project", sentryProps.get("defaults.project")
-              ])
-
-              project.logger.info("Sentry-CLI arguments: ${args}")
-
-              def osCompatibility = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c', 'node'] : []
-              commandLine(*osCompatibility, *args)
-
               enabled true
           }
 
@@ -168,11 +212,7 @@ gradle.projectsEvaluated {
 
               workingDir reactRoot
 
-              def resolvedSentryPath = null
-              try {
-                  resolvedSentryPath = new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
-              } catch (Throwable ignored) {} // if the resolve fails we fallback to the default path
-              def sentryPackage = resolvedSentryPath != null && resolvedSentryPath.exists() ? resolvedSentryPath.getAbsolutePath() : "$reactRoot/node_modules/@sentry/react-native"
+              def sentryPackage = resolveSentryReactNativeSDKPath(reactRoot)
 
               def collectModulesScript = config.collectModulesScript
                   ? file(config.collectModulesScript).getAbsolutePath()
@@ -248,6 +288,15 @@ gradle.projectsEvaluated {
     }
 }
 
+def resolveSentryReactNativeSDKPath(reactRoot) {
+    def resolvedSentryPath = null
+    try {
+        resolvedSentryPath = new File(["node", "--print", "require.resolve('@sentry/react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile();
+    } catch (Throwable ignored) {} // if the resolve fails we fallback to the default path
+    def sentryPackage = resolvedSentryPath != null && resolvedSentryPath.exists() ? resolvedSentryPath.getAbsolutePath() : "$reactRoot/node_modules/@sentry/react-native"
+    return sentryPackage
+}
+
 /** Compose lookup map of build variants - to - outputs. */
 def extractReleasesInfo() {
     def releases = [:]
@@ -275,6 +324,8 @@ def extractReleasesInfo() {
 static extractBundleTaskArgumentsLegacy(cmdArgs, Project project) {
     def bundleOutput = null
     def sourcemapOutput = null
+    def packagerSourcemapOutput = null
+    // packagerBundleOutput doesn't exist, because packager output is overwritten by Hermes
 
     cmdArgs.eachWithIndex { String arg, int i ->
         if (arg == "--bundle-output") {
@@ -282,6 +333,7 @@ static extractBundleTaskArgumentsLegacy(cmdArgs, Project project) {
             project.logger.info("--bundle-output: `${bundleOutput}`")
         } else if (arg == "--sourcemap-output") {
             sourcemapOutput = cmdArgs[i + 1]
+            packagerSourcemapOutput = sourcemapOutput
             project.logger.info("--sourcemap-output param: `${sourcemapOutput}`")
         }
     }
@@ -313,7 +365,11 @@ static extractBundleTaskArgumentsLegacy(cmdArgs, Project project) {
         }
     }
 
-    return [bundleOutput, sourcemapOutput]
+    // get the current bundle command, if not peresent use default plain "bundle"
+    // we use this later to decide how to upload source maps
+    def bundleCommand = project.ext.react.get("bundleCommand", "bundle")
+
+    return [bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand]
 }
 
 /** Extract bundle and sourcemap paths from bundle task props.
@@ -328,12 +384,15 @@ static extractBundleTaskArgumentsRN71AndAbove(bundleTask, logger) {
         return [null, null]
     }
 
+    def bundleCommand = props.bundleCommand.get()
     def bundleFile = new File(props.jsBundleDir.get().asFile.absolutePath, bundleAssetName)
     def outputSourceMap = new File(props.jsSourceMapsDir.get().asFile.absolutePath, "${bundleAssetName}.map")
+    def packagerOutputSourceMap = new File(props.jsIntermediateSourceMapsDir.get().asFile.absolutePath, "${bundleAssetName}.packager.map")
 
     logger.info("bundleFile: `${bundleFile}`")
     logger.info("outputSourceMap: `${outputSourceMap}`")
-    return [bundleFile, outputSourceMap]
+    logger.info("packagerOutputSourceMap: `${packagerOutputSourceMap}`")
+    return [bundleFile, outputSourceMap, packagerOutputSourceMap, bundleCommand]
 }
 
 /** Force Bundle task to produce sourcemap files if they are not pre-configured by user yet. */
@@ -344,10 +403,12 @@ def forceSourceMapOutputFromBundleTask(bundleTask) {
     def shouldCleanUp = false
     def bundleOutput = null
     def sourcemapOutput = null
+    def packagerSourcemapOutput = null
+    def bundleCommand = null
 
-    (bundleOutput, sourcemapOutput) = extractBundleTaskArgumentsRN71AndAbove(bundleTask, logger)
+    (bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand) = extractBundleTaskArgumentsRN71AndAbove(bundleTask, logger)
     if (bundleOutput == null) {
-        (bundleOutput, sourcemapOutput) = extractBundleTaskArgumentsLegacy(cmdArgs, project)
+        (bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand) = extractBundleTaskArgumentsLegacy(cmdArgs, project)
     }
 
     if (sourcemapOutput == null) {
@@ -366,7 +427,7 @@ def forceSourceMapOutputFromBundleTask(bundleTask) {
         project.logger.info("Info: used pre-configured source map files: ${sourcemapOutput}")
     }
 
-    return [shouldCleanUp, bundleOutput, sourcemapOutput]
+    return [shouldCleanUp, bundleOutput, sourcemapOutput, packagerSourcemapOutput, bundleCommand]
 }
 
 /** compose array with one item - current build flavor name */

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

@@ -1,4 +1,4 @@
-import type { EventHint, Integration } from '@sentry/types';
+import type { EventHint, EventProcessor, Integration } from '@sentry/types';
 /** Adds screenshots to error events */
 export declare class Screenshot implements Integration {
     /**
@@ -11,6 +11,8 @@ export declare class Screenshot implements Integration {
     name: string;
     /**
      * If enabled attaches a screenshot to the event hint.
+     *
+     * @deprecated Screenshots are now added in global event processor.
      */
     static attachScreenshotToEventHint(hint: EventHint, { attachScreenshot }: {
         attachScreenshot?: boolean;
@@ -18,6 +20,6 @@ export declare class Screenshot implements Integration {
     /**
      * @inheritDoc
      */
-    setupOnce(): void;
+    setupOnce(addGlobalEventProcessor: (e: EventProcessor) => void): void;
 }
 //# sourceMappingURL=screenshot.d.ts.map

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

@@ -10,7 +10,7 @@ export declare function init(passedOptions: ReactNativeOptions): void;
 /**
  * Inits the Sentry React Native SDK with automatic instrumentation and wrapped features.
  */
-export declare function wrap<P extends JSX.IntrinsicAttributes>(RootComponent: React.ComponentType<P>, options?: ReactNativeWrapperOptions): React.ComponentType<P>;
+export declare function wrap<P extends Record<string, unknown>>(RootComponent: React.ComponentType<P>, options?: ReactNativeWrapperOptions): React.ComponentType<P>;
 /**
  * Deprecated. Sets the release on the event.
  * NOTE: Does not set the release on sessions.