Merge branch 'master' into matux/prettier

.github/workflows/ci.yml

@@ -2,10 +2,10 @@ name: Rollbar.js CI
 
 on:
   push:
-    branches: [ master ]
-    tags: [ v* ]
+    branches: [master]
+    tags: [v*]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
@@ -15,15 +15,15 @@ jobs:
       matrix:
         include:
           - node: 14
-            npm: 8
+            npm: ^8
           - node: 16
-            npm: 8
+            npm: ^8
           - node: 18
-            npm: 9
+            npm: ^9
           - node: 20
-            npm: 10
-          - node: 21
-            npm: 10
+            npm: ^10
+          - node: latest
+            npm: latest
 
     steps:
       - name: Checkout
@@ -37,7 +37,7 @@ jobs:
           node-version: ${{ matrix.node }}
 
       - name: Update npm
-        run: npm install -g npm@^${{ matrix.npm }}
+        run: npm install -g npm@${{ matrix.npm }}
 
       - name: npm install
         run: npm install

src/browser/telemetry.js

@@ -1,5 +1,6 @@
 var _ = require('../utility');
 var headers = require('../utility/headers');
+var replace = require('../utility/replace');
 var scrub = require('../scrub');
 var urlparser = require('./url');
 var domUtil = require('./domUtility');
@@ -21,14 +22,6 @@ var defaults = {
   errorOnContentSecurityPolicy: false,
 };
 
-function replace(obj, name, replacement, replacements, type) {
-  var orig = obj[name];
-  obj[name] = replacement(orig);
-  if (replacements) {
-    replacements[type].push([obj, name, orig]);
-  }
-}
-
 function restore(replacements, type) {
   var b;
   while (replacements[type].length) {

src/server/telemetry.js

@@ -1,6 +1,7 @@
 var http = require('http');
 var https = require('https');
 var _ = require('../utility');
+var replace = require('../utility/replace');
 var urlHelpers = require('./telemetry/urlHelpers');
 
 var defaults = {
@@ -185,20 +186,6 @@ Instrumenter.prototype.instrumentConsole = function () {
   );
 };
 
-// TODO: These helpers are duplicated in src/browser/telemetry.js,
-// and may be candidates for extraction into a shared module.
-// It is recommended that before doing so, the author should allow
-// for more telemetry types to be implemented for the Node target
-// to ensure that the implementations of these helpers don't diverge.
-// If they do diverge, there's little point in the shared module.
-function replace(obj, name, replacement, replacements, type) {
-  var orig = obj[name];
-  obj[name] = replacement(orig);
-  if (replacements) {
-    replacements[type].push([obj, name, orig]);
-  }
-}
-
 function restore(replacements, type) {
   var b;
   while (replacements[type].length) {

src/utility/replace.js

@@ -0,0 +1,9 @@
+function replace(obj, name, replacement, replacements, type) {
+    var orig = obj[name];
+    obj[name] = replacement(orig);
+    if (replacements) {
+      replacements[type].push([obj, name, orig]);
+    }
+  }
+
+module.exports = replace;