Merge branch '2.x'

Author: benvinegar

.jshintrc

@@ -3,8 +3,8 @@
     "globalstrict": true,
     "browser": true,
     "predef": [
-        "TraceKit",
         "console",
-        "_slice"
+        "module",
+        "require"
     ]
 }

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.0.0
+
+* CHANGE: Raven.js now wraps functions passed to timer functions, event listeners, and XMLHttpRequest handlers
+* CHANGE: Removed jQuery, Backbone, and native plugins (now handled inside raven.js)
+* CHANGE: Default HTTP transport changed from `Image` GET to `XMLHttpRequest` POST (w/ CORS)
+* CHANGE: When using CommonJS, plugins are initialized via `Raven.addPlugin(require('raven-js/plugins/ember'))`
+* CHANGE: Raven builds are generated using Browserify
+* NEW: Integration tests (/test/integration/index.html)
+
 ## 1.3.0
 * CHANGE: `console` plugin will now send all arguments as an `extra` value. See: https://github.com/getsentry/raven-js/pull/398
 * CHANGE: Bump to v7 of the Sentry API spec. This now requires a Sentry 7.7.0+ https://github.com/getsentry/raven-js/pull/403

Gruntfile.js

@@ -1,15 +1,12 @@
+var proxyquire = require('proxyquireify');
+var versionify = require('browserify-versionify');
+
 module.exports = function(grunt) {
     "use strict";
 
     var _ = require('lodash');
     var path = require('path');
-
-    var coreFiles = [
-        'template/_header.js',
-        'vendor/**/*.js',
-        'src/**/*.js',
-        'template/_footer.js'
-    ];
+    var through = require('through2');
 
     var excludedPlugins = [
         'react-native'
@@ -26,6 +23,21 @@ module.exports = function(grunt) {
         return path;
     });
 
+    // custom browserify transformer to re-write plugins to
+    // self-register with Raven via addPlugin
+    function AddPluginBrowserifyTransformer() {
+        return function (file) {
+            return through(function (buf, enc, next) {
+                buf = buf.toString('utf8');
+                if (/plugins/.test(file)) {
+                    buf += "\nrequire('../src/singleton').addPlugin(module.exports);";
+                }
+                this.push(buf);
+                next();
+            });
+        };
+    }
+
     // Taken from http://dzone.com/snippets/calculate-all-combinations
     var combine = function (a) {
         var fn = function (n, src, got, all) {
@@ -65,7 +77,7 @@ module.exports = function(grunt) {
         key.sort();
 
         var dest = path.join('build/', key.join(','), '/raven.js');
-        dict[dest] = coreFiles.concat(comb);
+        dict[dest] = ['src/singleton.js'].concat(comb);
 
         return dict;
     }, {});
@@ -75,18 +87,38 @@ module.exports = function(grunt) {
         aws: grunt.file.exists('aws.json') ? grunt.file.readJSON('aws.json'): {},
 
         clean: ['build'],
-        concat: {
+
+        browserify: {
             options: {
-                separator: '\n',
-                banner: grunt.file.read('template/_copyright.js'),
-                process: true
+                browserifyOptions: {
+                    banner: grunt.file.read('template/_copyright.js'),
+                    standalone: 'Raven' // umd
+
+                },
+                transform: [versionify]
             },
             core: {
-                src: coreFiles.concat(plugins),
+                src: 'src/singleton.js',
                 dest: 'build/raven.js'
             },
-            all: {
-                files: pluginConcatFiles
+            plugins: {
+                files: pluginConcatFiles,
+                options: {
+                    transform: [
+                        [ versionify ],
+                        [ new AddPluginBrowserifyTransformer() ]
+                    ]
+                }
+            },
+            test: {
+                src: 'test/**/*.test.js',
+                dest: 'build/raven.test.js',
+                options: {
+                    browserifyOptions: {
+                        debug: true // source maps
+                    },
+                    plugin: [proxyquire.plugin]
+                }
             }
         },
 
@@ -100,7 +132,13 @@ module.exports = function(grunt) {
                 sourceMappingURL: function (dest) {
                     return path.basename(dest, '.js') + '.map';
                 },
-                preserveComments: 'some'
+                preserveComments: 'some',
+                compress: {
+                    dead_code: true,
+                    global_defs: {
+                        "TEST": false
+                    }
+                }
             },
             dist: {
                 src: ['build/**/*.js'],
@@ -121,18 +159,22 @@ module.exports = function(grunt) {
         },
 
         mocha: {
-            all: {
-                options: {
-                    mocha: {
-                        ignoreLeaks: true,
-                        grep:        grunt.option('grep')
-                    },
-                    log:      true,
-                    reporter: 'Dot',
-                    run:      true
+            options: {
+                mocha: {
+                    ignoreLeaks: true,
+                    grep:        grunt.option('grep')
                 },
+                log:      true,
+                reporter: 'Dot',
+                run:      true
+            },
+            unit: {
                 src: ['test/index.html'],
                 nonull: true
+            },
+            integration: {
+                src: ['test/integration/index.html'],
+                nonull: true
             }
         },
 
@@ -251,13 +293,13 @@ module.exports = function(grunt) {
 
     // Grunt contrib tasks
     grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-connect');
     grunt.loadNpmTasks('grunt-contrib-copy');
 
     // 3rd party Grunt tasks
+    grunt.loadNpmTasks('grunt-browserify');
     grunt.loadNpmTasks('grunt-mocha');
     grunt.loadNpmTasks('grunt-release');
     grunt.loadNpmTasks('grunt-s3');
@@ -266,15 +308,16 @@ module.exports = function(grunt) {
 
     // Build tasks
     grunt.registerTask('_prep', ['clean', 'gitinfo', 'version']);
-    grunt.registerTask('concat.core', ['_prep', 'concat:core']);
-    grunt.registerTask('concat.all', ['_prep', 'concat:all']);
-    grunt.registerTask('build.core', ['concat.core', 'uglify', 'fixSourceMaps', 'sri:dist']);
-    grunt.registerTask('build.all', ['concat.all', 'uglify', 'fixSourceMaps', 'sri:dist', 'sri:build']);
+    grunt.registerTask('browserify.core', ['_prep', 'browserify:core']);
+    grunt.registerTask('browserify.plugins', ['_prep', 'browserify:plugins']);
+    grunt.registerTask('build.test', ['_prep', 'browserify:test']);
+    grunt.registerTask('build.core', ['browserify.core', 'uglify', 'fixSourceMaps', 'sri:dist']);
+    grunt.registerTask('build.all', ['browserify.plugins', 'uglify', 'fixSourceMaps', 'sri:dist', 'sri:build']);
     grunt.registerTask('build', ['build.all']);
     grunt.registerTask('dist', ['build.core', 'copy:dist']);
 
     // Test task
-    grunt.registerTask('test', ['jshint', 'mocha']);
+    grunt.registerTask('test', ['jshint', 'browserify.core', 'browserify:test', 'mocha']);
 
     // Webserver tasks
     grunt.registerTask('run:test', ['connect:test']);

README.md

@@ -2,7 +2,7 @@
 
 Raven.js is a tiny standalone JavaScript client for [Sentry](https://getsentry.com/).
 
-**Raven.js v1.3 requires Sentry v7.7.0 or later.**
+**Raven.js v2.0 requires Sentry v8.0.0 or later.**
 
 ## Resources
 

bower.json

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