rollbar 3.0.0-beta.5 → 3.0.0

package/src/utility.js

@@ -1,5 +1,3 @@
-import merge from './merge.js';
-
 /*
  * isType - Given a Javascript value and a string, returns true if the type of the value matches the
  * given string.
@@ -72,8 +70,20 @@ function isNativeFunction(f) {
  * @returns true is value is an object function is an object)
  */
 function isObject(value) {
-  var type = typeof value;
-  return value != null && (type == 'object' || type == 'function');
+  return (
+    value != null && (typeof value == 'object' || typeof value == 'function')
+  );
+}
+
+/* hasOwn - safe helper around Object.hasOwnProperty */
+function hasOwn(obj, prop) {
+  if (obj == null) {
+    return false;
+  }
+  if (Object.hasOwn) {
+    return Object.hasOwn(obj, prop);
+  }
+  return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
 /* isString - Checks if the argument is a string
@@ -95,16 +105,6 @@ function isFiniteNumber(n) {
   return Number.isFinite(n);
 }
 
-/*
- * isDefined - a convenience function for checking if a value is not equal to undefined
- *
- * @param u - any value
- * @returns true if u is anything other than undefined
- */
-function isDefined(u) {
-  return !isType(u, 'undefined');
-}
-
 /*
  * isIterable - convenience function for checking if a value can be iterated, essentially
  * whether it is an object or an array.
@@ -156,7 +156,7 @@ function uuid4() {
   var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(
     /[xy]/g,
     function (c) {
-      var r = (d + Math.random() * 16) % 16 | 0;
+      var r = ((d + Math.random() * 16) % 16) | 0;
       d = Math.floor(d / 16);
       return (c === 'x' ? r : (r & 0x7) | 0x8).toString(16);
     },
@@ -226,9 +226,9 @@ var parseUriOptions = {
   },
   parser: {
     strict:
-      /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
+      /^(?:([^:/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:/?#]*)(?::(\d*))?))?((((?:[^?#/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
     loose:
-      /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/,
+      /^(?:(?![^:@]+:[^:@/]*@)([^:/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#/]*\.[^?#/.]+(?:[?#]|$)))*\/?)?([^?#/]*))(?:\?([^#]*))?(?:#(.*))?)/,
   },
 };
 
@@ -364,7 +364,7 @@ function jsonParse(s) {
   } catch (e) {
     error = e;
   }
-  return { error: error, value: value };
+  return { error, value };
 }
 
 function makeUnhandledStackInfo(
@@ -463,7 +463,11 @@ function createItem(args, logger, notifier, requestKeys, lambdaContext) {
       case 'undefined':
         break;
       case 'string':
-        message ? extraArgs.push(arg) : (message = arg);
+        if (message) {
+          extraArgs.push(arg);
+        } else {
+          message = arg;
+        }
         break;
       case 'function':
         callback = wrapCallback(logger, arg);
@@ -474,7 +478,11 @@ function createItem(args, logger, notifier, requestKeys, lambdaContext) {
       case 'error':
       case 'domexception':
       case 'exception': // Firefox Exception type
-        err ? extraArgs.push(arg) : (err = arg);
+        if (err) {
+          extraArgs.push(arg);
+        } else {
+          err = arg;
+        }
         break;
       case 'object':
       case 'array':
@@ -482,7 +490,11 @@ function createItem(args, logger, notifier, requestKeys, lambdaContext) {
           arg instanceof Error ||
           (typeof DOMException !== 'undefined' && arg instanceof DOMException)
         ) {
-          err ? extraArgs.push(arg) : (err = arg);
+          if (err) {
+            extraArgs.push(arg);
+          } else {
+            err = arg;
+          }
           break;
         }
         if (requestKeys && typ === 'object' && !request) {
@@ -496,14 +508,22 @@ function createItem(args, logger, notifier, requestKeys, lambdaContext) {
             break;
           }
         }
-        custom ? extraArgs.push(arg) : (custom = arg);
+        if (custom) {
+          extraArgs.push(arg);
+        } else {
+          custom = arg;
+        }
         break;
       default:
         if (
           arg instanceof Error ||
           (typeof DOMException !== 'undefined' && arg instanceof DOMException)
         ) {
-          err ? extraArgs.push(arg) : (err = arg);
+          if (err) {
+            extraArgs.push(arg);
+          } else {
+            err = arg;
+          }
           break;
         }
         extraArgs.push(arg);
@@ -560,9 +580,9 @@ function addErrorContext(item, errors) {
   var contextAdded = false;
 
   try {
-    for (var i = 0; i < errors.length; ++i) {
-      if (errors[i].hasOwnProperty('rollbarContext')) {
-        custom = merge(custom, nonCircularClone(errors[i].rollbarContext));
+    for (const error of errors) {
+      if (hasOwn(error, 'rollbarContext')) {
+        custom = merge(custom, nonCircularClone(error.rollbarContext));
         contextAdded = true;
       }
     }
@@ -587,8 +607,8 @@ var TELEMETRY_TYPES = [
 var TELEMETRY_LEVELS = ['critical', 'error', 'warning', 'info', 'debug'];
 
 function arrayIncludes(arr, val) {
-  for (var k = 0; k < arr.length; ++k) {
-    if (arr[k] === val) {
+  for (const entry of arr) {
+    if (entry === val) {
       return true;
     }
   }
@@ -656,7 +676,7 @@ function get(obj, path) {
     for (var i = 0, len = keys.length; i < len; ++i) {
       result = result[keys[i]];
     }
-  } catch (e) {
+  } catch (_e) {
     result = undefined;
   }
   return result;
@@ -688,7 +708,7 @@ function set(obj, path, value) {
     }
     temp[keys[len - 1]] = value;
     obj[keys[0]] = replacement;
-  } catch (e) {
+  } catch (_e) {
     return;
   }
 }
@@ -723,9 +743,9 @@ function formatArgsAsString(args) {
 
 function now() {
   if (Date.now) {
-    return +Date.now();
+    return Date.now();
   }
-  return +new Date();
+  return Number(new Date());
 }
 
 function filterIp(requestData, captureIp) {
@@ -757,7 +777,7 @@ function filterIp(requestData, captureIp) {
       } else {
         newIp = null;
       }
-    } catch (e) {
+    } catch (_e) {
       newIp = null;
     }
   }
@@ -790,6 +810,63 @@ function updateDeprecatedOptions(options, logger) {
   return options;
 }
 
+function merge() {
+  function isPlainObject(obj) {
+    if (!obj || Object.prototype.toString.call(obj) !== '[object Object]') {
+      return false;
+    }
+
+    var hasOwnConstructor = hasOwn(obj, 'constructor');
+    var hasIsPrototypeOf =
+      obj.constructor &&
+      obj.constructor.prototype &&
+      hasOwn(obj.constructor.prototype, 'isPrototypeOf');
+    // Not own constructor property must be Object
+    if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
+      return false;
+    }
+
+    // Own properties are enumerated firstly, so to speed up,
+    // if last one is own, then all properties are own.
+    var key;
+    for (key in obj) {
+      /**/
+    }
+
+    return typeof key === 'undefined' || hasOwn(obj, key);
+  }
+
+  var i,
+    src,
+    copy,
+    clone,
+    name,
+    result = Object.create(null), // no prototype pollution on Object
+    current = null,
+    length = arguments.length;
+
+  for (i = 0; i < length; i++) {
+    current = arguments[i];
+    if (current === null || current === undefined) {
+      continue;
+    }
+
+    for (name in current) {
+      src = result[name];
+      copy = current[name];
+      if (result !== copy) {
+        if (copy && isPlainObject(copy)) {
+          clone = src && isPlainObject(src) ? src : {};
+          result[name] = merge(clone, copy);
+        } else if (typeof copy !== 'undefined') {
+          result[name] = copy;
+        }
+      }
+    }
+  }
+  return result;
+}
+
 export {
   addParamsAndAccessTokenToPath,
   createItem,
@@ -804,6 +881,7 @@ export {
   isError,
   isFiniteNumber,
   isFunction,
+  hasOwn,
   isIterable,
   isNativeFunction,
   isObject,

package/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "es2021",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "allowJs": true,
+    "checkJs": false,
+    "noEmit": true,
+    "strict": false,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "types": []
+  },
+  "include": ["src", "scripts"],
+  "exclude": ["dist", "coverage", "examples", "node_modules"]
+}

package/tsconfig.test.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["mocha", "node", "sinon"],
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "allowImportingTsExtensions": true
+  },
+  "include": ["test", "src", "scripts"]
+}

package/{web-test-runner.config.mjs → web-test-runner.config.js}

@@ -1,15 +1,25 @@
+import { esbuildPlugin } from '@web/dev-server-esbuild';
 import { playwrightLauncher } from '@web/test-runner-playwright';
 
 export default {
   files: [
     'test/**/*.test.js',
+    'test/**/*.test.ts',
     // Exclude server and React Native tests
     '!test/server.*.test.js',
+    '!test/server.*.test.ts',
     '!test/react-native.*.test.js',
+    '!test/react-native.*.test.ts',
   ],
 
   nodeResolve: true,
 
+  plugins: [
+    esbuildPlugin({
+      ts: true,
+    }),
+  ],
+
   browsers: [
     playwrightLauncher({
       product: 'chromium',

package/{webpack.config.cjs → webpack.config.js}

@@ -1,17 +1,27 @@
-const extend = require('util')._extend;
-const path = require('path');
-const nodeExternals = require('webpack-node-externals');
-const TerserPlugin = require('terser-webpack-plugin');
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import TerserPlugin from 'terser-webpack-plugin';
+import nodeExternals from 'webpack-node-externals';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const extend = (target, ...sources) => Object.assign(target, ...sources);
 
 const outputPath = path.resolve(__dirname, 'dist');
 
+const resolveConfig = {
+  extensions: ['.ts', '.js', '.json', '.wasm'],
+};
+
 // Packages that need to be transpiled to ES5
-const needToTranspile = ['@rrweb', 'error-stack-parser-es'].join('|');
+const needToTranspile = ['@rrweb', 'error-stack-parser-es'];
 const excludePattern = new RegExp(
-  'node_modules/(?!(' + needToTranspile + ')/)',
+  `node_modules/(?!(${needToTranspile.join('|')})/)`,
 );
 
-const uglifyPlugin = new TerserPlugin({
+const terserPlugin = new TerserPlugin({
   parallel: true,
 });
 
@@ -24,11 +34,12 @@ const snippetConfig = {
     path: outputPath,
     filename: '[name].js',
   },
+  resolve: resolveConfig,
   target: ['web', 'es5'],
   module: {
     rules: [
       {
-        test: /\.m?js$/,
+        test: /\.m?[tj]s$/,
         loader: 'babel-loader',
         exclude: [excludePattern, /vendor/],
       },
@@ -42,14 +53,15 @@ const pluginConfig = {
     jquery: './src/browser/plugins/jquery.js',
   },
   output: {
-    path: outputPath + '/plugins/',
+    path: path.join(outputPath, 'plugins'),
     filename: '[name].min.js',
   },
+  resolve: resolveConfig,
   target: ['web', 'es5'],
   module: {
     rules: [
       {
-        test: /\.m?js$/,
+        test: /\.m?[tj]s$/,
         loader: 'babel-loader',
         exclude: [excludePattern, /vendor/],
       },
@@ -64,12 +76,13 @@ const vanillaConfigBase = {
   output: {
     path: outputPath,
   },
+  resolve: resolveConfig,
   target: ['web', 'es5'],
   devtool: 'hidden-source-map',
   module: {
     rules: [
       {
-        test: /\.m?js$/,
+        test: /\.m?[tj]s$/,
         loader: 'babel-loader',
         exclude: [excludePattern, /vendor/],
       },
@@ -88,12 +101,13 @@ const UMDConfigBase = {
     libraryExport: 'default',
     globalObject: 'this',
   },
+  resolve: resolveConfig,
   target: ['web', 'es5'],
   devtool: 'source-map',
   module: {
     rules: [
       {
-        test: /\.m?js$/,
+        test: /\.m?[tj]s$/,
         loader: 'babel-loader',
         exclude: [excludePattern, /vendor/],
       },
@@ -110,12 +124,13 @@ const serverCJSConfigBase = {
     libraryTarget: 'commonjs2',
     libraryExport: 'default',
   },
+  resolve: resolveConfig,
   target: 'node',
   externals: [nodeExternals()],
   module: {
     rules: [
       {
-        test: /\.m?js$/,
+        test: /\.m?[tj]s$/,
         loader: 'babel-loader',
         exclude: [excludePattern, /vendor/],
       },
@@ -157,7 +172,7 @@ const config = [snippetConfig, pluginConfig];
 
 function optimizationConfig(minimizer) {
   return {
-    minimize: minimizer ? true : false,
+    minimize: Boolean(minimizer),
     minimizer: minimizer ? [minimizer] : [],
   };
 }
@@ -170,7 +185,7 @@ function addVanillaToConfig(webpackConfig, filename, extraPlugins, minimizer) {
 
   vanillaConfig.optimization = optimizationConfig(minimizer);
 
-  vanillaConfig.output = extend({ filename: filename }, vanillaConfig.output);
+  vanillaConfig.output = extend({ filename }, vanillaConfig.output);
 
   webpackConfig.push(vanillaConfig);
 }
@@ -182,7 +197,7 @@ function addUMDToConfig(webpackConfig, filename, extraPlugins, minimizer) {
 
   UMDConfig.optimization = optimizationConfig(minimizer);
 
-  UMDConfig.output = extend({ filename: filename }, UMDConfig.output);
+  UMDConfig.output = extend({ filename }, UMDConfig.output);
 
   webpackConfig.push(UMDConfig);
 }
@@ -199,10 +214,7 @@ function addNoConflictToConfig(
 
   noConflictConfig.optimization = optimizationConfig(minimizer);
 
-  noConflictConfig.output = extend(
-    { filename: filename },
-    noConflictConfig.output,
-  );
+  noConflictConfig.output = extend({ filename }, noConflictConfig.output);
 
   webpackConfig.push(noConflictConfig);
 }
@@ -214,7 +226,7 @@ function addNamedAMDToConfig(webpackConfig, filename, extraPlugins, minimizer) {
 
   AMDConfig.optimization = optimizationConfig(minimizer);
 
-  AMDConfig.output = extend({ filename: filename }, AMDConfig.output);
+  AMDConfig.output = extend({ filename }, AMDConfig.output);
 
   webpackConfig.push(AMDConfig);
 }
@@ -236,7 +248,7 @@ function addVanillaReplayToConfig(
   replayConfig.name = filename;
   replayConfig.plugins = extraPlugins;
   replayConfig.optimization = optimizationConfig(minimizer);
-  replayConfig.output = extend({ filename: filename }, replayConfig.output);
+  replayConfig.output = extend({ filename }, replayConfig.output);
   webpackConfig.push(replayConfig);
 }
 
@@ -249,7 +261,7 @@ function addUMDReplayToConfig(
   const replayConfig = extend({}, UMDReplayConfigBase);
   replayConfig.plugins = extraPlugins;
   replayConfig.optimization = optimizationConfig(minimizer);
-  replayConfig.output = extend({ filename: filename }, replayConfig.output);
+  replayConfig.output = extend({ filename }, replayConfig.output);
   webpackConfig.push(replayConfig);
 }
 
@@ -262,7 +274,7 @@ function addNoConflictReplayToConfig(
   const replayConfig = extend({}, noConflictReplayConfigBase);
   replayConfig.plugins = extraPlugins;
   replayConfig.optimization = optimizationConfig(minimizer);
-  replayConfig.output = extend({ filename: filename }, replayConfig.output);
+  replayConfig.output = extend({ filename }, replayConfig.output);
   webpackConfig.push(replayConfig);
 }
 
@@ -281,9 +293,9 @@ function generateReplayBuildConfig(name, plugins, minimizer) {
 }
 
 generateBuildConfig('[name].js', []);
-generateBuildConfig('[name].min.js', [], uglifyPlugin);
+generateBuildConfig('[name].min.js', [], terserPlugin);
 
 generateReplayBuildConfig('[name].js', []);
-generateReplayBuildConfig('[name].min.js', [], uglifyPlugin);
+generateReplayBuildConfig('[name].min.js', [], terserPlugin);
 
-module.exports = config;
+export default config;

package/.eslintrc

@@ -1,27 +0,0 @@
-{
-  "parser": "babel-eslint",
-  "extends": "eslint:recommended",
-  "parserOptions": {
-    "ecmafeatures": {
-      "modules": true,
-    },
-  },
-  "env": {
-    // I write for browser
-    "browser": true,
-    // in CommonJS
-    "node": true,
-  },
-  "globals": { "Promise": true },
-  "rules": {
-    "strict": 0,
-    "camelcase": [2, { "properties": "never" }],
-    "quotes": [2, "single", "avoid-escape"],
-    "no-underscore-dangle": 0,
-    "no-useless-escape": 0,
-    "complexity": [2, { "max": 35 }],
-    "no-use-before-define": [0, { "functions": false }],
-    "no-unused-vars": [2, { "argsIgnorePattern": "^_" }],
-    "no-prototype-builtins": 0
-  }
-}

package/eslint.config.mjs

@@ -1,33 +0,0 @@
-import babelParser from '@babel/eslint-parser';
-import { defineConfig } from 'eslint/config';
-
-export default defineConfig([
-  {
-    files: ['**/*.js', '**/*.mjs'],
-    languageOptions: {
-      ecmaVersion: 2021,
-      sourceType: 'module',
-      parser: babelParser,
-      parserOptions: {
-        ecmaVersion: 2021,
-      },
-    },
-    rules: {
-      'comma-dangle': 'off',
-      strict: 0,
-      'no-underscore-dangle': 0,
-      'no-useless-escape': 0,
-      complexity: [2, { max: 35 }],
-      'no-use-before-define': [0, { functions: false }],
-      'no-prototype-builtins': 0,
-
-      // Off until issues are fixed
-      camelcase: 'off', //[2, {'properties': 'never'}],
-      'no-unused-vars': 'off', //[2, { 'argsIgnorePattern': '^_' }],
-      quotes: 'off', //[2, 'single', 'avoid-escape'],
-    },
-  },
-  {
-    ignores: ['dist', 'examples', 'node_modules', 'vendor'],
-  },
-]);

package/src/merge.js

@@ -1,61 +0,0 @@
-var hasOwn = Object.prototype.hasOwnProperty;
-var toStr = Object.prototype.toString;
-
-var isPlainObject = function isPlainObject(obj) {
-  if (!obj || toStr.call(obj) !== '[object Object]') {
-    return false;
-  }
-
-  var hasOwnConstructor = hasOwn.call(obj, 'constructor');
-  var hasIsPrototypeOf =
-    obj.constructor &&
-    obj.constructor.prototype &&
-    hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
-  // Not own constructor property must be Object
-  if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
-    return false;
-  }
-
-  // Own properties are enumerated firstly, so to speed up,
-  // if last one is own, then all properties are own.
-  var key;
-  for (key in obj) {
-    /**/
-  }
-
-  return typeof key === 'undefined' || hasOwn.call(obj, key);
-};
-
-function merge() {
-  var i,
-    src,
-    copy,
-    clone,
-    name,
-    result = Object.create(null), // no prototype pollution on Object
-    current = null,
-    length = arguments.length;
-
-  for (i = 0; i < length; i++) {
-    current = arguments[i];
-    if (current == null) {
-      continue;
-    }
-
-    for (name in current) {
-      src = result[name];
-      copy = current[name];
-      if (result !== copy) {
-        if (copy && isPlainObject(copy)) {
-          clone = src && isPlainObject(src) ? src : {};
-          result[name] = merge(clone, copy);
-        } else if (typeof copy !== 'undefined') {
-          result[name] = copy;
-        }
-      }
-    }
-  }
-  return result;
-}
-
-export default merge;