@sentry/react-native 5.0.0-alpha.1 → 5.0.0-alpha.10

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.1",
+  "version": "5.0.0-alpha.10",
   "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 .",
@@ -36,36 +38,36 @@
     "When bumping make sure to update the version of react, i.e:  https://github.com/facebook/react-native/blob/v0.56.0/package.json"
   ],
   "peerDependencies": {
-    "react": ">=16.4.1",
-    "react-native": ">=0.56.0"
+    "react": ">=17.0.0",
+    "react-native": ">=0.70.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.7.0",
-    "@sentry/cli": "1.74.4",
-    "@sentry/core": "7.7.0",
-    "@sentry/hub": "7.7.0",
-    "@sentry/integrations": "7.7.0",
-    "@sentry/react": "7.7.0",
-    "@sentry/tracing": "7.7.0",
-    "@sentry/types": "7.7.0",
-    "@sentry/utils": "7.7.0",
-    "@sentry/wizard": "2.0.0"
+    "@sentry/browser": "7.21.1",
+    "@sentry/cli": "2.10.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.7.0",
-    "@sentry-internal/eslint-plugin-sdk": "7.7.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": "^16.9.49",
-    "@types/react-native": "^0.66.11",
+    "@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": ">=16.4.1",
-    "react-native": ">=0.56.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",
@@ -82,10 +84,6 @@
   "jest": {
     "collectCoverage": true,
     "preset": "react-native",
-    "transform": {
-      "^.+\\.(tsx)$": "<rootDir>/node_modules/react-native/jest/preprocessor.js",
-      "^.+\\.(ts|tsx)$": "ts-jest"
-    },
     "globals": {
       "__DEV__": true,
       "ts-jest": {
@@ -105,5 +103,13 @@
     "testMatch": [
       "**/*.test.(ts|tsx)"
     ]
+  },
+  "codegenConfig": {
+    "name": "RNSentrySpec",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "io.sentry.react"
+    }
   }
 }

package/sample-new-architecture/react-native.config.js

@@ -0,0 +1,10 @@
+// Without this config the codegen fails
+// because it can find @sentry/react-native
+// in the dependencies
+module.exports = {
+  dependencies: {
+    RNSentry: {
+      root: '../',
+    },
+  },
+};

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]
@@ -68,18 +71,18 @@ gradle.projectsEvaluated {
 
           try {
             if (versionCode instanceof String) {
-                versionCode = Integer.parseInt(versionCode);
+                versionCode = Integer.parseInt(versionCode)
+                versionCode = Math.abs(versionCode)
             }
           } catch (NumberFormatException e) {
-            project.logger.info("versionCode: '$versionCode' isn't an Integer, but it must be.")
+            project.logger.info("versionCode: '$versionCode' isn't an Integer, using the plain value.")
           }
 
-          def absVersionCode = Math.abs(versionCode)
-
           // The Sentry server distinguishes source maps by release (`--release` in the command
           // 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}_${absVersionCode}"
+          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.
@@ -154,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) {
@@ -162,6 +193,25 @@ 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 variantTaskName = variant.replaceAll("[\\s\\-()]", "") // variant is dev-release beta-release etc.
+        // task.name could be packageDev-debugRelease but in that case currentVariants == null
+        // because of the regex in `extractCurrentVariants` and this code doesn't run
+        def packageTasks = tasks.findAll {
+          task -> "package${variantTaskName}".equalsIgnoreCase(task.name) && task.enabled
+        }
+        packageTasks.each { packageTask ->
+            packageTask.dependsOn modulesTask
+            packageTask.finalizedBy modulesCleanUpTask
         }
 
         /** Delete sourcemap files */
@@ -170,7 +220,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,66 @@
+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>;
+  captureScreenshot(): Promise<NativeScreenshot[]>;
+  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>;
+};
+
+export type NativeScreenshot = {
+  data: number[];
+  contentType: string;
+  filename: string;
+}
+
+// The export must be here to pass codegen even if not used
+export default TurboModuleRegistry.getEnforcing<Spec>('RNSentry');

package/dist/js/definitions.d.ts

@@ -1,52 +0,0 @@
-import { Breadcrumb, Package } from '@sentry/types';
-import { ReactNativeOptions } from './options';
-export declare type NativeAppStartResponse = {
-    isColdStart: boolean;
-    appStartTime: number;
-    didFetchAppStart: boolean;
-};
-export declare type NativeFramesResponse = {
-    totalFrames: number;
-    slowFrames: number;
-    frozenFrames: number;
-};
-export declare type NativeReleaseResponse = {
-    build: string;
-    id: string;
-    version: string;
-};
-export declare type NativeDeviceContextsResponse = {
-    [key: string]: Record<string, unknown>;
-};
-interface SerializedObject {
-    [key: string]: string;
-}
-export interface SentryNativeBridgeModule {
-    nativeClientAvailable: boolean;
-    addBreadcrumb(breadcrumb: Breadcrumb): void;
-    captureEnvelope(payload: string | {
-        header: Record<string, unknown>;
-        payload: Record<string, unknown>;
-    }): PromiseLike<boolean>;
-    clearBreadcrumbs(): void;
-    crash(): void;
-    closeNativeSdk(): PromiseLike<void>;
-    disableNativeFramesTracking(): void;
-    fetchNativeRelease(): Promise<{
-        build: string;
-        id: string;
-        version: string;
-    }>;
-    fetchNativeSdkInfo(): PromiseLike<Package>;
-    fetchNativeDeviceContexts(): PromiseLike<NativeDeviceContextsResponse>;
-    fetchNativeAppStart(): PromiseLike<NativeAppStartResponse | null>;
-    fetchNativeFrames(): PromiseLike<NativeFramesResponse | null>;
-    getStringBytesLength(str: string): Promise<number>;
-    initNativeSdk(options: ReactNativeOptions): Promise<boolean>;
-    setUser(defaultUserKeys: SerializedObject | null, otherUserKeys: SerializedObject | null): void;
-    setContext(key: string, value: SerializedObject | null): void;
-    setExtra(key: string, value: string): void;
-    setTag(key: string, value: string): void;
-}
-export {};
-//# sourceMappingURL=definitions.d.ts.map

package/dist/js/definitions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../../src/js/definitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,oBAAY,sBAAsB,GAAG;IACnC,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,oBAAY,oBAAoB,GAAG;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,oBAAY,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,4BAA4B,GAAG;IACzC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxC,CAAC;AAEF,UAAU,gBAAgB;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,wBAAwB;IACvC,qBAAqB,EAAE,OAAO,CAAC;IAE/B,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC5C,eAAe,CACb,OAAO,EACH,MAAM,GACN;QACE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAClC,GACJ,WAAW,CAAC,OAAO,CAAC,CAAC;IACxB,gBAAgB,IAAI,IAAI,CAAC;IACzB,KAAK,IAAI,IAAI,CAAC;IACd,cAAc,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,2BAA2B,IAAI,IAAI,CAAC;IACpC,kBAAkB,IAAI,OAAO,CAAC;QAC5B,KAAK,EAAE,MAAM,CAAC;QACd,EAAE,EAAE,MAAM,CAAC;QACX,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,kBAAkB,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,yBAAyB,IAAI,WAAW,CAAC,4BAA4B,CAAC,CAAC;IACvE,mBAAmB,IAAI,WAAW,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC;IAClE,iBAAiB,IAAI,WAAW,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAC9D,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7D,OAAO,CACL,eAAe,EAAE,gBAAgB,GAAG,IAAI,EACxC,aAAa,EAAE,gBAAgB,GAAG,IAAI,GACrC,IAAI,CAAC;IACR,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI,GAAG,IAAI,CAAC;IAC9D,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C"}

package/dist/js/definitions.js

@@ -1 +0,0 @@
-//# sourceMappingURL=definitions.js.map

package/dist/js/definitions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/js/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import { Breadcrumb, Package } from '@sentry/types';\n\nimport { ReactNativeOptions } from './options';\n\nexport type NativeAppStartResponse = {\n  isColdStart: boolean;\n  appStartTime: number;\n  didFetchAppStart: boolean;\n};\n\nexport type NativeFramesResponse = {\n  totalFrames: number;\n  slowFrames: number;\n  frozenFrames: number;\n};\n\nexport type NativeReleaseResponse = {\n  build: string;\n  id: string;\n  version: string;\n};\n\nexport type NativeDeviceContextsResponse = {\n  [key: string]: Record<string, unknown>;\n};\n\ninterface SerializedObject {\n  [key: string]: string;\n}\n\nexport interface SentryNativeBridgeModule {\n  nativeClientAvailable: boolean;\n\n  addBreadcrumb(breadcrumb: Breadcrumb): void;\n  captureEnvelope(\n    payload:\n      | string\n      | {\n          header: Record<string, unknown>;\n          payload: Record<string, unknown>;\n        }\n  ): PromiseLike<boolean>;\n  clearBreadcrumbs(): void;\n  crash(): void;\n  closeNativeSdk(): PromiseLike<void>;\n  disableNativeFramesTracking(): void;\n  fetchNativeRelease(): Promise<{\n    build: string;\n    id: string;\n    version: string;\n  }>;\n  fetchNativeSdkInfo(): PromiseLike<Package>;\n  fetchNativeDeviceContexts(): PromiseLike<NativeDeviceContextsResponse>;\n  fetchNativeAppStart(): PromiseLike<NativeAppStartResponse | null>;\n  fetchNativeFrames(): PromiseLike<NativeFramesResponse | null>;\n  getStringBytesLength(str: string): Promise<number>;\n  initNativeSdk(options: ReactNativeOptions): Promise<boolean>;\n  setUser(\n    defaultUserKeys: SerializedObject | null,\n    otherUserKeys: SerializedObject | null\n  ): void;\n  setContext(key: string, value: SerializedObject | null): void;\n  setExtra(key: string, value: string): void;\n  setTag(key: string, value: string): void;\n}\n"]}