Merge remote-tracking branch 'origin/main' into kw-expo-doctor

Krystof Woldrich · Krystof Woldrich · commit 652a104019eb · 2025-03-27T12:33:49.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,11 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
-## Unreleased
+## 6.11.0-beta.0
 
 ### Features
 
-- Improve Warm App Start reporting on Android ([#4641](https://github.com/getsentry/sentry-react-native/pull/4641))
+- Improve Warm App Start reporting on Android ([#4641](https://github.com/getsentry/sentry-react-native/pull/4641), [#4695](https://github.com/getsentry/sentry-react-native/pull/4695))
 - Add `createTimeToInitialDisplay({useFocusEffect})` and `createTimeToFullDisplay({useFocusEffect})` to allow record full display on screen focus ([#4665](https://github.com/getsentry/sentry-react-native/pull/4665))
 - Add support for measuring Time to Initial Display for already seen routes ([#4661](https://github.com/getsentry/sentry-react-native/pull/4661))
   - Introduce `enableTimeToInitialDisplayForPreloadedRoutes` option to the React Navigation integration.
@@ -33,6 +33,7 @@
 ### Fixes
 
 - Equalize TTID and TTFD duration when TTFD manual API is called and resolved before auto TTID ([#4680](https://github.com/getsentry/sentry-react-native/pull/4680))
+- Avoid loading Sentry native components in Expo Go ([#4696](https://github.com/getsentry/sentry-react-native/pull/4696))
 
 ### Changes
 
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.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.54.0",
-    "@sentry/react-native": "6.10.0",
+    "@sentry/react-native": "6.11.0-beta.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",
diff --git a/dev-packages/type-check/package.json b/dev-packages/type-check/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "6.10.0",
+  "version": "6.11.0-beta.0",
   "scripts": {
     "type-check": "./run-type-check.sh"
   }
diff --git a/dev-packages/utils/package.json b/dev-packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-samples-utils",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.0",
   "description": "Internal Samples Utils",
   "main": "index.js",
   "license": "MIT",
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.0",
   "packages": [
     "packages/*",
     "dev-packages/*",
diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java
@@ -2,7 +2,7 @@
 
 class RNSentryVersion {
   static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native";
-  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.10.0";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.11.0-beta.0";
   static final String NATIVE_SDK_NAME = "sentry.native.android.react-native";
   static final String ANDROID_SDK_NAME = "sentry.java.android.react-native";
   static final String REACT_NATIVE_SDK_NAME = "sentry.javascript.react-native";
diff --git a/packages/core/ios/RNSentryVersion.m b/packages/core/ios/RNSentryVersion.m
@@ -3,4 +3,4 @@
 NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
 NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native";
 NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
-NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.10.0";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.11.0-beta.0";
diff --git a/packages/core/package.json b/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.10.0",
+  "version": "6.11.0-beta.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
diff --git a/packages/core/src/js/integrations/appRegistry.ts b/packages/core/src/js/integrations/appRegistry.ts
@@ -1,6 +1,7 @@
 import type { Client, Integration } from '@sentry/core';
 import { getClient, logger } from '@sentry/core';
 
+import { isWeb } from '../utils/environment';
 import { fillTyped } from '../utils/fill';
 import { ReactNativeLibraries } from '../utils/rnlibraries';
 
@@ -14,6 +15,10 @@ export const appRegistryIntegration = (): Integration & {
   return {
     name: INTEGRATION_NAME,
     setupOnce: () => {
+      if (isWeb()) {
+        return;
+      }
+
       patchAppRegistryRunApplication(callbacks);
     },
     onRunApplication: (callback: () => void) => {
@@ -28,6 +33,9 @@ export const appRegistryIntegration = (): Integration & {
 
 export const patchAppRegistryRunApplication = (callbacks: (() => void)[]): void => {
   const { AppRegistry } = ReactNativeLibraries;
+  if (!AppRegistry) {
+    return;
+  }
 
   fillTyped(AppRegistry, 'runApplication', originalRunApplication => {
     return (...args) => {
diff --git a/packages/core/src/js/replay/CustomMask.tsx b/packages/core/src/js/replay/CustomMask.tsx
@@ -3,6 +3,8 @@ import * as React from 'react';
 import type { HostComponent, ViewProps } from 'react-native';
 import { UIManager, View } from 'react-native';
 
+import { isExpoGo } from '../utils/environment';
+
 const NativeComponentRegistry: {
   get<T, C extends Record<string, unknown>>(componentName: string, createViewConfig: () => C): HostComponent<T>;
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -35,7 +37,7 @@ const UnmaskFallback = (viewProps: ViewProps): React.ReactElement => {
 const hasViewManagerConfig = (nativeComponentName: string): boolean => UIManager.hasViewManagerConfig && UIManager.hasViewManagerConfig(nativeComponentName);
 
 const Mask = ((): HostComponent<ViewProps> | React.ComponentType<ViewProps> => {
-  if (!hasViewManagerConfig(MaskNativeComponentName)) {
+  if (isExpoGo() || !hasViewManagerConfig(MaskNativeComponentName)) {
     logger.warn(`[SentrySessionReplay] Can't load ${MaskNativeComponentName}.`);
     return MaskFallback;
   }
@@ -48,7 +50,7 @@ const Mask = ((): HostComponent<ViewProps> | React.ComponentType<ViewProps> => {
 })()
 
 const Unmask = ((): HostComponent<ViewProps> | React.ComponentType<ViewProps> => {
-  if (!hasViewManagerConfig(UnmaskNativeComponentName)) {
+  if (isExpoGo() || !hasViewManagerConfig(UnmaskNativeComponentName)) {
     logger.warn(`[SentrySessionReplay] Can't load ${UnmaskNativeComponentName}.`);
     return UnmaskFallback;
   }
diff --git a/packages/core/src/js/tracing/timetodisplaynative.tsx b/packages/core/src/js/tracing/timetodisplaynative.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import type { HostComponent } from 'react-native';
 import { UIManager, View } from 'react-native';
 
+import { isExpoGo } from '../utils/environment';
 import { ReactNativeLibraries } from '../utils/rnlibraries';
 import type { RNSentryOnDrawReporterProps } from './timetodisplaynative.types';
 
@@ -29,7 +30,7 @@ let RNSentryOnDrawReporter: HostComponent<RNSentryOnDrawReporterProps> | typeof
  */
 export const getRNSentryOnDrawReporter = (): typeof RNSentryOnDrawReporter => {
   if (!RNSentryOnDrawReporter) {
-    RNSentryOnDrawReporter = nativeComponentExists && ReactNativeLibraries.ReactNative?.requireNativeComponent
+    RNSentryOnDrawReporter = !isExpoGo() && nativeComponentExists && ReactNativeLibraries.ReactNative?.requireNativeComponent
       ? ReactNativeLibraries.ReactNative.requireNativeComponent(RNSentryOnDrawReporterClass)
       : RNSentryOnDrawReporterNoop;
   }
diff --git a/packages/core/src/js/utils/rnlibraries.ts b/packages/core/src/js/utils/rnlibraries.ts
@@ -1,11 +1,10 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-
 import { AppRegistry, Platform, TurboModuleRegistry } from 'react-native';
 
 import type * as ReactNative from '../vendor/react-native';
 import type { ReactNativeLibrariesInterface } from './rnlibrariesinterface';
 
-export const ReactNativeLibraries: Required<ReactNativeLibrariesInterface> = {
+const InternalReactNativeLibrariesInterface: Required<ReactNativeLibrariesInterface> = {
   Devtools: {
     parseErrorStack: (errorStack: string): Array<ReactNative.StackFrame> => {
       const parseErrorStack = require('react-native/Libraries/Core/Devtools/parseErrorStack');
@@ -42,3 +41,5 @@ export const ReactNativeLibraries: Required<ReactNativeLibrariesInterface> = {
     },
   },
 };
+
+export const ReactNativeLibraries: ReactNativeLibrariesInterface = InternalReactNativeLibrariesInterface;
diff --git a/packages/core/src/js/version.ts b/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.10.0';
+export const SDK_VERSION = '6.11.0-beta.0';
diff --git a/packages/core/test/integrations/appRegistry.test.ts b/packages/core/test/integrations/appRegistry.test.ts
@@ -1,18 +1,22 @@
 import { getOriginalFunction } from '@sentry/core';
 
 import { appRegistryIntegration } from '../../src/js/integrations/appRegistry';
+import * as Environment from '../../src/js/utils/environment';
 import { ReactNativeLibraries } from '../../src/js/utils/rnlibraries';
 
+const originalAppRegistry = ReactNativeLibraries.AppRegistry;
 const originalRunApplication = ReactNativeLibraries.AppRegistry.runApplication;
 
 describe('AppRegistry Integration', () => {
   let mockedRunApplication: jest.SpyInstance;
 
   beforeEach(() => {
+    jest.clearAllMocks();
     mockedRunApplication = jest.spyOn(ReactNativeLibraries.AppRegistry, 'runApplication').mockImplementation(jest.fn());
   });
 
   afterEach(() => {
+    ReactNativeLibraries.AppRegistry = originalAppRegistry;
     ReactNativeLibraries.AppRegistry.runApplication = originalRunApplication;
   });
 
@@ -57,4 +61,20 @@ describe('AppRegistry Integration', () => {
 
     expect(mockedCallback).toHaveBeenCalledTimes(1);
   });
+
+  it('does not patch app registry on web', async () => {
+    jest.spyOn(Environment, 'isWeb').mockReturnValue(true);
+    const integration = appRegistryIntegration();
+
+    integration.setupOnce();
+
+    expect(ReactNativeLibraries.AppRegistry.runApplication).toBe(mockedRunApplication);
+  });
+
+  it('does not crash if AppRegistry is not available', async () => {
+    ReactNativeLibraries.AppRegistry = undefined;
+    const integration = appRegistryIntegration();
+
+    integration.setupOnce();
+  });
 });
diff --git a/packages/core/test/replay/CustomMask.test.ts b/packages/core/test/replay/CustomMask.test.ts
@@ -2,9 +2,23 @@ import { beforeEach, describe, expect, it } from '@jest/globals';
 
 describe('CustomMask', () => {
   beforeEach(() => {
+    jest.mock('../../src/js/utils/environment', () => ({
+      isExpoGo: () => false,
+    }));
     jest.resetModules();
   });
 
+  it('returns a fallback when isExpoGo is true', () => {
+    jest.mock('../../src/js/utils/environment', () => ({
+      isExpoGo: () => true,
+    }));
+
+    const { Mask, Unmask, MaskFallback, UnmaskFallback } = require('../../src/js/replay/CustomMask');
+
+    expect(Mask).toBe(MaskFallback);
+    expect(Unmask).toBe(UnmaskFallback);
+  });
+
   it('returns a fallback when native view manager is missing', () => {
     jest.mock('react-native', () => ({
       UIManager: {},
diff --git a/packages/core/test/tracing/timetodisplaynative.test.tsx b/packages/core/test/tracing/timetodisplaynative.test.tsx
@@ -0,0 +1,15 @@
+import { getRNSentryOnDrawReporter } from '../../src/js/tracing/timetodisplaynative';
+import * as Environment from '../../src/js/utils/environment';
+
+describe('timetodisplaynative', () => {
+  beforeEach(() => {
+    jest.spyOn(Environment, 'isExpoGo').mockReturnValue(false);
+  });
+
+  test('getRNSentryOnDrawReporter returns Noop in Expo Go', () => {
+    jest.spyOn(Environment, 'isExpoGo').mockReturnValue(true);
+    const drawReported = getRNSentryOnDrawReporter();
+
+    expect(drawReported.name).toBe('RNSentryOnDrawReporterNoop');
+  });
+});
diff --git a/performance-tests/TestAppPlain/package.json b/performance-tests/TestAppPlain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppPlain",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/performance-tests/TestAppSentry/package.json b/performance-tests/TestAppSentry/package.json
@@ -1,14 +1,14 @@
 {
   "name": "TestAppSentry",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "start": "react-native start"
   },
   "dependencies": {
-    "@sentry/react-native": "6.10.0",
+    "@sentry/react-native": "6.11.0-beta.0",
     "react": "18.1.0",
     "react-native": "0.70.15"
   },
diff --git a/samples/expo/app.json b/samples/expo/app.json
@@ -5,7 +5,7 @@
     "jsEngine": "hermes",
     "newArchEnabled": true,
     "scheme": "sentry-expo-sample",
-    "version": "6.10.0",
+    "version": "6.11.0-beta.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -20,15 +20,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "41"
+      "buildNumber": "42"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 41
+      "versionCode": 42
     },
     "web": {
       "bundler": "metro",
diff --git a/samples/expo/package.json b/samples/expo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-expo-sample",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.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.10.0",
+    "@sentry/react-native": "6.11.0-beta.0",
     "@types/react": "~18.3.12",
     "expo": "~52.0.41",
     "expo-constants": "~17.0.8",
diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-macos-sample",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.0",
   "private": true,
   "scripts": {
     "start": "react-native start --experimental-debugger",
@@ -18,7 +18,7 @@
     "@react-navigation/stack": "^6.3.20",
     "@sentry/core": "8.54.0",
     "@sentry/react": "8.54.0",
-    "@sentry/react-native": "6.10.0",
+    "@sentry/react-native": "6.11.0-beta.0",
     "delay": "^6.0.0",
     "react": "18.2.0",
     "react-native": "0.73.9",
diff --git a/samples/react-native/android/app/build.gradle b/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 43
-        versionName "6.10.0"
+        versionCode 44
+        versionName "6.11.0-beta.0"
     }
 
     signingConfigs {
diff --git a/samples/react-native/ios/sentryreactnativesample/Info.plist b/samples/react-native/ios/sentryreactnativesample/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.10.0</string>
+	<string>6.11.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>48</string>
+	<string>49</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>
diff --git a/samples/react-native/ios/sentryreactnativesampleTests/Info.plist b/samples/react-native/ios/sentryreactnativesampleTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.10.0</string>
+	<string>6.11.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>48</string>
+	<string>49</string>
 </dict>
 </plist>
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sentry-react-native-type-check",`
`3`	`3`	`"private": true,`
`4`		`- "version": "6.10.0",`
	`4`	`+ "version": "6.11.0-beta.0",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"type-check": "./run-type-check.sh"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sentry-react-native-samples-utils",`
`3`		`- "version": "6.10.0",`
	`3`	`+ "version": "6.11.0-beta.0",`
`4`	`4`	`"description": "Internal Samples Utils",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`3`		`- "version": "6.10.0",`
	`3`	`+ "version": "6.11.0-beta.0",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*",`
`6`	`6`	`"dev-packages/*",`