Merge branch 'main' into antonis/deprecate-fifo-cache

CHANGELOG.md

@@ -40,6 +40,11 @@
 - Return `lastEventId` export from `@sentry/core` ([#4315](https://github.com/getsentry/sentry-react-native/pull/4315))
 - Don't log file not found errors when loading envs in `sentry-expo-upload-sourcemaps` ([#4332](https://github.com/getsentry/sentry-react-native/pull/4332))
 - Navigation Span should have no parent by default ([#4326](https://github.com/getsentry/sentry-react-native/pull/4326))
+- Disable HTTP Client Errors on iOS ([#4347](https://github.com/getsentry/sentry-react-native/pull/4347))
+
+### Changes
+
+- Falsy values of `options.environment` (empty string, undefined...) default to `production`
 
 ### Dependencies
 
@@ -53,6 +58,29 @@
   - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8410)
   - [diff](https://github.com/getsentry/sentry-javascript/compare/8.40.0...8.41.0)
 
+## 6.4.0
+
+### Features
+
+- Add Replay Custom Masking for iOS, Android and Web ([#4224](https://github.com/getsentry/sentry-react-native/pull/4224), [#4265](https://github.com/getsentry/sentry-react-native/pull/4265), [#4272](https://github.com/getsentry/sentry-react-native/pull/4272), [#4314](https://github.com/getsentry/sentry-react-native/pull/4314))
+
+  ```jsx
+  import * as Sentry from '@sentry/react-native';
+
+  const Example = () => {
+    return (
+      <View>
+        <Sentry.Mask>
+          <Text>${"All children of Sentry.Mask will be masked."}</Text>
+        </Sentry.Mask>
+        <Sentry.Unmask>
+          <Text>${"Only direct children of Sentry.Unmask will be unmasked."}</Text>
+        </Sentry.Unmask>
+      </View>
+    );
+  };
+  ```
+
 ## 6.4.0-beta.1
 
 ### Features

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0",
   "private": true,
   "description": "Sentry React Native End to End Tests Library",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
     "@sentry/core": "8.41.0",
-    "@sentry/react-native": "6.4.0-beta.1",
+    "@sentry/react-native": "6.4.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",

dev-packages/type-check/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0",
   "scripts": {
     "type-check": "./run-type-check.sh"
   }

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0",
   "packages": [
     "packages/*",
     "dev-packages/*",

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.mm

@@ -38,6 +38,22 @@ - (void)testCreateOptionsWithDictionaryRemovesPerformanceProperties
 XCTAssertEqual(actualOptions.enableTracing, false, @"EnableTracing should not be passed to native");
 }
 
+- (void)testCaptureFailedRequestsIsDisabled
+{
+    RNSentry *rnSentry = [[RNSentry alloc] init];
+    NSError *error = nil;
+
+    NSDictionary *_Nonnull mockedReactNativeDictionary = @{
+        @"dsn" : @"https://[email protected]/123456",
+    };
+    SentryOptions *actualOptions = [rnSentry createOptionsWithDictionary:mockedReactNativeDictionary
+                                                                   error:&error];
+
+    XCTAssertNotNil(actualOptions, @"Did not create sentry options");
+    XCTAssertNil(error, @"Should not pass no error");
+    XCTAssertFalse(actualOptions.enableCaptureFailedRequests);
+}
+
 - (void)testCreateOptionsWithDictionaryNativeCrashHandlingDefault
 {
     RNSentry *rnSentry = [[RNSentry alloc] init];

packages/core/ios/RNSentry.mm

@@ -215,7 +215,7 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
     }
 
     // Failed requests can only be enabled in one SDK to avoid duplicates
-    sentryOptions.enableCaptureFailedRequests = @NO;
+    sentryOptions.enableCaptureFailedRequests = NO;
 
     return sentryOptions;
 }

packages/core/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": "6.4.0-beta.1",
+  "version": "6.4.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -70,7 +70,8 @@
     "@sentry/cli": "2.39.1",
     "@sentry/core": "8.41.0",
     "@sentry/react": "8.41.0",
-    "@sentry/types": "8.41.0"
+    "@sentry/types": "8.41.0",
+    "@sentry/utils": "8.41.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

packages/core/src/js/version.ts

@@ -1,3 +1,3 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION = '6.4.0-beta.1';
+export const SDK_VERSION = '6.4.0';

performance-tests/TestAppPlain/package.json

@@ -1,6 +1,6 @@
 {
   "name": "TestAppPlain",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

performance-tests/TestAppSentry/package.json

@@ -1,14 +1,14 @@
 {
   "name": "TestAppSentry",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "start": "react-native start"
   },
   "dependencies": {
-    "@sentry/react-native": "6.4.0-beta.1",
+    "@sentry/react-native": "6.4.0",
     "react": "18.1.0",
     "react-native": "0.70.6"
   },

samples/expo/app.json

@@ -4,7 +4,7 @@
     "slug": "sentry-react-native-expo-sample",
     "jsEngine": "hermes",
     "scheme": "sentry-expo-sample",
-    "version": "6.4.0-beta.1",
+    "version": "6.4.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -19,15 +19,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "33"
+      "buildNumber": "34"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 33
+      "versionCode": 34
     },
     "web": {
       "bundler": "metro",

samples/expo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-expo-sample",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0",
   "main": "expo-router/entry",
   "scripts": {
     "start": "expo start",
@@ -16,7 +16,7 @@
     "set-version": "npx react-native-version --skip-tag --never-amend"
   },
   "dependencies": {
-    "@sentry/react-native": "6.4.0-beta.1",
+    "@sentry/react-native": "6.4.0",
     "@types/react": "~18.3.12",
     "expo": "^52.0.0",
     "expo-constants": "~17.0.3",

samples/react-native-macos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-macos-sample",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0",
   "private": true,
   "scripts": {
     "start": "react-native start --experimental-debugger",
@@ -18,7 +18,7 @@
     "@react-navigation/stack": "^6.3.20",
     "@sentry/core": "8.41.0",
     "@sentry/react": "8.41.0",
-    "@sentry/react-native": "6.4.0-beta.1",
+    "@sentry/react-native": "6.4.0",
     "@sentry/types": "8.41.0",
     "delay": "^6.0.0",
     "react": "18.2.0",

samples/react-native/android/app/build.gradle

@@ -136,8 +136,8 @@ android {
         applicationId "io.sentry.reactnative.sample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 35
-        versionName "6.4.0-beta.1"
+        versionCode 36
+        versionName "6.4.0"
     }
 
     signingConfigs {

samples/react-native/ios/sentryreactnativesample/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>40</string>
+	<string>41</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>

samples/react-native/ios/sentryreactnativesampleTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>40</string>
+	<string>41</string>
 </dict>
 </plist>

samples/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-sample",
-  "version": "6.4.0-beta.1",
+  "version": "6.4.0",
   "private": true,
   "scripts": {
     "postinstall": "patch-package",
@@ -25,7 +25,7 @@
     "@react-navigation/native": "^7.0.3",
     "@react-navigation/native-stack": "^7.0.3",
     "@react-navigation/stack": "^7.0.3",
-    "@sentry/react-native": "6.4.0-beta.1",
+    "@sentry/react-native": "6.4.0",
     "delay": "^6.0.0",
     "react": "18.3.1",
     "react-native": "0.76.3",

yarn.lock

@@ -7818,7 +7818,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/[email protected]-beta.1, @sentry/react-native@workspace:packages/core":
+"@sentry/[email protected], @sentry/react-native@workspace:packages/core":
   version: 0.0.0-use.local
   resolution: "@sentry/react-native@workspace:packages/core"
   dependencies:
@@ -7835,6 +7835,7 @@ __metadata:
     "@sentry/core": 8.41.0
     "@sentry/react": 8.41.0
     "@sentry/types": 8.41.0
+    "@sentry/utils": 8.41.0
     "@sentry/wizard": 3.36.0
     "@testing-library/react-native": ^12.7.2
     "@types/jest": ^29.5.3
@@ -7918,6 +7919,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sentry/utils@npm:8.41.0":
+  version: 8.41.0
+  resolution: "@sentry/utils@npm:8.41.0"
+  dependencies:
+    "@sentry/core": 8.41.0
+    "@sentry/types": 8.41.0
+  checksum: 09a820928f54a87d385c628a5c8ba0fdf5b3e93befcbaf05237e6db26323d10b17900924f68384fdecece95908cd6462f9870b34000caa80ed34c599db065156
+  languageName: node
+  linkType: hard
+
 "@sentry/wizard@npm:3.36.0":
   version: 3.36.0
   resolution: "@sentry/wizard@npm:3.36.0"
@@ -9482,7 +9493,7 @@ __metadata:
   dependencies:
     "@babel/core": ^7.12.9
     "@babel/runtime": ^7.12.5
-    "@sentry/react-native": 6.4.0-beta.1
+    "@sentry/react-native": 6.4.0
     metro-react-native-babel-preset: ^0.72.3
     react: 18.1.0
     react-native: 0.70.6
@@ -24284,7 +24295,7 @@ __metadata:
     "@babel/preset-env": ^7.25.3
     "@babel/preset-typescript": ^7.18.6
     "@sentry/core": 8.41.0
-    "@sentry/react-native": 6.4.0-beta.1
+    "@sentry/react-native": 6.4.0
     "@types/node": ^20.9.3
     "@types/react": ^18.2.64
     appium: 2.4.1
@@ -24313,7 +24324,7 @@ __metadata:
     "@babel/core": ^7.26.0
     "@babel/preset-env": ^7.26.0
     "@sentry/babel-plugin-component-annotate": ^2.18.0
-    "@sentry/react-native": 6.4.0-beta.1
+    "@sentry/react-native": 6.4.0
     "@types/node": 20.10.4
     "@types/react": ~18.3.12
     expo: ^52.0.0
@@ -24349,7 +24360,7 @@ __metadata:
     "@react-navigation/stack": ^6.3.20
     "@sentry/core": 8.41.0
     "@sentry/react": 8.41.0
-    "@sentry/react-native": 6.4.0-beta.1
+    "@sentry/react-native": 6.4.0
     "@sentry/types": 8.41.0
     "@types/react": ^18.2.65
     "@types/react-native-vector-icons": ^6.4.18
@@ -24395,7 +24406,7 @@ __metadata:
     "@react-navigation/native-stack": ^7.0.3
     "@react-navigation/stack": ^7.0.3
     "@sentry/babel-plugin-component-annotate": ^2.18.0
-    "@sentry/react-native": 6.4.0-beta.1
+    "@sentry/react-native": 6.4.0
     "@types/react": ^18.2.65
     "@types/react-native-vector-icons": ^6.4.18
     "@types/react-test-renderer": ^18.0.0