Merge branch 'main' (4.10.0-candidate) into 5.0.0

Author: krystofwoldrich

.npmignore

@@ -11,3 +11,4 @@
 !/ios/**/*
 !/android/**/*
 !src/js/NativeRNSentry.ts
+!scripts/collect-modules.sh

CHANGELOG.md

@@ -6,6 +6,17 @@
 
 - Add missing source Spec for RNSentry Codegen. ([#2639](https://github.com/getsentry/sentry-react-native/pull/2639))
 
+### Features
+
+- JS Runtime dependencies are sent in Events ([#2606](https://github.com/getsentry/sentry-react-native/pull/2606))
+  - To collect JS dependencies on iOS add `../node_modules/@sentry/react-native/scripts/collect-modules.sh` at the end of the `Bundle React Native code and images` build phase. The collection only works on Release builds. Android builds have a new step in `sentry.gradle` plugin. More in [the migration documentation](https://docs.sentry.io/platforms/react-native/migration#from-48x-to-49x).
+
+### Dependencies
+
+- Bump JavaScript SDK from v7.20.1 to v7.21.1 ([#2636](https://github.com/getsentry/sentry-react-native/pull/2636))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7211)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.20.1...7.21.1)
+
 ## 5.0.0-alpha.8
 
 - Latest changes from 4.9.0

android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
 import android.util.SparseIntArray;
 
 import androidx.annotation.Nullable;
@@ -17,8 +18,12 @@
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableMap;
 
+import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -48,6 +53,8 @@ public class RNSentryModuleImpl {
     public static final String NAME = "RNSentry";
 
     private static final Logger logger = Logger.getLogger("react-native-sentry");
+    private static final String modulesPath = "modules.json";
+    private static final Charset UTF_8 = Charset.forName("UTF-8");
 
     private final ReactApplicationContext reactApplicationContext;
     private final PackageInfo packageInfo;
@@ -173,6 +180,24 @@ public void crash() {
         throw new RuntimeException("TEST - Sentry Client Crash (only works in release mode)");
     }
 
+    public void fetchModules(Promise promise) {
+        final AssetManager assets = this.getReactApplicationContext().getResources().getAssets();
+        try (final InputStream stream =
+                     new BufferedInputStream(assets.open(RNSentryModuleImpl.modulesPath))) {
+            int size = stream.available();
+            byte[] buffer = new byte[size];
+            stream.read(buffer);
+            stream.close();
+            String modulesJson = new String(buffer, RNSentryModuleImpl.UTF_8);
+            promise.resolve(modulesJson);
+        } catch (FileNotFoundException e) {
+            promise.resolve(null);
+        } catch (Throwable e) {
+            logger.warning("Fetching JS Modules failed.");
+            promise.resolve(null);
+        }
+    }
+
     public void fetchNativeRelease(Promise promise) {
         WritableMap release = Arguments.createMap();
         release.putString("id", packageInfo.packageName);

android/src/newarch/java/io/sentry/react/RNSentryModule.java

@@ -32,6 +32,11 @@ public void crash() {
         this.impl.crash();
     }
 
+    @Override
+    public void fetchModules(Promise promise) {
+        this.impl.fetchModules(promise);
+    }
+
     @Override
     public void fetchNativeRelease(Promise promise) {
         this.impl.fetchNativeRelease(promise);

android/src/oldarch/java/io/sentry/react/RNSentryModule.java

@@ -32,6 +32,11 @@ public void crash() {
         this.impl.crash();
     }
 
+    @ReactMethod
+    public void fetchModules(Promise promise) {
+        this.impl.fetchModules(promise);
+    }
+
     @ReactMethod
     public void fetchNativeRelease(Promise promise) {
         this.impl.fetchNativeRelease(promise);

ios/RNSentry.mm

@@ -161,6 +161,16 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
             });
 }
 
+RCT_EXPORT_METHOD(fetchModules:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSString *filePath = [[NSBundle mainBundle] pathForResource:@"modules" ofType:@"json"];
+    NSString* modulesString = [NSString stringWithContentsOfFile:filePath
+                                                  encoding:NSUTF8StringEncoding
+                                                     error:nil];
+    resolve(modulesString);
+}
+
 RCT_EXPORT_METHOD(fetchNativeDeviceContexts:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {

package.json

@@ -11,8 +11,10 @@
   },
   "main": "dist/js/index.js",
   "scripts": {
-    "build": "tsc -p tsconfig.build.json",
-    "build:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build": "yarn build:sdk && yarn build:tools",
+    "build:sdk": "tsc -p tsconfig.build.json",
+    "build:sdk:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
+    "build:tools": "tsc -p tsconfig.build.tools.json",
     "clean": "rimraf dist coverage",
     "test": "jest",
     "lint": "eslint .",
@@ -40,19 +42,19 @@
     "react-native": ">=0.70.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.20.1",
+    "@sentry/browser": "7.21.1",
     "@sentry/cli": "2.7.0",
-    "@sentry/core": "7.20.1",
-    "@sentry/hub": "7.20.1",
-    "@sentry/integrations": "7.20.1",
-    "@sentry/react": "7.20.1",
-    "@sentry/tracing": "7.20.1",
-    "@sentry/types": "7.20.1",
-    "@sentry/utils": "7.20.1"
+    "@sentry/core": "7.21.1",
+    "@sentry/hub": "7.21.1",
+    "@sentry/integrations": "7.21.1",
+    "@sentry/react": "7.21.1",
+    "@sentry/tracing": "7.21.1",
+    "@sentry/types": "7.21.1",
+    "@sentry/utils": "7.21.1"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.20.1",
-    "@sentry-internal/eslint-plugin-sdk": "7.20.1",
+    "@sentry-internal/eslint-config-sdk": "7.21.1",
+    "@sentry-internal/eslint-plugin-sdk": "7.21.1",
     "@sentry/typescript": "^5.20.1",
     "@sentry/wizard": "2.2.0",
     "@types/jest": "^26.0.15",

sample-new-architecture/android/app/build.gradle

@@ -82,6 +82,15 @@ project.ext.react = [
     enableHermes: true,  // clean and rebuild if changing
 ]
 
+project.ext.sentryCli = [
+    collectModulesScript: "../../../dist/js/tools/collectModules.js",
+    modulesPaths: [
+      "node_modules",
+      "../..",
+    ],
+    skipCollectModules: false,
+]
+
 apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../../sentry.gradle"
 

sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj

@@ -265,7 +265,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export SENTRY_PROPERTIES=sentry.properties\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $DERIVED_FILE_DIR/main.jsbundle.map\"\nset -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT \\\"../../node_modules/@sentry/cli/bin/sentry-cli react-native xcode $REACT_NATIVE_XCODE\\\"\"\n";
+			shellScript = "export SENTRY_PROPERTIES=sentry.properties\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $DERIVED_FILE_DIR/main.jsbundle.map\"\nset -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT \\\"../../node_modules/@sentry/cli/bin/sentry-cli react-native xcode $REACT_NATIVE_XCODE\\\"\"\n\nexport MODULES_PATHS=\"$PWD/../node_modules,$PWD/../../..\"\n/bin/sh ../../scripts/collect-modules.sh\n";
 		};
 		00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;

sample/android/app/build.gradle

@@ -81,6 +81,15 @@ project.ext.react = [
     enableHermes: true,  // clean and rebuild if changing
 ]
 
+project.ext.sentryCli = [
+    collectModulesScript: "../../../dist/js/tools/collectModules.js",
+    modulesPaths: [
+      "node_modules",
+      "../..",
+    ],
+    skipCollectModules: false,
+]
+
 apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../../sentry.gradle"