Merge branch 'master' of https://github.com/getsentry/sentry-javascript into onur/test-bundles

Author: onurtemizkan

.github/workflows/jira.yml

@@ -0,0 +1,18 @@
+name: Create JIRA issue
+
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  createIssue:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: getsentry/ga-jira-integration@main
+        with:
+          JIRA_API_HOST: ${{secrets.JIRA_BASEURL}}
+          JIRA_API_TOKEN: ${{secrets.JIRA_APITOKEN}}
+          JIRA_EMAIL: ${{secrets.JIRA_USEREMAIL}}
+          TRIGGER_LABEL: "Jira"
+          JIRA_PROJECT_ID: WEB
+          JIRA_ISSUE_NAME: Story

CHANGELOG.md

@@ -4,6 +4,24 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.17.9
+
+- fix(gatsby): Add missing React peer dependency ([#4576](https://github.com/getsentry/sentry-javascript/pull/4576))
+- fix(types): Use Sentry event type instead of dom one ([#4584](https://github.com/getsentry/sentry-javascript/pull/4584))
+
+Work in this release contributed by @aaronadamsCA. Thank you for your contribution!
+
+## 6.17.8
+
+- feat(types): Add Envelope types ([#4527](https://github.com/getsentry/sentry-javascript/pull/4527))
+- fix(build): Remove node code from CDN bundles ([#4548](https://github.com/getsentry/sentry-javascript/pull/4548))
+- fix(build): Prevent unused utils code in integration bundles ([#4547](https://github.com/getsentry/sentry-javascript/pull/4547))
+- fix(tracing): Export BrowserTracing directly in CDN bundle ([#4570](https://github.com/getsentry/sentry-javascript/pull/4570))
+- fix(utils): Use apply in console instrumentation ([#4568](https://github.com/getsentry/sentry-javascript/pull/4568))
+- ref(core): Log `normalizeDepth` when normalization is skipped([#4574](https://github.com/getsentry/sentry-javascript/pull/4574))
+
+Work in this release contributed by @mydea. Thank you for your contribution!
+
 ## 6.17.7
 
 - fix(utils): Make new non-enumerable properties mutable ([#4528](https://github.com/getsentry/sentry-javascript/pull/4528))

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "6.17.7",
+  "version": "6.17.9",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

package.json

@@ -51,6 +51,8 @@
   ],
   "devDependencies": {
     "@google-cloud/storage": "^5.7.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-replace": "^3.0.1",
     "@size-limit/preset-small-lib": "^4.5.5",
     "@strictsoftware/typedoc-plugin-monorepo": "^0.3.1",
@@ -72,6 +74,7 @@
     "prettier": "2.5.1",
     "replace-in-file": "^4.0.0",
     "rimraf": "^3.0.2",
+    "rollup": "^2.67.1",
     "rollup-plugin-license": "^2.6.1",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.31.2",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.17.7",
+  "version": "6.17.9",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
     "@angular/router": "10.x || 11.x || 12.x || 13.x"
   },
   "dependencies": {
-    "@sentry/browser": "6.17.7",
-    "@sentry/types": "6.17.7",
-    "@sentry/utils": "6.17.7",
+    "@sentry/browser": "6.17.9",
+    "@sentry/types": "6.17.9",
+    "@sentry/utils": "6.17.9",
     "rxjs": "^6.6.0",
     "tslib": "^1.9.3"
   },

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.17.7",
+  "version": "6.17.9",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.17.7",
-    "@sentry/types": "6.17.7",
-    "@sentry/utils": "6.17.7",
+    "@sentry/core": "6.17.9",
+    "@sentry/types": "6.17.9",
+    "@sentry/utils": "6.17.9",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
@@ -40,9 +40,6 @@
     "karma-webkit-launcher": "^1.0.2",
     "node-fetch": "^2.6.0",
     "playwright": "^1.17.1",
-    "rollup": "^1.10.1",
-    "rollup-plugin-commonjs": "^9.3.4",
-    "rollup-plugin-node-resolve": "^4.2.3",
     "sinon": "^7.3.2",
     "webpack": "^4.30.0"
   },

packages/browser/rollup.config.js

@@ -1,8 +1,7 @@
 import { terser } from 'rollup-plugin-terser';
 import typescript from 'rollup-plugin-typescript2';
 import license from 'rollup-plugin-license';
-import resolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
+import resolve from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
 
 const commitHash = require('child_process')
@@ -72,7 +71,6 @@ const plugins = [
   resolve({
     mainFields: ['module'],
   }),
-  commonjs(),
 ];
 
 const bundleConfig = {
@@ -82,6 +80,7 @@ const bundleConfig = {
     name: 'Sentry',
     sourcemap: true,
     strict: false,
+    esModule: false,
   },
   context: 'window',
   plugins: [

packages/browser/src/eventbuilder.ts

@@ -11,8 +11,7 @@ import {
   resolvedSyncPromise,
 } from '@sentry/utils';
 
-import { eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
-import { computeStackTrace } from './tracekit';
+import { eventFromError, eventFromPlainObject, parseStackFrames } from './parsers';
 
 /**
  * Creates an {@link Event} from all inputs to `captureException` and non-primitive inputs to `captureMessage`.
@@ -68,10 +67,7 @@ export function eventFromUnknownInput(
   if (isErrorEvent(exception as ErrorEvent) && (exception as ErrorEvent).error) {
     // If it is an ErrorEvent with `error` property, extract it to get actual Error
     const errorEvent = exception as ErrorEvent;
-    // eslint-disable-next-line no-param-reassign
-    exception = errorEvent.error;
-    event = eventFromStacktrace(computeStackTrace(exception as Error));
-    return event;
+    return eventFromError(errorEvent.error as Error);
   }
 
   // If it is a `DOMError` (which is a legacy API, but still supported in some browsers) then we just extract the name
@@ -85,7 +81,7 @@ export function eventFromUnknownInput(
     const domException = exception as DOMException;
 
     if ('stack' in (exception as Error)) {
-      event = eventFromStacktrace(computeStackTrace(exception as Error));
+      event = eventFromError(exception as Error);
     } else {
       const name = domException.name || (isDOMError(domException) ? 'DOMError' : 'DOMException');
       const message = domException.message ? `${name}: ${domException.message}` : name;
@@ -100,8 +96,7 @@ export function eventFromUnknownInput(
   }
   if (isError(exception as Error)) {
     // we have a real Error object, do nothing
-    event = eventFromStacktrace(computeStackTrace(exception as Error));
-    return event;
+    return eventFromError(exception as Error);
   }
   if (isPlainObject(exception) || isEvent(exception)) {
     // If it's a plain object or an instance of `Event` (the built-in JS kind, not this SDK's `Event` type), serialize
@@ -148,10 +143,8 @@ export function eventFromString(
   };
 
   if (options.attachStacktrace && syntheticException) {
-    const stacktrace = computeStackTrace(syntheticException);
-    const frames = prepareFramesForEvent(stacktrace.stack);
     event.stacktrace = {
-      frames,
+      frames: parseStackFrames(syntheticException),
     };
   }
 

packages/browser/src/integrations/linkederrors.ts

@@ -2,8 +2,7 @@ import { addGlobalEventProcessor, getCurrentHub } from '@sentry/core';
 import { Event, EventHint, Exception, ExtendedError, Integration } from '@sentry/types';
 import { isInstanceOf } from '@sentry/utils';
 
-import { exceptionFromStacktrace } from '../parsers';
-import { computeStackTrace } from '../tracekit';
+import { exceptionFromError } from '../parsers';
 
 const DEFAULT_KEY = 'cause';
 const DEFAULT_LIMIT = 5;
@@ -73,7 +72,6 @@ export function _walkErrorTree(limit: number, error: ExtendedError, key: string,
   if (!isInstanceOf(error[key], Error) || stack.length + 1 >= limit) {
     return stack;
   }
-  const stacktrace = computeStackTrace(error[key]);
-  const exception = exceptionFromStacktrace(stacktrace);
+  const exception = exceptionFromError(error[key]);
   return _walkErrorTree(limit, error[key], key, [exception, ...stack]);
 }

packages/browser/src/parsers.ts

@@ -1,21 +1,21 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { Event, Exception, StackFrame } from '@sentry/types';
-import { extractExceptionKeysForMessage, isEvent, normalizeToSize } from '@sentry/utils';
+import { createStackParser, extractExceptionKeysForMessage, isEvent, normalizeToSize } from '@sentry/utils';
 
-import { computeStackTrace, StackTrace as TraceKitStackTrace } from './tracekit';
-
-const STACKTRACE_LIMIT = 50;
+import { chrome, gecko, opera10, opera11, winjs } from './stack-parsers';
 
 /**
  * This function creates an exception from an TraceKitStackTrace
  * @param stacktrace TraceKitStackTrace that will be converted to an exception
  * @hidden
  */
-export function exceptionFromStacktrace(stacktrace: TraceKitStackTrace): Exception {
-  const frames = prepareFramesForEvent(stacktrace.stack);
+export function exceptionFromError(ex: Error): Exception {
+  // Get the frames first since Opera can lose the stack if we touch anything else first
+  const frames = parseStackFrames(ex);
 
   const exception: Exception = {
-    type: stacktrace.name,
-    value: stacktrace.message,
+    type: ex && ex.name,
+    value: extractMessage(ex),
   };
 
   if (frames && frames.length) {
@@ -54,10 +54,8 @@ export function eventFromPlainObject(
   };
 
   if (syntheticException) {
-    const stacktrace = computeStackTrace(syntheticException);
-    const frames = prepareFramesForEvent(stacktrace.stack);
     event.stacktrace = {
-      frames,
+      frames: parseStackFrames(syntheticException),
     };
   }
 
@@ -67,48 +65,63 @@ export function eventFromPlainObject(
 /**
  * @hidden
  */
-export function eventFromStacktrace(stacktrace: TraceKitStackTrace): Event {
-  const exception = exceptionFromStacktrace(stacktrace);
-
+export function eventFromError(ex: Error): Event {
   return {
     exception: {
-      values: [exception],
+      values: [exceptionFromError(ex)],
     },
   };
 }
 
-/**
- * @hidden
- */
-export function prepareFramesForEvent(stack: StackFrame[]): StackFrame[] {
-  if (!stack.length) {
-    return [];
+/** Parses stack frames from an error */
+export function parseStackFrames(ex: Error & { framesToPop?: number; stacktrace?: string }): StackFrame[] {
+  // Access and store the stacktrace property before doing ANYTHING
+  // else to it because Opera is not very good at providing it
+  // reliably in other circumstances.
+  const stacktrace = ex.stacktrace || ex.stack || '';
+
+  const popSize = getPopSize(ex);
+
+  try {
+    // The order of the parsers in important
+    return createStackParser(opera10, opera11, chrome, winjs, gecko)(stacktrace, popSize);
+  } catch (e) {
+    // no-empty
   }
 
-  let localStack = stack;
+  return [];
+}
 
-  const firstFrameFunction = localStack[0].function || '';
-  const lastFrameFunction = localStack[localStack.length - 1].function || '';
+// Based on our own mapping pattern - https://github.com/getsentry/sentry/blob/9f08305e09866c8bd6d0c24f5b0aabdd7dd6c59c/src/sentry/lang/javascript/errormapping.py#L83-L108
+const reactMinifiedRegexp = /Minified React error #\d+;/i;
 
-  // If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)
-  if (firstFrameFunction.indexOf('captureMessage') !== -1 || firstFrameFunction.indexOf('captureException') !== -1) {
-    localStack = localStack.slice(1);
-  }
+function getPopSize(ex: Error & { framesToPop?: number }): number {
+  if (ex) {
+    if (typeof ex.framesToPop === 'number') {
+      return ex.framesToPop;
+    }
 
-  // If stack ends with one of our internal API calls, remove it (ends, meaning it's the bottom of the stack - aka top-most call)
-  if (lastFrameFunction.indexOf('sentryWrapped') !== -1) {
-    localStack = localStack.slice(0, -1);
+    if (reactMinifiedRegexp.test(ex.message)) {
+      return 1;
+    }
   }
 
-  // The frame where the crash happened, should be the last entry in the array
-  return localStack
-    .slice(0, STACKTRACE_LIMIT)
-    .map(frame => ({
-      filename: frame.filename || localStack[0].filename,
-      function: frame.function || '?',
-      lineno: frame.lineno,
-      colno: frame.colno,
-      in_app: true,
-    }))
-    .reverse();
+  return 0;
+}
+
+/**
+ * There are cases where stacktrace.message is an Event object
+ * https://github.com/getsentry/sentry-javascript/issues/1949
+ * In this specific case we try to extract stacktrace.message.error.message
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function extractMessage(ex: any): string {
+  const message = ex && ex.message;
+  if (!message) {
+    return 'No error message';
+  }
+  if (message.error && typeof message.error.message === 'string') {
+    return message.error.message;
+  }
+  return message;
 }