rollbar 2.26.1 → 2.26.3

package/.github/workflows/ci.yml

@@ -9,10 +9,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        node-version: [8, 10, 12, 14, 16]
+        node-version: [10, 12, 14, 16]
 
     steps:
       - uses: actions/checkout@v2

package/Gruntfile.js

@@ -1,9 +1,5 @@
 /**
  * Build and test rollbar.js
- *
- * Test with browserstack:
- *   $> BROWSER_STACK_USERNAME=username BROWSER_STACK_ACCESS_KEY=12345asdf grunt test --browsers=bs_ie_latest
- *
  */
 
 
@@ -15,7 +11,6 @@ var pkg = require('./package.json');
 var fs = require('fs');
 
 var webpackConfig = require('./webpack.config.js');
-var browserStackBrowsers = require('./browserstack.browsers');
 
 
 function findTests(context) {
@@ -33,7 +28,7 @@ function findTests(context) {
   return mapping;
 }
 
-function buildGruntKarmaConfig(singleRun, browsers, tests, reporters) {
+function buildGruntKarmaConfig(singleRun, tests, reporters) {
   var config = {
     options: {
       configFile: './karma.conf.js',
@@ -71,10 +66,6 @@ function buildGruntKarmaConfig(singleRun, browsers, tests, reporters) {
     },
   };
 
-  if (browsers && browsers.length) {
-    config.options.browsers = browsers;
-  }
-
   if (reporters && reporters.length) {
     config.options.reporters = reporters;
   }
@@ -112,27 +103,6 @@ module.exports = function(grunt) {
   require('time-grunt')(grunt);
 
   var browserTests = findTests('browser');
-  var browsers = grunt.option('browsers');
-  if (browsers) {
-    browsers = browsers.split(',');
-
-    var browserStackAliases = [];
-    var nonBrowserStackAliases = [];
-    browsers.forEach(function(browserName) {
-      if (browserName.slice(0, 3) === 'bs_') {
-        browserStackAliases.push(browserName);
-      } else {
-        nonBrowserStackAliases.push(browserName);
-      }
-    });
-
-    var expandedBrowsers = browserStackBrowsers.filter.apply(null, browserStackAliases);
-    var expandedBrowserNames = [];
-    expandedBrowsers.forEach(function(browser) {
-      expandedBrowserNames.push(browser._alias);
-    });
-    browsers = nonBrowserStackAliases.concat(expandedBrowserNames);
-  }
 
   var singleRun = grunt.option('singleRun');
   if (singleRun === undefined) {
@@ -165,7 +135,7 @@ module.exports = function(grunt) {
       }
     },
 
-    karma: buildGruntKarmaConfig(singleRun, browsers, browserTests, reporters),
+    karma: buildGruntKarmaConfig(singleRun, browserTests, reporters),
 
     replace: {
       snippets: {
@@ -188,7 +158,7 @@ module.exports = function(grunt) {
               return captures.join('\n');
             }
           },
-          // README travis link
+          // README CI link
           {
             from: new RegExp('(https://github\\.com/rollbar/rollbar\\.js/workflows/Rollbar\\.js%20CI/badge\\.svg\\?branch=v)([0-9a-zA-Z.-]+)'),
             to: function(match, index, fullText, captures) {

package/dist/rollbar.js

@@ -1416,6 +1416,9 @@ function Rollbar(options, client) {
     this.instrumenter.instrument();
   }
   _.setupJSON(polyfillJSON);
+
+  // Used with rollbar-react for rollbar-react-native compatibility.
+  this.rollbar = this;
 }
 
 var _instance = null;
@@ -4685,7 +4688,7 @@ module.exports = {
 
 
 module.exports = {
-  version: '2.26.1',
+  version: '2.26.3',
   endpoint: 'api.rollbar.com/api/1/item/',
   logLevel: 'debug',
   reportLevel: 'debug',
@@ -4787,8 +4790,8 @@ Telemeter.prototype.configure = function(options) {
   var maxTelemetryEvents = this.options.maxTelemetryEvents || MAX_EVENTS;
   var newMaxEvents = Math.max(0, Math.min(maxTelemetryEvents, MAX_EVENTS));
   var deleteCount = 0;
-  if (this.maxQueueSize > newMaxEvents) {
-    deleteCount = this.maxQueueSize - newMaxEvents;
+  if (this.queue.length > newMaxEvents) {
+    deleteCount = this.queue.length - newMaxEvents;
   }
   this.maxQueueSize = newMaxEvents;
   this.queue.splice(0, deleteCount);
@@ -5137,7 +5140,9 @@ Instrumenter.prototype.instrumentNetwork = function() {
     var xhrp = this._window.XMLHttpRequest.prototype;
     replace(xhrp, 'open', function(orig) {
       return function(method, url) {
-        if (_.isType(url, 'string')) {
+        var isUrlObject = _isUrlObject(url)
+        if (_.isType(url, 'string') || isUrlObject) {
+          url = isUrlObject ? url.toString() : url;
           if (this.__rollbar_xhr) {
             this.__rollbar_xhr.method = method;
             this.__rollbar_xhr.url = url;
@@ -5300,8 +5305,9 @@ Instrumenter.prototype.instrumentNetwork = function() {
         var input = args[0];
         var method = 'GET';
         var url;
-        if (_.isType(input, 'string')) {
-          url = input;
+        var isUrlObject = _isUrlObject(input)
+        if (_.isType(input, 'string') || isUrlObject) {
+          url = isUrlObject ? input.toString() : input;
         } else if (input) {
           url = input.url;
           if (input.method) {
@@ -5728,6 +5734,10 @@ Instrumenter.prototype.removeListeners = function(section) {
   }
 };
 
+function _isUrlObject(input) {
+  return typeof URL !== 'undefined' && input instanceof URL
+}
+
 module.exports = Instrumenter;