@sentry/react-native 5.0.0-alpha.7 → 5.0.0-alpha.9

package/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": "5.0.0-alpha.7",
+  "version": "5.0.0-alpha.9",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -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,32 +42,32 @@
     "react-native": ">=0.70.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.16.0",
+    "@sentry/browser": "7.21.1",
     "@sentry/cli": "2.7.0",
-    "@sentry/core": "7.16.0",
-    "@sentry/hub": "7.16.0",
-    "@sentry/integrations": "7.16.0",
-    "@sentry/react": "7.16.0",
-    "@sentry/tracing": "7.16.0",
-    "@sentry/types": "7.16.0",
-    "@sentry/utils": "7.16.0"
+    "@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.16.0",
-    "@sentry-internal/eslint-plugin-sdk": "7.16.0",
+    "@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",
-    "@types/react": "^18",
-    "@types/react-native": "^0.70.0",
+    "@types/react": "^18.0.25",
+    "@types/react-native": "^0.70.6",
     "babel-jest": "^26.1.0",
     "eslint": "^7.6.0",
     "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-react-native": "^3.8.1",
     "jest": "^24.9.0",
     "prettier": "^2.0.5",
-    "react": "^18",
-    "react-native": "^0.70.0",
+    "react": "^18.2.0",
+    "react-native": "^0.70.5",
     "replace-in-file": "^6.0.0",
     "rimraf": "^3.0.0",
     "ts-jest": "^24.3.0",

package/scripts/collect-modules.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Print commands before executing them (useful for troubleshooting)
+set -x
+
+if [[ "$CONFIGURATION" = *Debug* ]]; then
+  echo "Debug build. Modules are not collected."
+  exit 0
+fi
+
+if [[ -z "$CONFIGURATION_BUILD_DIR" ]]; then
+  echo "Missing env CONFIGURATION_BUILD_DIR" 1>&2
+  exit 1
+fi
+
+if [[ -z "$UNLOCALIZED_RESOURCES_FOLDER_PATH" ]]; then
+  echo "Missing env UNLOCALIZED_RESOURCES_FOLDER_PATH" 1>&2
+  exit 1
+fi
+
+if [[ -z "$DERIVED_FILE_DIR" ]]; then
+  echo "Missing env DERIVED_FILE_DIR" 1>&2
+  exit 1
+fi
+
+nodePath="node"
+thisFilePath=$(dirname $0)
+collectModulesScript="$thisFilePath/../dist/js/tools/collectModules.js"
+
+destination="$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH"
+modulesOutput="$destination/modules.json"
+if [[ -z "$SOURCE_MAP_PATH" ]]; then
+  sourceMap="$DERIVED_FILE_DIR/main.jsbundle.map"
+else
+  sourceMap="$SOURCE_MAP_PATH"
+fi
+if [[ -z "$MODULES_PATHS" ]]; then
+  modulesPaths="$PWD/../node_modules"
+else
+  modulesPaths="$MODULES_PATHS"
+fi
+
+$nodePath $collectModulesScript $sourceMap $modulesOutput $modulesPaths

package/sentry.gradle

@@ -41,6 +41,8 @@ gradle.projectsEvaluated {
         def bundleOutput
         def props = bundleTask.getProperties()
         def reactRoot = props.get("workingDir")
+        def modulesOutput = "$reactRoot/android/app/src/main/assets/modules.json"
+        def modulesTask = null
 
         (shouldCleanUp, bundleOutput, sourcemapOutput) = forceSourceMapOutputFromBundleTask(bundleTask)
 
@@ -60,6 +62,7 @@ gradle.projectsEvaluated {
         def previousCliTask = null
 
         def nameCleanup = "${bundleTask.name}_SentryUploadCleanUp"
+        def nameModulesCleanup = "${bundleTask.name}_SentryCollectModulesCleanUp"
         // Upload the source map several times if necessary: once for each release and versionCode.
         currentVariants.each { key, currentVariant ->
           variant = currentVariant[0]
@@ -79,6 +82,7 @@ gradle.projectsEvaluated {
           // below) and distribution identifier (`--dist` below).  Give the task a unique name
           // based on where we're uploading to.
           def nameCliTask = "${bundleTask.name}_SentryUpload_${releaseName}_${versionCode}"
+          def nameModulesTask = "${bundleTask.name}_SentryCollectModules_${releaseName}_${versionCode}"
 
           // If several outputs have the same releaseName and versionCode, we'd do the exact same
           // upload for each of them.  No need to repeat.
@@ -153,6 +157,34 @@ gradle.projectsEvaluated {
               enabled true
           }
 
+          modulesTask = tasks.create(nameModulesTask, Exec) {
+              description = "collect javascript modules from bundle source map"
+              group = 'sentry.io'
+
+              workingDir reactRoot
+
+              def collectModulesScript = config.collectModulesScript
+                  ? file(config.collectModulesScript).getAbsolutePath()
+                  : "$reactRoot/node_modules/@sentry/react-native/dist/js/tools/collectModules.js"
+              def modulesPaths = config.modulesPaths
+                  ? config.modulesPaths.join(',')
+                  : "$reactRoot/node_modules"
+              def args = ["node",
+                          collectModulesScript,
+                          sourcemapOutput,
+                          modulesOutput,
+                          modulesPaths
+              ]
+
+              project.logger.info("Sentry-CollectModules arguments: ${args}")
+              commandLine(*args)
+
+              def skip = config.skipCollectModules
+                  ? config.skipCollectModules == true
+                  : false
+              enabled !skip
+          }
+
           // chain the upload tasks so they run sequentially in order to run
           // the cliCleanUpTask after the final upload task is run
           if (previousCliTask != null) {
@@ -161,6 +193,20 @@ gradle.projectsEvaluated {
             bundleTask.finalizedBy cliTask
           }
           previousCliTask = cliTask
+          cliTask.finalizedBy modulesTask
+
+          def modulesCleanUpTask = tasks.create(name: nameModulesCleanup, type: Delete) {
+              description = "clean up collected modules generated file"
+              group = 'sentry.io'
+
+              delete modulesOutput
+          }
+
+          def packageTasks = tasks.findAll { task -> "package${variant}".equalsIgnoreCase(task.name) && task.enabled }
+          packageTasks.each { packageTask ->
+              packageTask.dependsOn modulesTask
+              packageTask.finalizedBy modulesCleanUpTask
+          }
         }
 
         /** Delete sourcemap files */
@@ -169,7 +215,8 @@ gradle.projectsEvaluated {
             group = 'sentry.io'
 
             delete sourcemapOutput
-            delete "$buildDir/intermediates/assets/release/index.android.bundle.map" // react native default bundle dir
+            delete "$buildDir/intermediates/assets/release/index.android.bundle.map"
+            // react native default bundle dir
         }
 
         // register clean task extension

package/src/js/NativeRNSentry.ts

@@ -0,0 +1,59 @@
+import { Package } from '@sentry/types';
+import { TurboModule, TurboModuleRegistry } from 'react-native';
+import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
+
+// There has to be only one interface and it has to be named `Spec`
+// Only extra allowed definitions are types (probably codegen bug)
+export interface Spec extends TurboModule {
+  addBreadcrumb(breadcrumb: UnsafeObject): void;
+  captureEnvelope(
+    bytes: number[],
+    options: {
+      store: boolean,
+    },
+  ): Promise<boolean>;
+  clearBreadcrumbs(): void;
+  crash(): void;
+  closeNativeSdk(): Promise<void>;
+  disableNativeFramesTracking(): void;
+  fetchNativeRelease(): Promise<NativeReleaseResponse>;
+  fetchNativeSdkInfo(): Promise<Package>;
+  fetchNativeDeviceContexts(): Promise<NativeDeviceContextsResponse>;
+  fetchNativeAppStart(): Promise<NativeAppStartResponse | null>;
+  fetchNativeFrames(): Promise<NativeFramesResponse | null>;
+  initNativeSdk(options: UnsafeObject): Promise<boolean>;
+  setUser(
+    defaultUserKeys: UnsafeObject | null,
+    otherUserKeys: UnsafeObject | null
+  ): void;
+  setContext(key: string, value: UnsafeObject | null): void;
+  setExtra(key: string, value: string): void;
+  setTag(key: string, value: string): void;
+  enableNativeFramesTracking(): void;
+  fetchModules(): Promise<string | undefined | null>;
+}
+
+export type NativeAppStartResponse = {
+  isColdStart: boolean;
+  appStartTime: number;
+  didFetchAppStart: boolean;
+};
+
+export type NativeFramesResponse = {
+  totalFrames: number;
+  slowFrames: number;
+  frozenFrames: number;
+};
+
+export type NativeReleaseResponse = {
+  build: string;
+  id: string;
+  version: string;
+};
+
+export type NativeDeviceContextsResponse = {
+  [key: string]: Record<string, unknown>;
+};
+
+// The export must be here to pass codegen even if not used
+export default TurboModuleRegistry.getEnforcing<Spec>('RNSentry');