@sentry/react-native 7.12.0 → 8.0.0-beta.0

package/plugin/build/withSentryAndroidGradlePlugin.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withSentryAndroidGradlePlugin = exports.sentryAndroidGradlePluginVersion = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
-const utils_1 = require("./utils");
-exports.sentryAndroidGradlePluginVersion = '5.12.2';
+const logger_1 = require("./logger");
+exports.sentryAndroidGradlePluginVersion = '6.0.0';
 /**
  * Adds the Sentry Android Gradle Plugin to the project.
  * https://docs.sentry.io/platforms/react-native/manual-setup/manual-setup/#enable-sentry-agp
@@ -13,29 +13,29 @@ function withSentryAndroidGradlePlugin(config, { includeProguardMapping = true,
     const withSentryProjectBuildGradle = (config) => {
         return (0, config_plugins_1.withProjectBuildGradle)(config, projectBuildGradle => {
             if (!projectBuildGradle.modResults?.contents) {
-                (0, utils_1.warnOnce)('android/build.gradle content is missing or undefined.');
+                (0, logger_1.warnOnce)('android/build.gradle content is missing or undefined.');
                 return projectBuildGradle;
             }
             if (projectBuildGradle.modResults.language !== 'groovy') {
-                (0, utils_1.warnOnce)('Cannot configure Sentry in android/build.gradle because it is not in Groovy.');
+                (0, logger_1.warnOnce)('Cannot configure Sentry in android/build.gradle because it is not in Groovy.');
                 return projectBuildGradle;
             }
             const dependency = `classpath("io.sentry:sentry-android-gradle-plugin:${exports.sentryAndroidGradlePluginVersion}")`;
             if (projectBuildGradle.modResults.contents.includes(dependency)) {
-                (0, utils_1.warnOnce)('sentry-android-gradle-plugin dependency in already in android/build.gradle.');
+                (0, logger_1.warnOnce)('sentry-android-gradle-plugin dependency in already in android/build.gradle.');
                 return projectBuildGradle;
             }
             try {
                 const updatedContents = projectBuildGradle.modResults.contents.replace(/dependencies\s*{/, `dependencies {\n        ${dependency}`);
                 if (updatedContents === projectBuildGradle.modResults.contents) {
-                    (0, utils_1.warnOnce)('Failed to inject the dependency. Could not find `dependencies` in build.gradle.');
+                    (0, logger_1.warnOnce)('Failed to inject the dependency. Could not find `dependencies` in build.gradle.');
                 }
                 else {
                     projectBuildGradle.modResults.contents = updatedContents;
                 }
             }
             catch (error) {
-                (0, utils_1.warnOnce)('An error occurred while trying to modify build.gradle');
+                (0, logger_1.warnOnce)('An error occurred while trying to modify build.gradle');
             }
             return projectBuildGradle;
         });
@@ -44,7 +44,7 @@ function withSentryAndroidGradlePlugin(config, { includeProguardMapping = true,
     const withSentryAppBuildGradle = (config) => {
         return (0, config_plugins_1.withAppBuildGradle)(config, appBuildGradle => {
             if (appBuildGradle.modResults.language !== 'groovy') {
-                (0, utils_1.warnOnce)('Cannot configure Sentry in android/app/build.gradle because it is not in Groovy.');
+                (0, logger_1.warnOnce)('Cannot configure Sentry in android/app/build.gradle because it is not in Groovy.');
                 return appBuildGradle;
             }
             const sentryPlugin = 'apply plugin: "io.sentry.android.gradle"';

package/plugin/build/withSentryIOS.d.ts

@@ -1,8 +1,13 @@
+import type { ExpoConfig } from '@expo/config-types';
 import type { ConfigPlugin } from 'expo/config-plugins';
 type BuildPhase = {
     shellScript: string;
 };
-export declare const withSentryIOS: ConfigPlugin<string>;
+export declare const withSentryIOS: ConfigPlugin<{
+    sentryProperties: string;
+    useNativeInit: boolean | undefined;
+}>;
 export declare function modifyExistingXcodeBuildScript(script: BuildPhase): void;
 export declare function addSentryWithBundledScriptsToBundleShellScript(script: string): string;
+export declare function modifyAppDelegate(config: ExpoConfig): ExpoConfig;
 export {};

package/plugin/build/withSentryIOS.js

@@ -23,14 +23,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addSentryWithBundledScriptsToBundleShellScript = exports.modifyExistingXcodeBuildScript = exports.withSentryIOS = void 0;
+exports.modifyAppDelegate = exports.addSentryWithBundledScriptsToBundleShellScript = exports.modifyExistingXcodeBuildScript = exports.withSentryIOS = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const path = __importStar(require("path"));
+const logger_1 = require("./logger");
 const utils_1 = require("./utils");
 const SENTRY_REACT_NATIVE_XCODE_PATH = "`\"$NODE_BINARY\" --print \"require('path').dirname(require.resolve('@sentry/react-native/package.json')) + '/scripts/sentry-xcode.sh'\"`";
 const SENTRY_REACT_NATIVE_XCODE_DEBUG_FILES_PATH = "`${NODE_BINARY:-node} --print \"require('path').dirname(require.resolve('@sentry/react-native/package.json')) + '/scripts/sentry-xcode-debug-files.sh'\"`";
-const withSentryIOS = (config, sentryProperties) => {
-    const cfg = (0, config_plugins_1.withXcodeProject)(config, config => {
+const withSentryIOS = (config, { sentryProperties, useNativeInit = false }) => {
+    const xcodeProjectCfg = (0, config_plugins_1.withXcodeProject)(config, config => {
         const xcodeProject = config.modResults;
         const sentryBuildPhase = xcodeProject.pbxItemByComment('Upload Debug Symbols to Sentry', 'PBXShellScriptBuildPhase');
         if (!sentryBuildPhase) {
@@ -47,7 +48,8 @@ const withSentryIOS = (config, sentryProperties) => {
         modifyExistingXcodeBuildScript(bundleReactNativePhase);
         return config;
     });
-    return (0, config_plugins_1.withDangerousMod)(cfg, [
+    const appDelegateCfc = useNativeInit ? modifyAppDelegate(xcodeProjectCfg) : xcodeProjectCfg;
+    return (0, config_plugins_1.withDangerousMod)(appDelegateCfc, [
         'ios',
         config => {
             (0, utils_1.writeSentryPropertiesTo)(path.resolve(config.modRequest.projectRoot, 'ios'), sentryProperties);
@@ -58,16 +60,16 @@ const withSentryIOS = (config, sentryProperties) => {
 exports.withSentryIOS = withSentryIOS;
 function modifyExistingXcodeBuildScript(script) {
     if (!script.shellScript.match(/(packager|scripts)\/react-native-xcode\.sh\b/)) {
-        (0, utils_1.warnOnce)(`'react-native-xcode.sh' not found in 'Bundle React Native code and images'.
+        (0, logger_1.warnOnce)(`'react-native-xcode.sh' not found in 'Bundle React Native code and images'.
 Please open a bug report at https://github.com/getsentry/sentry-react-native`);
         return;
     }
     if (script.shellScript.includes('sentry-xcode.sh')) {
-        (0, utils_1.warnOnce)("The latest 'sentry-xcode.sh' script already exists in 'Bundle React Native code and images'.");
+        (0, logger_1.warnOnce)("The latest 'sentry-xcode.sh' script already exists in 'Bundle React Native code and images'.");
         return;
     }
     if (script.shellScript.includes('@sentry')) {
-        (0, utils_1.warnOnce)(`Outdated or custom Sentry script found in 'Bundle React Native code and images'.
+        (0, logger_1.warnOnce)(`Outdated or custom Sentry script found in 'Bundle React Native code and images'.
 Regenerate the native project to use the latest script.
 Run npx expo prebuild --clean`);
         return;
@@ -82,3 +84,49 @@ function addSentryWithBundledScriptsToBundleShellScript(script) {
     (match) => `/bin/sh ${SENTRY_REACT_NATIVE_XCODE_PATH} ${match}`);
 }
 exports.addSentryWithBundledScriptsToBundleShellScript = addSentryWithBundledScriptsToBundleShellScript;
+function modifyAppDelegate(config) {
+    return (0, config_plugins_1.withAppDelegate)(config, async (config) => {
+        if (!config.modResults?.path) {
+            (0, logger_1.warnOnce)("Can't add 'RNSentrySDK.start()' to the iOS AppDelegate, because the file was not found.");
+            return config;
+        }
+        const fileName = path.basename(config.modResults.path);
+        if (config.modResults.language === 'swift') {
+            if (config.modResults.contents.includes('RNSentrySDK.start()')) {
+                (0, logger_1.warnOnce)(`Your '${fileName}' already contains 'RNSentrySDK.start()'.`);
+                return config;
+            }
+            // Add RNSentrySDK.start() at the beginning of application method
+            const originalContents = config.modResults.contents;
+            config.modResults.contents = config.modResults.contents.replace(/(func application\([^)]*\) -> Bool \{)\s*\n(\s*)/s, '$1\n$2RNSentrySDK.start()\n$2');
+            if (config.modResults.contents === originalContents) {
+                (0, logger_1.warnOnce)(`Failed to insert 'RNSentrySDK.start()' in '${fileName}'.`);
+            }
+            else if (!config.modResults.contents.includes('import RNSentry')) {
+                // Insert import statement after the first import (works for both UIKit and Expo imports)
+                config.modResults.contents = config.modResults.contents.replace(/(import \S+\n)/, '$1import RNSentry\n');
+            }
+        }
+        else if (['objcpp', 'objc'].includes(config.modResults.language)) {
+            if (config.modResults.contents.includes('[RNSentrySDK start]')) {
+                (0, logger_1.warnOnce)(`Your '${fileName}' already contains '[RNSentrySDK start]'.`);
+                return config;
+            }
+            // Add [RNSentrySDK start] at the beginning of application:didFinishLaunchingWithOptions method
+            const originalContents = config.modResults.contents;
+            config.modResults.contents = config.modResults.contents.replace(/(- \(BOOL\)application:[\s\S]*?didFinishLaunchingWithOptions:[\s\S]*?\{\n)(\s*)/s, '$1$2[RNSentrySDK start];\n$2');
+            if (config.modResults.contents === originalContents) {
+                (0, logger_1.warnOnce)(`Failed to insert '[RNSentrySDK start]' in '${fileName}.`);
+            }
+            else if (!config.modResults.contents.includes('#import <RNSentry/RNSentry.h>')) {
+                // Add import after AppDelegate.h
+                config.modResults.contents = config.modResults.contents.replace(/(#import "AppDelegate.h"\n)/, '$1#import <RNSentry/RNSentry.h>\n');
+            }
+        }
+        else {
+            (0, logger_1.warnOnce)(`Unsupported language '${config.modResults.language}' detected in '${fileName}', the native code won't be updated.`);
+        }
+        return config;
+    });
+}
+exports.modifyAppDelegate = modifyAppDelegate;

package/scripts/sentry-xcode.sh

@@ -78,4 +78,24 @@ if [ -f "$SENTRY_COLLECT_MODULES" ]; then
   /bin/sh "$SENTRY_COLLECT_MODULES"
 fi
 
+# sentry.options.json Block
+SENTRY_OPTIONS_FILE_ERROR_MESSAGE_POSTFIX="Skipping options file copy. To disable this behavior, set SENTRY_COPY_OPTIONS_FILE=false in your environment variables."
+SENTRY_OPTIONS_FILE_NAME="sentry.options.json"
+SENTRY_OPTIONS_FILE_DESTINATION_PATH="$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/$SENTRY_OPTIONS_FILE_NAME"
+[ -z "$SENTRY_OPTIONS_FILE_PATH" ] && SENTRY_OPTIONS_FILE_PATH="$RN_PROJECT_ROOT/$SENTRY_OPTIONS_FILE_NAME"
+[ -z "$SENTRY_COPY_OPTIONS_FILE" ] && SENTRY_COPY_OPTIONS_FILE=true
+
+if [ "$SENTRY_COPY_OPTIONS_FILE" = true ]; then
+  if [[ -z "$CONFIGURATION_BUILD_DIR" ]]; then
+    echo "[Sentry] CONFIGURATION_BUILD_DIR is not set. $SENTRY_OPTIONS_FILE_ERROR_MESSAGE_POSTFIX" 1>&2
+  elif [[ -z "$UNLOCALIZED_RESOURCES_FOLDER_PATH" ]]; then
+    echo "[Sentry] UNLOCALIZED_RESOURCES_FOLDER_PATH is not set. $SENTRY_OPTIONS_FILE_ERROR_MESSAGE_POSTFIX" 1>&2
+  elif [ ! -f "$SENTRY_OPTIONS_FILE_PATH" ]; then
+    echo "[Sentry] $SENTRY_OPTIONS_FILE_PATH not found. $SENTRY_OPTIONS_FILE_ERROR_MESSAGE_POSTFIX" 1>&2
+  else
+    cp "$SENTRY_OPTIONS_FILE_PATH" "$SENTRY_OPTIONS_FILE_DESTINATION_PATH"
+    echo "[Sentry] Copied $SENTRY_OPTIONS_FILE_PATH to $SENTRY_OPTIONS_FILE_DESTINATION_PATH"
+  fi
+fi
+
 exit $exitCode

package/sentry.gradle

@@ -20,8 +20,48 @@ interface InjectedExecOps {
     ExecOperations getExecOps()
 }
 
+project.ext.shouldCopySentryOptionsFile = { -> // If not set, default to true
+    return System.getenv('SENTRY_COPY_OPTIONS_FILE') != 'false'
+}
+
 def config = project.hasProperty("sentryCli") ? project.sentryCli : [];
 
+def configFile = "sentry.options.json" // Sentry configuration file
+def androidAssetsDir = new File("$rootDir/app/src/main/assets") // Path to Android assets folder
+
+tasks.register("copySentryJsonConfiguration") {
+    onlyIf { shouldCopySentryOptionsFile() }
+    doLast {
+        def appRoot = project.rootDir.parentFile ?: project.rootDir
+        def sentryOptionsFile = new File(appRoot, configFile)
+        if (sentryOptionsFile.exists()) {
+            if (!androidAssetsDir.exists()) {
+                androidAssetsDir.mkdirs()
+            }
+
+            copy {
+                from sentryOptionsFile
+                into androidAssetsDir
+                rename { String fileName -> configFile }
+            }
+            logger.lifecycle("Copied ${configFile} to Android assets")
+        } else {
+            logger.warn("${configFile} not found in app root (${appRoot})")
+        }
+    }
+}
+
+tasks.register("cleanupTemporarySentryJsonConfiguration") {
+    onlyIf { shouldCopySentryOptionsFile() }
+    doLast {
+        def sentryOptionsFile = new File(androidAssetsDir, configFile)
+        if (sentryOptionsFile.exists()) {
+            logger.lifecycle("Deleting temporary file: ${sentryOptionsFile.path}")
+            sentryOptionsFile.delete()
+        }
+    }
+}
+
 plugins.withId('com.android.application') {
     def androidComponents = extensions.getByName("androidComponents")
 
@@ -278,6 +318,17 @@ plugins.withId('com.android.application') {
 // gradle.projectsEvaluated doesn't work with --configure-on-demand
 // the task are create too late and not executed
 project.afterEvaluate {
+    // Add a task that copies the sentry.options.json file before the build starts
+    tasks.named("preBuild").configure {
+        dependsOn("copySentryJsonConfiguration")
+    }
+    // Cleanup sentry.options.json from assets after the build
+    tasks.matching { task ->
+        task.name == "build" || task.name.startsWith("assemble") || task.name.startsWith("install")
+    }.configureEach {
+        finalizedBy("cleanupTemporarySentryJsonConfiguration")
+    }
+
     if (config.flavorAware && config.sentryProperties) {
         throw new GradleException("Incompatible sentry configuration. " +
                 "You cannot use both `flavorAware` and `sentryProperties`. " +

package/ts3.8/dist/js/replay/mobilereplay.d.ts

@@ -66,32 +66,6 @@ export interface MobileReplayOptions {
      * @platform ios
      */
     enableFastViewRendering?: boolean;
-    /**
-     * Array of view class names to include in subtree traversal during session replay and screenshot capture on iOS.
-     *
-     * Only views that are instances of these classes (or subclasses) will be traversed.
-     * This helps prevent crashes when traversing problematic view hierarchies by allowing you to explicitly include only safe view classes.
-     *
-     * If both `includedViewClasses` and `excludedViewClasses` are set, `excludedViewClasses` takes precedence:
-     * views matching excluded classes won't be traversed even if they match an included class.
-     *
-     * @default undefined
-     * @platform ios
-     */
-    includedViewClasses?: string[];
-    /**
-     * Array of view class names to exclude from subtree traversal during session replay and screenshot capture on iOS.
-     *
-     * Views of these classes (or subclasses) will be skipped entirely, including all their children.
-     * This helps prevent crashes when traversing problematic view hierarchies by allowing you to explicitly exclude problematic view classes.
-     *
-     * If both `includedViewClasses` and `excludedViewClasses` are set, `excludedViewClasses` takes precedence:
-     * views matching excluded classes won't be traversed even if they match an included class.
-     *
-     * @default undefined
-     * @platform ios
-     */
-    excludedViewClasses?: string[];
     /**
      * Sets the screenshot strategy used by the Session Replay integration on Android.
      *

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

@@ -1,6 +1,7 @@
 /// <reference types="react-native" />
 import type { InternalGlobal } from '@sentry/core';
 import type { ErrorUtils } from 'react-native/types';
+import type { ReactNativeOptions } from '../options';
 import type { ExpoGlobalObject } from './expoglobalobject';
 export interface HermesPromiseRejectionTrackingOptions {
     allRejections: boolean;
@@ -32,6 +33,7 @@ export interface ReactNativeInternalGlobal extends InternalGlobal {
     nativePerformanceNow?: () => number;
     TextEncoder?: TextEncoder;
     alert?: (message: string) => void;
+    __SENTRY_OPTIONS__?: ReactNativeOptions;
     SENTRY_RELEASE?: {
         /** Used by Sentry Webpack Plugin, not used by RN, only to silence TS */
         id?: string;

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