Merge branch 'main' into fix/profile-app-start-timestamp-offset

Author: antonis

CHANGELOG.md

@@ -11,10 +11,16 @@
 ### Fixes
 
 - Fix app start transaction profile offset by using the actual profiling start timestamp instead of the adjusted app start time ([#5962](https://github.com/getsentry/sentry-react-native/issues/5962))
+- Add `SENTRY_PROJECT_ROOT` env var to override project root in Xcode build phase scripts for monorepo setups ([#5961](https://github.com/getsentry/sentry-react-native/pull/5961))
 
 ### Features
 
 - Enable "Open Sentry" button in Playground for Expo apps ([#5947](https://github.com/getsentry/sentry-react-native/pull/5947))
+- Add `attachAllThreads` option to attach full stack traces for all threads to captured events on iOS ([#5960](https://github.com/getsentry/sentry-react-native/issues/5960))
+
+### Fixes
+
+- Lazy-load Metro internal modules to prevent Expo 55 import errors ([#5958](https://github.com/getsentry/sentry-react-native/pull/5958))
 
 ### Dependencies
 

packages/core/scripts/sentry-xcode-debug-files.sh

@@ -21,7 +21,10 @@ set -e
 LOCAL_NODE_BINARY=${NODE_BINARY:-node}
 
 # The project root by default is one level up from the ios directory
-RN_PROJECT_ROOT="${PROJECT_DIR}/.."
+# SENTRY_PROJECT_ROOT can be set to override this for monorepo setups
+# where the ios directory is not directly under the project root.
+# See: https://github.com/getsentry/sentry-react-native/issues/2880
+RN_PROJECT_ROOT="${SENTRY_PROJECT_ROOT:-${PROJECT_DIR}/..}"
 
 [ -z "$SENTRY_PROPERTIES" ] && export SENTRY_PROPERTIES=sentry.properties
 [ -z "$SENTRY_DOTENV_PATH" ] && [ -f "$RN_PROJECT_ROOT/.env.sentry-build-plugin" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin"

packages/core/scripts/sentry-xcode.sh

@@ -10,7 +10,10 @@ set -x -e
 LOCAL_NODE_BINARY=${NODE_BINARY:-node}
 
 # The project root by default is one level up from the ios directory
-RN_PROJECT_ROOT="${PROJECT_DIR}/.."
+# SENTRY_PROJECT_ROOT can be set to override this for monorepo setups
+# where the ios directory is not directly under the project root.
+# See: https://github.com/getsentry/sentry-react-native/issues/2880
+RN_PROJECT_ROOT="${SENTRY_PROJECT_ROOT:-${PROJECT_DIR}/..}"
 
 [ -z "$SENTRY_PROPERTIES" ] && export SENTRY_PROPERTIES=sentry.properties
 [ -z "$SENTRY_DOTENV_PATH" ] && [ -f "$RN_PROJECT_ROOT/.env.sentry-build-plugin" ] && export SENTRY_DOTENV_PATH="$RN_PROJECT_ROOT/.env.sentry-build-plugin"

packages/core/src/js/options.ts

@@ -96,6 +96,14 @@ export interface BaseReactNativeOptions {
    */
   attachThreads?: boolean;
 
+  /**
+   * When enabled, full stack traces for all threads are attached to all captured events.
+   *
+   * @default false
+   * @platform ios
+   */
+  attachAllThreads?: boolean;
+
   /**
    *  When enabled, certain personally identifiable information (PII) is added by active integrations.
    *

packages/core/src/js/tools/vendor/metro/utils.ts

@@ -32,48 +32,9 @@ import type * as bundleToStringType from 'metro/private/lib/bundleToString';
 
 import type { MetroSerializer } from '../../utils';
 
-// oxlint-disable-next-line typescript-eslint(no-explicit-any)
-let baseJSBundleModule: any;
-try {
-  baseJSBundleModule = require('metro/private/DeltaBundler/Serializers/baseJSBundle');
-} catch {
-  baseJSBundleModule = require('metro/src/DeltaBundler/Serializers/baseJSBundle');
-}
-
-const baseJSBundle: typeof baseJSBundleType =
-  typeof baseJSBundleModule === 'function'
-    ? baseJSBundleModule
-    : (baseJSBundleModule?.baseJSBundle ?? baseJSBundleModule?.default);
-
-let sourceMapString: typeof sourceMapStringType;
-try {
-  const sourceMapStringModule = require('metro/private/DeltaBundler/Serializers/sourceMapString');
-  sourceMapString = (sourceMapStringModule as { sourceMapString: typeof sourceMapStringType }).sourceMapString;
-} catch (e) {
-  sourceMapString = require('metro/src/DeltaBundler/Serializers/sourceMapString');
-  if ('sourceMapString' in sourceMapString) {
-    // Changed to named export in https://github.com/facebook/metro/commit/34148e61200a508923315fbe387b26d1da27bf4b
-    // Metro 0.81.0 and 0.80.10 patch
-    sourceMapString = (sourceMapString as { sourceMapString: typeof sourceMapStringType }).sourceMapString;
-  }
-}
-
-// oxlint-disable-next-line typescript-eslint(no-explicit-any)
-let bundleToStringModule: any;
-try {
-  bundleToStringModule = require('metro/private/lib/bundleToString');
-} catch {
-  bundleToStringModule = require('metro/src/lib/bundleToString');
-}
-
-const bundleToString: typeof bundleToStringType =
-  typeof bundleToStringModule === 'function'
-    ? bundleToStringModule
-    : (bundleToStringModule?.bundleToString ?? bundleToStringModule?.default);
-
 type NewSourceMapStringExport = {
   // Since Metro v0.80.10 https://github.com/facebook/metro/compare/v0.80.9...v0.80.10#diff-1b836d1729e527a725305eef0cec22e44605af2700fa413f4c2489ea1a03aebcL28
-  sourceMapString: typeof sourceMapString;
+  sourceMapString: typeof sourceMapStringType;
 };
 
 /**
@@ -108,6 +69,49 @@ export const getSortedModules = (
  * https://github.com/facebook/metro/blob/9b85f83c9cc837d8cd897aa7723be7da5b296067/packages/metro/src/Server.js#L244-L277
  */
 export const createDefaultMetroSerializer = (): MetroSerializer => {
+  // Lazy-load Metro internals only when serializer is created
+  // This defers requiring Metro modules until they're actually needed (during build),
+  // avoiding import-time failures when Metro is only a transitive dependency
+
+  // oxlint-disable-next-line typescript-eslint(no-explicit-any)
+  let baseJSBundleModule: any;
+  try {
+    baseJSBundleModule = require('metro/private/DeltaBundler/Serializers/baseJSBundle');
+  } catch {
+    baseJSBundleModule = require('metro/src/DeltaBundler/Serializers/baseJSBundle');
+  }
+
+  const baseJSBundle: typeof baseJSBundleType =
+    typeof baseJSBundleModule === 'function'
+      ? baseJSBundleModule
+      : (baseJSBundleModule?.baseJSBundle ?? baseJSBundleModule?.default);
+
+  let sourceMapString: typeof sourceMapStringType;
+  try {
+    const sourceMapStringModule = require('metro/private/DeltaBundler/Serializers/sourceMapString');
+    sourceMapString = (sourceMapStringModule as { sourceMapString: typeof sourceMapStringType }).sourceMapString;
+  } catch (e) {
+    sourceMapString = require('metro/src/DeltaBundler/Serializers/sourceMapString');
+    if ('sourceMapString' in sourceMapString) {
+      // Changed to named export in https://github.com/facebook/metro/commit/34148e61200a508923315fbe387b26d1da27bf4b
+      // Metro 0.81.0 and 0.80.10 patch
+      sourceMapString = (sourceMapString as { sourceMapString: typeof sourceMapStringType }).sourceMapString;
+    }
+  }
+
+  // oxlint-disable-next-line typescript-eslint(no-explicit-any)
+  let bundleToStringModule: any;
+  try {
+    bundleToStringModule = require('metro/private/lib/bundleToString');
+  } catch {
+    bundleToStringModule = require('metro/src/lib/bundleToString');
+  }
+
+  const bundleToString: typeof bundleToStringType =
+    typeof bundleToStringModule === 'function'
+      ? bundleToStringModule
+      : (bundleToStringModule?.bundleToString ?? bundleToStringModule?.default);
+
   return (entryPoint, preModules, graph, options) => {
     // baseJSBundle assigns IDs to modules in a consistent order
     let bundle = baseJSBundle(entryPoint, preModules, graph, options);

packages/core/test/scripts/sentry-xcode-scripts.test.ts

@@ -455,6 +455,82 @@ describe('sentry-xcode.sh', () => {
     expect(result.stdout).toContain('skipping sourcemaps upload');
   });
 
+  describe('SENTRY_PROJECT_ROOT override', () => {
+    it('resolves SOURCEMAP_FILE relative to SENTRY_PROJECT_ROOT instead of PROJECT_DIR/..', () => {
+      const customRoot = path.join(tempDir, 'monorepo-package');
+      fs.mkdirSync(customRoot, { recursive: true });
+
+      const echoScript = path.join(tempDir, 'mock-sentry-cli-echo-sourcemap.js');
+      fs.writeFileSync(
+        echoScript,
+        `
+        const sourcemapFile = process.env.SOURCEMAP_FILE || 'not-set';
+        console.log('SOURCEMAP_FILE=' + sourcemapFile);
+        process.exit(0);
+        `,
+      );
+
+      const result = runScript({
+        SENTRY_PROJECT_ROOT: customRoot,
+        SENTRY_CLI_EXECUTABLE: echoScript,
+        SOURCEMAP_FILE: 'relative/path.map',
+      });
+
+      const expectedPath = path.join(customRoot, 'relative/path.map');
+      expect(result.exitCode).toBe(0);
+      expect(result.stdout).toContain(`SOURCEMAP_FILE=${expectedPath}`);
+    });
+
+    it('resolves SOURCEMAP_FILE relative to PROJECT_DIR/.. when SENTRY_PROJECT_ROOT is not set', () => {
+      const echoScript = path.join(tempDir, 'mock-sentry-cli-echo-sourcemap.js');
+      fs.writeFileSync(
+        echoScript,
+        `
+        const sourcemapFile = process.env.SOURCEMAP_FILE || 'not-set';
+        console.log('SOURCEMAP_FILE=' + sourcemapFile);
+        process.exit(0);
+        `,
+      );
+
+      const result = runScript({
+        SENTRY_CLI_EXECUTABLE: echoScript,
+        SOURCEMAP_FILE: 'relative/path.map',
+      });
+
+      // Without SENTRY_PROJECT_ROOT, falls back to PROJECT_DIR/..
+      const projectRoot = path.dirname(tempDir);
+      const expectedPath = path.join(projectRoot, 'relative/path.map');
+      expect(result.exitCode).toBe(0);
+      expect(result.stdout).toContain(`SOURCEMAP_FILE=${expectedPath}`);
+    });
+
+    it('finds sentry.options.json in SENTRY_PROJECT_ROOT', () => {
+      const customRoot = path.join(tempDir, 'monorepo-package');
+      fs.mkdirSync(customRoot, { recursive: true });
+
+      const optionsContent = JSON.stringify({ dsn: 'https://key@sentry.io/123' });
+      fs.writeFileSync(path.join(customRoot, 'sentry.options.json'), optionsContent);
+
+      const buildDir = path.join(tempDir, 'build');
+      const resourcesPath = 'Resources';
+      fs.mkdirSync(path.join(buildDir, resourcesPath), { recursive: true });
+
+      const result = runScript({
+        SENTRY_PROJECT_ROOT: customRoot,
+        SENTRY_DISABLE_AUTO_UPLOAD: 'true',
+        SENTRY_COPY_OPTIONS_FILE: 'true',
+        CONFIGURATION_BUILD_DIR: buildDir,
+        UNLOCALIZED_RESOURCES_FOLDER_PATH: resourcesPath,
+      });
+
+      expect(result.exitCode).toBe(0);
+      expect(result.stdout).toContain('Copied');
+      const destPath = path.join(buildDir, resourcesPath, 'sentry.options.json');
+      const copied = JSON.parse(fs.readFileSync(destPath, 'utf8'));
+      expect(copied.dsn).toBe('https://key@sentry.io/123');
+    });
+  });
+
   describe('sentry.options.json SENTRY_ENVIRONMENT override', () => {
     it('copies file without modification when SENTRY_ENVIRONMENT is not set', () => {
       const optionsContent = JSON.stringify({ dsn: 'https://key@sentry.io/123', environment: 'production' });

packages/core/test/tools/sentryMetroSerializer.test.ts

@@ -232,6 +232,32 @@ describe('Sentry Metro Serializer', () => {
       expect(debugId).toMatch(/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/);
     });
   });
+
+  test('createDefaultMetroSerializer can be created without Metro internals being loaded at import time', () => {
+    // This test verifies that the lazy-loading of Metro internals works correctly.
+    // The createDefaultMetroSerializer function should be callable without triggering
+    // module-level requires of Metro internals at import time.
+    // See: https://github.com/getsentry/sentry-react-native/issues/5957
+
+    // Import the function
+    const { createDefaultMetroSerializer: createSerializer } = require('../../src/js/tools/vendor/metro/utils');
+
+    // Create the serializer - this should succeed without loading Metro internals
+    const serializer = createSerializer();
+    expect(typeof serializer).toBe('function');
+
+    // Verify the serializer can be invoked with proper arguments and produces output
+    const [entryPoint, preModules, graph, options] = mockMinSerializerArgs();
+    const result = serializer(entryPoint, preModules, graph, options);
+
+    expect(result).toHaveProperty('code');
+    expect(result).toHaveProperty('map');
+    expect(typeof result.code).toBe('string');
+    expect(typeof result.map).toBe('string');
+    // Both code and map should exist (even if minimal for empty bundle)
+    expect(result.code).toBeDefined();
+    expect(result.map).toBeDefined();
+  });
 });
 
 function mockMinSerializerArgs(options?: {

packages/core/test/wrapper.test.ts

@@ -224,6 +224,23 @@ describe('Tests Native Wrapper', () => {
       expect(NATIVE.enableNative).toBe(true);
     });
 
+    test('passes attachAllThreads to native SDK', async () => {
+      await NATIVE.initNativeSdk({
+        dsn: 'test',
+        enableNative: true,
+        autoInitializeNativeSdk: true,
+        attachAllThreads: true,
+        devServerUrl: undefined,
+        defaultSidecarUrl: undefined,
+        mobileReplayOptions: undefined,
+      });
+
+      expect(RNSentry.initNativeSdk).toHaveBeenCalled();
+      // @ts-expect-error mock value
+      const initParameter = RNSentry.initNativeSdk.mock.calls[0][0];
+      expect(initParameter).toHaveProperty('attachAllThreads', true);
+    });
+
     test('filter integrations when initializing Native SDK', async () => {
       await NATIVE.initNativeSdk({
         dsn: 'test',