Merge branch 'main' into idan/load-envs-fix

Author: antonis

CHANGELOG.md

@@ -16,6 +16,13 @@
 ### Fixes
 
 - Vendor `metro/countLines` function to avoid issues with the private import ([#5185](https://github.com/getsentry/sentry-react-native/pull/5185))
+- Fix baseJSBundle and bundleToString TypeErrors with Metro 0.83.2 ([#5206](https://github.com/getsentry/sentry-react-native/pull/5206))
+
+### Dependencies
+
+- Bump Cocoa SDK from v8.56.0 to v8.56.1 ([#5197](https://github.com/getsentry/sentry-react-native/pull/5197))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8561)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.56.0...8.56.1)
 
 ## 7.1.0
 

packages/core/RNSentry.podspec

@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.56.0'
+  s.dependency 'Sentry/HybridSDK', '8.56.1'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)

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

@@ -31,13 +31,19 @@ import type * as sourceMapStringType from 'metro/private/DeltaBundler/Serializer
 import type * as bundleToStringType from 'metro/private/lib/bundleToString';
 import type { MetroSerializer } from '../../utils';
 
-let baseJSBundle: typeof baseJSBundleType;
+let baseJSBundleModule: any;
 try {
-  baseJSBundle = require('metro/private/DeltaBundler/Serializers/baseJSBundle');
-} catch (e) {
-  baseJSBundle = require('metro/src/DeltaBundler/Serializers/baseJSBundle');
+  baseJSBundleModule = require('metro/private/DeltaBundler/Serializers/baseJSBundle');
+} catch {
+  baseJSBundleModule = require('metro/src/DeltaBundler/Serializers/baseJSBundle');
 }
 
+const baseJSBundle: typeof baseJSBundleType =
+  typeof baseJSBundleModule === 'function'
+    ? baseJSBundleModule
+    : // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      baseJSBundleModule?.baseJSBundle ?? baseJSBundleModule?.default;
+
 let sourceMapString: typeof sourceMapStringType;
 try {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -52,13 +58,19 @@ try {
   }
 }
 
-let bundleToString: typeof bundleToStringType;
+let bundleToStringModule: any;
 try {
-  bundleToString = require('metro/private/lib/bundleToString');
-} catch (e) {
-  bundleToString = require('metro/src/lib/bundleToString');
+  bundleToStringModule = require('metro/private/lib/bundleToString');
+} catch {
+  bundleToStringModule = require('metro/src/lib/bundleToString');
 }
 
+const bundleToString: typeof bundleToStringType =
+  typeof bundleToStringModule === 'function'
+    ? bundleToStringModule
+    : // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      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;