Merge branch 'master' of github.com:getsentry/sentry-javascript

Author: HazAT

packages/browser/rollup.config.js

@@ -54,6 +54,7 @@ const bundleConfig = {
     format: 'iife',
     name: 'Sentry',
     sourcemap: true,
+    strict: false,
   },
   context: 'window',
   plugins: [

packages/browser/src/tracekit.ts

@@ -1,6 +1,6 @@
 // tslint:disable
 
-import { getGlobalObject, isError, isErrorEvent } from '@sentry/utils';
+import { getGlobalObject, isError, isErrorEvent, normalize } from '@sentry/utils';
 
 /**
  * @hidden
@@ -38,7 +38,6 @@ interface ComputeStackTrace {
    * @param {(string|number)=} depth
    */
   (ex: Error, depth?: string | number): StackTrace;
-  _computeStackTraceFromStackProp(ex: any): StackTrace;
 }
 
 /**
@@ -275,6 +274,9 @@ TraceKit._report = (function reportModuleWrapper() {
     var err = (e && (e.detail ? e.detail.reason : e.reason)) || e;
     var stack = TraceKit._computeStackTrace(err);
     stack.mechanism = 'onunhandledrejection';
+    if (!stack.message) {
+      stack.message = JSON.stringify(normalize(err))
+    }
     _notifyHandlers(stack, true, err);
   }
 
@@ -479,7 +481,7 @@ TraceKit._computeStackTrace = (function _computeStackTraceWrapper() {
       // gecko regex: `(?:bundle|\d+\.js)`: `bundle` is for react native, `\d+\.js` also but specifically for ram bundles because it
       // generates filenames without a prefix like `file://` the filenames in the stacktrace are just 42.js
       // We need this specific case for now because we want no other regex to match.
-      gecko = /^\s*(.*?)(?:\((.*?)\))?(?:^|@)((?:file|https?|blob|chrome|webpack|resource|moz-extension).*?:\/.*?|\[native code\]|[^@]*(?:bundle|\d+\.js))(?::(\d+))?(?::(\d+))?\s*$/i,
+      gecko = /^\s*(.*?)(?:\((.*?)\))?(?:^|@)?((?:file|https?|blob|chrome|webpack|resource|moz-extension).*?:\/.*?|\[native code\]|[^@]*(?:bundle|\d+\.js))(?::(\d+))?(?::(\d+))?\s*$/i,
       winjs = /^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i,
       // Used to additionally parse URL/line/column from eval frames
       isEval,
@@ -494,6 +496,7 @@ TraceKit._computeStackTrace = (function _computeStackTraceWrapper() {
 
     for (var i = 0, j = lines.length; i < j; ++i) {
       if ((parts = chrome.exec(lines[i]))) {
+        var isNative = parts[2] && parts[2].indexOf('native') === 0; // start of line
         isEval = parts[2] && parts[2].indexOf('eval') === 0; // start of line
         if (isEval && (submatch = chromeEval.exec(parts[2]))) {
           // throw out eval line/column and use top-most line/column number
@@ -504,7 +507,7 @@ TraceKit._computeStackTrace = (function _computeStackTraceWrapper() {
         element = {
           url: parts[2],
           func: parts[1] || UNKNOWN_FUNCTION,
-          args: [],
+          args: isNative ? [parts[2]] : [],
           line: parts[3] ? +parts[3] : null,
           column: parts[4] ? +parts[4] : null,
         };
@@ -520,6 +523,7 @@ TraceKit._computeStackTrace = (function _computeStackTraceWrapper() {
         isEval = parts[3] && parts[3].indexOf(' > eval') > -1;
         if (isEval && (submatch = geckoEval.exec(parts[3]))) {
           // throw out eval line/column and use top-most line number
+          parts[1] = parts[1] || `eval`;
           parts[3] = submatch[1];
           parts[4] = submatch[2];
           parts[5] = ''; // no column when eval

packages/browser/test/integration/test.js

@@ -667,9 +667,9 @@ for (var idx in frames) {
             },
             function(sentryData) {
               if (debounceAssertEventCount(sentryData, 1, done)) {
+                // non-error rejections doesnt provide stacktraces so we can skip the assertion
                 assert.equal(sentryData[0].exception.values[0].value, '"test"');
                 assert.equal(sentryData[0].exception.values[0].type, 'UnhandledRejection');
-                assert.equal(sentryData[0].exception.values[0].stacktrace, undefined);
                 assert.equal(sentryData[0].exception.values[0].mechanism.handled, false);
                 assert.equal(sentryData[0].exception.values[0].mechanism.type, 'onunhandledrejection');
                 done();
@@ -696,9 +696,9 @@ for (var idx in frames) {
             },
             function(sentryData) {
               if (debounceAssertEventCount(sentryData, 1, done)) {
-                assert.isAtMost(sentryData[0].exception.values[0].value.length, 303);
+                // non-error rejections doesnt provide stacktraces so we can skip the assertion
+                assert.equal(sentryData[0].exception.values[0].value.length, 253);
                 assert.equal(sentryData[0].exception.values[0].type, 'UnhandledRejection');
-                assert.equal(sentryData[0].exception.values[0].stacktrace, undefined);
                 assert.equal(sentryData[0].exception.values[0].mechanism.handled, false);
                 assert.equal(sentryData[0].exception.values[0].mechanism.type, 'onunhandledrejection');
                 done();
@@ -725,9 +725,9 @@ for (var idx in frames) {
             },
             function(sentryData) {
               if (debounceAssertEventCount(sentryData, 1, done)) {
+                // non-error rejections doesnt provide stacktraces so we can skip the assertion
                 assert.equal(sentryData[0].exception.values[0].value, '{"a":"b"}');
                 assert.equal(sentryData[0].exception.values[0].type, 'UnhandledRejection');
-                assert.equal(sentryData[0].exception.values[0].stacktrace, undefined);
                 assert.equal(sentryData[0].exception.values[0].mechanism.handled, false);
                 assert.equal(sentryData[0].exception.values[0].mechanism.type, 'onunhandledrejection');
                 done();
@@ -761,9 +761,9 @@ for (var idx in frames) {
             },
             function(sentryData) {
               if (debounceAssertEventCount(sentryData, 1, done)) {
-                assert.isAtMost(sentryData[0].exception.values[0].value.length, 303);
+                // non-error rejections doesnt provide stacktraces so we can skip the assertion
+                assert.equal(sentryData[0].exception.values[0].value.length, 253);
                 assert.equal(sentryData[0].exception.values[0].type, 'UnhandledRejection');
-                assert.equal(sentryData[0].exception.values[0].stacktrace, undefined);
                 assert.equal(sentryData[0].exception.values[0].mechanism.handled, false);
                 assert.equal(sentryData[0].exception.values[0].mechanism.type, 'onunhandledrejection');
                 done();