Merge branch 'master' of https://github.com/getsentry/raven-js

# Conflicts:
#	typescript/raven.d.ts

Author: LucaVazz

.travis.yml

@@ -3,4 +3,4 @@ language: node_js
 node_js:
     - "4"
 script:
-    - node_modules/.bin/grunt test
+    - npm test

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.9.2
+* BUGFIX: Use json-stringify-safe in React Native plugin to avoid circular refs. See: https://github.com/getsentry/raven-js/pull/829
+* BUGFIX: Avoid document.location access in React Native plugin. See: https://github.com/getsentry/raven-js/issues/800
+
 ## 3.9.1
 * BUGFIX: Fix TypeError triggered by some event listeners. See: https://github.com/getsentry/raven-js/issues/793
 * BUGFIX: Fix bad `window` access in web worker environments. See: https://github.com/getsentry/raven-js/pull/792

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "raven-js",
-  "version": "3.9.1",
+  "version": "3.9.2",
   "dependencies": {},
   "main": "dist/raven.js",
   "ignore": [

dist/plugins/angular.js

@@ -1,10 +1,10 @@
-/*! Raven.js 3.9.1 (7bbae7d) | github.com/getsentry/raven-js */
+/*! Raven.js 3.9.2 (5286373) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
  * https://github.com/getsentry/TraceKit
  *
- * Copyright 2016 Matt Robenolt and other contributors
+ * Copyright 2017 Matt Robenolt and other contributors
  * Released under the BSD license
  * https://github.com/getsentry/raven-js/blob/master/LICENSE
  *

dist/plugins/angular.min.js

@@ -1,10 +1,10 @@
-/*! Raven.js 3.9.1 (7bbae7d) | github.com/getsentry/raven-js */
+/*! Raven.js 3.9.2 (5286373) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
  * https://github.com/getsentry/TraceKit
  *
- * Copyright 2016 Matt Robenolt and other contributors
+ * Copyright 2017 Matt Robenolt and other contributors
  * Released under the BSD license
  * https://github.com/getsentry/raven-js/blob/master/LICENSE
  *

dist/plugins/console.js

@@ -1,10 +1,10 @@
-/*! Raven.js 3.9.1 (7bbae7d) | github.com/getsentry/raven-js */
+/*! Raven.js 3.9.2 (5286373) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
  * https://github.com/getsentry/TraceKit
  *
- * Copyright 2016 Matt Robenolt and other contributors
+ * Copyright 2017 Matt Robenolt and other contributors
  * Released under the BSD license
  * https://github.com/getsentry/raven-js/blob/master/LICENSE
  *

dist/plugins/console.min.js

@@ -1,10 +1,10 @@
-/*! Raven.js 3.9.1 (7bbae7d) | github.com/getsentry/raven-js */
+/*! Raven.js 3.9.2 (5286373) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
  * https://github.com/getsentry/TraceKit
  *
- * Copyright 2016 Matt Robenolt and other contributors
+ * Copyright 2017 Matt Robenolt and other contributors
  * Released under the BSD license
  * https://github.com/getsentry/raven-js/blob/master/LICENSE
  *

dist/plugins/ember.js

@@ -1,10 +1,10 @@
-/*! Raven.js 3.9.1 (7bbae7d) | github.com/getsentry/raven-js */
+/*! Raven.js 3.9.2 (5286373) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
  * https://github.com/getsentry/TraceKit
  *
- * Copyright 2016 Matt Robenolt and other contributors
+ * Copyright 2017 Matt Robenolt and other contributors
  * Released under the BSD license
  * https://github.com/getsentry/raven-js/blob/master/LICENSE
  *

dist/plugins/ember.min.js

@@ -1,10 +1,10 @@
-/*! Raven.js 3.9.1 (7bbae7d) | github.com/getsentry/raven-js */
+/*! Raven.js 3.9.2 (5286373) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
  * https://github.com/getsentry/TraceKit
  *
- * Copyright 2016 Matt Robenolt and other contributors
+ * Copyright 2017 Matt Robenolt and other contributors
  * Released under the BSD license
  * https://github.com/getsentry/raven-js/blob/master/LICENSE
  *
@@ -172,7 +172,7 @@ Raven.prototype = {
     // webpack (using a build step causes webpack #1617). Grunt verifies that
     // this value matches package.json during build.
     //   See: https://github.com/getsentry/raven-js/issues/465
-    VERSION: '3.9.1',
+    VERSION: '3.9.2',
 
     debug: false,
 
@@ -1960,7 +1960,7 @@ var UNKNOWN_FUNCTION = '?';
 var ERROR_TYPES_RE = /^(?:Uncaught (?:exception: )?)?((?:Eval|Internal|Range|Reference|Syntax|Type|URI)Error): ?(.*)$/;
 
 function getLocationHref() {
-    if (typeof document === 'undefined')
+    if (typeof document === 'undefined' || typeof document.location === 'undefined')
         return '';
 
     return document.location.href;

dist/plugins/require.js

@@ -1,20 +1,20 @@
 {
   "@dist/raven.js": {
     "hashes": {
-      "sha256": "ihdEI9/hV9q/+yUm+WxgLgncmbFnuK9tr/lRnRgr60k=",
-      "sha512": "4WMClk7qzYHXT5/xR3X9RkpNs8dg/FIfbJ7RTythr9rXMRAVIDimD2X6NLEUdID+c7sJ3b6oOvsmf6oB0ORhwg=="
+      "sha256": "LJk9mpSaLNe5OiPeVilljWT/19pH0m8BVTv5beKC3iM=",
+      "sha512": "hjC0XVht94rSQP/cvndw3Z0NB5UsDgojmYAZ5Dk5j44OQGgW4jfVjFjvecNrhPXjec4dtFaFdP9PyCqW/CIX6w=="
     },
     "type": null,
-    "integrity": "sha256-ihdEI9/hV9q/+yUm+WxgLgncmbFnuK9tr/lRnRgr60k= sha512-4WMClk7qzYHXT5/xR3X9RkpNs8dg/FIfbJ7RTythr9rXMRAVIDimD2X6NLEUdID+c7sJ3b6oOvsmf6oB0ORhwg==",
+    "integrity": "sha256-LJk9mpSaLNe5OiPeVilljWT/19pH0m8BVTv5beKC3iM= sha512-hjC0XVht94rSQP/cvndw3Z0NB5UsDgojmYAZ5Dk5j44OQGgW4jfVjFjvecNrhPXjec4dtFaFdP9PyCqW/CIX6w==",
     "path": "dist/raven.js"
   },
   "@dist/raven.min.js": {
     "hashes": {
-      "sha256": "Iwsp4zEtQhPhOFbMNyTevyNpy7XTm8qUPteSJyopHDM=",
-      "sha512": "lL3X3M9f+DKT/mcKDJWixbXdXhVlYGWxy5DuPYyV6LrD8KNWQJ6ahpvTK3IyosXEAj3x+PWQ1DnFbKyGbIGdBw=="
+      "sha256": "RQ2cvD7tXgOG7hgiNUknpPGVg3Eu7UI5sO4lmb2Mloo=",
+      "sha512": "FPpKmmpnrw6sYdChKdgzuUeAOHIVtug53GBhmanL57JKgVvU+1kngVPZuTcZU8cwptB0P0cE/ImnmIEgdF1avg=="
     },
     "type": null,
-    "integrity": "sha256-Iwsp4zEtQhPhOFbMNyTevyNpy7XTm8qUPteSJyopHDM= sha512-lL3X3M9f+DKT/mcKDJWixbXdXhVlYGWxy5DuPYyV6LrD8KNWQJ6ahpvTK3IyosXEAj3x+PWQ1DnFbKyGbIGdBw==",
+    "integrity": "sha256-RQ2cvD7tXgOG7hgiNUknpPGVg3Eu7UI5sO4lmb2Mloo= sha512-FPpKmmpnrw6sYdChKdgzuUeAOHIVtug53GBhmanL57JKgVvU+1kngVPZuTcZU8cwptB0P0cE/ImnmIEgdF1avg==",
     "path": "dist/raven.min.js"
   }
 }

dist/plugins/require.min.js

@@ -67,7 +67,7 @@ Then, in your main module file (where ``@NgModule`` is called, e.g. app.module.t
       .config('___PUBLIC_DSN___')
       .install();
 
-    class RavenErrorHandler implements ErrorHandler {
+    export class RavenErrorHandler implements ErrorHandler {
       handleError(err:any) : void {
         Raven.captureException(err.originalError);
       }
@@ -99,7 +99,7 @@ Angular CLI now uses Webpack to build instead of SystemJS. All you need to do is
       .config('___PUBLIC_DSN___')
       .install();
 
-    class RavenErrorHandler implements ErrorHandler {
+    export class RavenErrorHandler implements ErrorHandler {
       handleError(err:any) : void {
         Raven.captureException(err.originalError);
       }

dist/plugins/vue.js

@@ -66,6 +66,6 @@
     }
   },
   "vars": {
-    "RAVEN_VERSION": "3.9.1"
+    "RAVEN_VERSION": "3.9.2"
   }
 }

dist/plugins/vue.min.js

@@ -27,8 +27,8 @@ that maps the minified code back to the original source:
 
     node_modules/uglify-js/bin/uglifyjs {input} \
       --source-map-root={relroot}/ \
-      --source-map-url={name}.map.js \
-      --source-map={relpath}/{name}.map.js \
+      --source-map-url={name}.js.map \
+      --source-map={relpath}/{name}.js.map \
       --source-map-include-sources \
       -o {output}
 
@@ -52,7 +52,7 @@ Webpack can be configured to output source maps by editing webpack.config.js.
         output: {
           path: path.join(__dirname, 'dist'),
           filename: "[name].js",
-          sourceMapFilename: "[name].map.js",
+          sourceMapFilename: "[name].js.map",
         }
     };
 
@@ -106,15 +106,15 @@ on the last line, the following directive is found:
 
 .. code-block:: javascript
 
-    //# sourceMappingURL=app.map.js
+    //# sourceMappingURL=app.js.map
 
-Sentry will attempt to fetch ``app.map.js`` from http://example.org/js/app.map.js.
+Sentry will attempt to fetch ``app.js.map`` from http://example.org/js/app.js.map.
 
 Alternatively, during source map generation you can specify a fully qualified URL where your source maps are located:
 
 .. code-block:: javascript
 
-    //# sourceMappingURL=http://example.org/js/app.map.js
+    //# sourceMappingURL=http://example.org/js/app.js.map
 
 While making source maps available to Sentry from your servers is the easiest integration, it is not always advisable:
 
@@ -172,7 +172,7 @@ if a browser (or filesystem) had to resolve its path. So for example, if your so
 reference is just a relative path, it's **relative to the location of the referencing file**.
 
 So for example, if you have ``http://example.com/app.min.js``, and the file contains the
-reference to ``app.map.js``, the name of the uploaded file should be ``http://example.com/app.map.js``.
+reference to ``app.js.map``, the name of the uploaded file should be ``http://example.com/app.js.map``.
 
 .. code-block:: bash
 

dist/raven.js

@@ -1,6 +1,6 @@
 {
   "name": "raven-js",
-  "version": "3.9.1",
+  "version": "3.9.2",
   "license": "BSD-2-Clause",
   "homepage": "https://github.com/getsentry/raven-js",
   "scripts": {

dist/raven.min.js

@@ -23,7 +23,7 @@
 // /var/containers/Bundle/Application/{DEVICE_ID}/HelloWorld.app/main.jsbundle
 
 var PATH_STRIP_RE = /^.*\/[^\.]+(\.app|CodePush)/;
-
+var stringify = require('json-stringify-safe');
 var FATAL_ERROR_KEY = '--rn-fatal--';
 var ASYNC_STORAGE_KEY = '--raven-js-global-error-payload--';
 
@@ -137,7 +137,7 @@ function reactNativePlugin(Raven, options) {
  */
 reactNativePlugin._persistPayload = function(payload) {
     var AsyncStorage = require('react-native').AsyncStorage;
-    return AsyncStorage.setItem(ASYNC_STORAGE_KEY, JSON.stringify(payload))
+    return AsyncStorage.setItem(ASYNC_STORAGE_KEY, stringify(payload))
         ['catch'](function() { return null; });
 }
 
@@ -198,7 +198,7 @@ reactNativePlugin._transport = function (options) {
     // Just set a phony Origin value; only matters if Sentry Project is configured
     // to whitelist specific origins.
     request.setRequestHeader('Origin', 'react-native://');
-    request.send(JSON.stringify(options.data));
+    request.send(stringify(options.data));
 };
 
 /**

dist/raven.min.js.map

@@ -78,7 +78,7 @@ Raven.prototype = {
     // webpack (using a build step causes webpack #1617). Grunt verifies that
     // this value matches package.json during build.
     //   See: https://github.com/getsentry/raven-js/issues/465
-    VERSION: '3.9.1',
+    VERSION: '3.9.2',
 
     debug: false,
 

dist/sri.json

@@ -1004,7 +1004,7 @@ describe('globals', function() {
                 extra: {'session:duration': 100},
             });
             assert.deepEqual(opts.auth, {
-                sentry_client: 'raven-js/3.9.1',
+                sentry_client: 'raven-js/3.9.2',
                 sentry_key: 'abc',
                 sentry_version: '7'
             });
@@ -1051,7 +1051,7 @@ describe('globals', function() {
                 extra: {'session:duration': 100},
             });
             assert.deepEqual(opts.auth, {
-                sentry_client: 'raven-js/3.9.1',
+                sentry_client: 'raven-js/3.9.2',
                 sentry_key: 'abc',
                 sentry_secret: 'def',
                 sentry_version: '7'

docs/integrations/angular2.rst

@@ -340,4 +340,15 @@ CapturedExceptions.PHANTOMJS_1_19 = {
     "    at http://path/to/file.js:4287"
 };
 
+CapturedExceptions.FIREFOX_50_RESOURCE_URL= {
+    stack: 'render@resource://path/data/content/bundle.js:5529:16\n' +
+    'dispatchEvent@resource://path/data/content/vendor.bundle.js:18:23028\n' +
+    'wrapped@resource://path/data/content/bundle.js:7270:25',
+    fileName: 'resource://path/data/content/bundle.js',
+    lineNumber: 5529,
+    columnNumber: 16,
+    message: 'this.props.raw[this.state.dataSource].rows is undefined',
+    name: 'TypeError'
+};
+
 module.exports = CapturedExceptions;

docs/sentry-doc-config.json

@@ -209,5 +209,13 @@ describe('TraceKit', function () {
             assert.deepEqual(stackFrames.stack[1], { url: 'http://path/to/file.js', func: 'foo', args: [], line: 4283, column: null });
             assert.deepEqual(stackFrames.stack[2], { url: 'http://path/to/file.js', func: '?', args: [], line: 4287, column: null });
         });
+
+        it('should parse Firefox errors with resource: URLs', function () {
+            var stackFrames = TraceKit.computeStackTrace(CapturedExceptions.FIREFOX_50_RESOURCE_URL);
+            assert.ok(stackFrames);
+            assert.deepEqual(stackFrames.stack.length, 3);
+            assert.deepEqual(stackFrames.stack[0], { url: 'resource://path/data/content/bundle.js', func: 'render', args: [], line: 5529, column: 16 });
+        });
+
     });
 });