Merge pull request #2412 from bugsnag/plat-12947-9

Ensure all changes are included in base

Author: gingerbenw

packages/browser/src/config.ts

@@ -1,24 +1,29 @@
 import { schema } from '@bugsnag/core'
-import assign from '@bugsnag/core/lib/es-utils/assign'
 import getPrefixedConsole from './get-prefixed-console'
 
 const config = {
-  releaseStage: assign({}, schema.releaseStage, {
-    defaultValue: () => {
-      if (/^localhost(:\d+)?$/.test(window.location.host)) return 'development'
-      return 'production'
+  releaseStage: {
+    ...schema.releaseStage, ...{
+      defaultValue: () => {
+        if (/^localhost(:\d+)?$/.test(window.location.host)) return 'development'
+        return 'production'
+      }
     }
-  }),
-  appType: assign({}, schema.appType, {
-    defaultValue: () => 'browser'
-  }),
-  logger: assign({}, schema.logger, {
-    defaultValue: () =>
-      // set logger based on browser capability
-      (typeof console !== 'undefined' && typeof console.debug === 'function')
-        ? getPrefixedConsole()
-        : undefined
-  })
+  },
+  appType: {
+    ...schema.appType, ...{
+      defaultValue: () => 'browser'
+    }
+  },
+  logger: {
+    ...schema.logger, ...{
+      defaultValue: () =>
+        // set logger based on browser capability
+        (typeof console !== 'undefined' && typeof console.debug === 'function')
+          ? getPrefixedConsole()
+          : undefined
+    }
+  }
 }
 
 export default config

packages/browser/src/get-prefixed-console.ts

@@ -1,11 +1,10 @@
-import map from '@bugsnag/core/lib/es-utils/map'
-
 type LoggerMethod = 'debug' | 'info' | 'warn' | 'error'
 
 const getPrefixedConsole = () => {
   const logger: Record<string, unknown> = {}
   const consoleLog = console.log
-  map(['debug', 'info', 'warn', 'error'], (method: LoggerMethod) => {
+  const loggerMethods = ['debug', 'info', 'warn', 'error'] as const
+  loggerMethods.map((method: LoggerMethod) => {
     const consoleMethod = console[method]
     logger[method] = typeof consoleMethod === 'function'
       ? consoleMethod.bind(console, '[bugsnag]')

packages/core/package.json

@@ -12,7 +12,6 @@
     "./lib/json-payload": "./src/lib/json-payload.js",
     "./lib/es-utils/assign": "./src/lib/es-utils/assign.js",
     "./lib/validators/int-range": "./src/lib/validators/int-range.js",
-    "./lib/es-utils/map": "./src/lib/es-utils/map.js",
     "./lib/es-utils/includes": "./src/lib/es-utils/includes.js",
     "./lib/es-utils/filter": "./src/lib/es-utils/filter.js",
     "./lib/iserror": "./src/lib/iserror.js",

packages/core/src/lib/es-utils/map.d.ts

@@ -1,4 +1,3 @@
-const map = require('./es-utils/map')
 const filter = require('./es-utils/filter')
 const isArray = require('./es-utils/is-array')
 const jsonStringify = require('@bugsnag/safe-json-stringify')
@@ -47,8 +46,7 @@ function merge (existingFeatures, newFeatures, existingFeatureKeys) {
 // by the Bugsnag Event API:
 //   [{ featureFlag: 'name', variant: 'variant' }, { featureFlag: 'name 2' }]
 function toEventApi (featureFlags) {
-  return map(
-    filter(featureFlags, Boolean),
+  return filter(featureFlags, Boolean).map(
     ({ name, variant }) => {
       const flag = { featureFlag: name }
 

packages/core/src/lib/es-utils/map.js

@@ -1,4 +1,3 @@
-import map from '../../src/lib/es-utils/map'
 import reduce from '../../src/lib/es-utils/reduce'
 import filter from '../../src/lib/es-utils/filter'
 import keys from '../../src/lib/es-utils/keys'
@@ -13,13 +12,6 @@ describe('es-utils', () => {
     })
   })
 
-  describe('map(arr, fn)', () => {
-    it('works with a variety of examples', () => {
-      expect(map(['a', 'b', 'c'], x => x)).toEqual(['a', 'b', 'c'])
-      expect(map(['a', 'b', 'c'], (x) => x.toUpperCase())).toEqual(['A', 'B', 'C'])
-    })
-  })
-
   describe('filter(arr, fn)', () => {
     it('works with a variety of examples', () => {
       const arr = ['a', 0, false, undefined, 1, 'undefined']

packages/core/src/lib/feature-flag-delegate.js

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/delivery.ts",
-  external: ['@bugsnag/core', '@bugsnag/core/lib/json-payload']
+  external: [/node_modules/]
 });

packages/core/test/lib/es-utils.test.ts

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/delivery.ts",
-  external: ['@bugsnag/core', '@bugsnag/core/lib/json-payload']
+  external: [/node_modules/]
 });

packages/delivery-x-domain-request/rollup.config.npm.mjs

@@ -1,11 +1,10 @@
-import map from '@bugsnag/core/lib/es-utils/map'
-
 type LoggerMethod = 'debug' | 'info' | 'warn' | 'error'
 
 const getPrefixedConsole = () => {
   const logger: Record<string, unknown> = {}
   const consoleLog = console.log
-  map(['debug', 'info', 'warn', 'error'], (method: LoggerMethod) => {
+  const loggerMethods = ['debug', 'info', 'warn', 'error'] as const
+  loggerMethods.map((method: LoggerMethod) => {
     const consoleMethod = console[method]
     logger[method] = typeof consoleMethod === 'function'
       ? consoleMethod.bind(console, '[bugsnag]')

packages/delivery-xml-http-request/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'
 
 export default createRollupConfig({
     input: 'src/app-duration.ts',
-    external: ['@bugsnag/core']
+    external: [/node_modules/]
 })

packages/node/src/get-prefixed-console.ts

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/context.ts",
-  external: ["@bugsnag/core"],
+  external: [/node_modules/]
 });

packages/plugin-app-duration/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'
 
 export default createRollupConfig({
     input: 'src/device.ts',
-    external: ['@bugsnag/core', '@bugsnag/cuid'],
+    external: [/node_modules/],
 })

packages/plugin-browser-context/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/request.ts",
-  external: ['@bugsnag/core', '@bugsnag/core/lib/es-utils/assign']
+  external: [/node_modules/],
 });

packages/plugin-browser-device/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/session.ts",
-  external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/includes"]
+  external: [/node_modules/],
 });

packages/plugin-browser-request/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/client-ip.ts",
-  external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/assign"]
+  external: [/node_modules/],
 });

packages/plugin-browser-session/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/console-breadcrumbs.ts",
-  external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/filter", "@bugsnag/core/lib/es-utils/map", "@bugsnag/core/lib/es-utils/reduce"]
+  external: [/node_modules/],
 });

packages/plugin-client-ip/rollup.config.npm.mjs

@@ -1,6 +1,5 @@
 import { Client, Config, Plugin } from '@bugsnag/core'
 import filter from '@bugsnag/core/lib/es-utils/filter'
-import map from '@bugsnag/core/lib/es-utils/map'
 import reduce from '@bugsnag/core/lib/es-utils/reduce'
 
 type ConsoleMethod = 'log' | 'debug' | 'info' | 'warn' | 'error'
@@ -23,7 +22,7 @@ const plugin: Plugin = {
 
     if (isDev || !(client as ClientWithInternals)._isBreadcrumbTypeEnabled('log')) return
 
-    map(CONSOLE_LOG_METHODS, method => {
+    CONSOLE_LOG_METHODS.map(method => {
       const original = console[method]
       console[method] = (...args: any) => {
         client.leaveBreadcrumb(

packages/plugin-console-breadcrumbs/rollup.config.npm.mjs

@@ -4,7 +4,6 @@ export default createRollupConfig({
     input: 'src/inline-script-content.ts',
     external: [
         '@bugsnag/core',
-        '@bugsnag/core/lib/es-utils/map',
         '@bugsnag/core/lib/es-utils/reduce',
         '@bugsnag/core/lib/es-utils/filter'
     ]

packages/plugin-console-breadcrumbs/src/console-breadcrumbs.ts

@@ -1,4 +1,3 @@
-import map from '@bugsnag/core/lib/es-utils/map'
 import reduce from '@bugsnag/core/lib/es-utils/reduce'
 import filter from '@bugsnag/core/lib/es-utils/filter'
 import { Client } from '@bugsnag/core'
@@ -96,12 +95,12 @@ export default (doc = document, win = window) => ({
 
     // Proxy all the timer functions whose callback is their 0th argument.
     // Keep a reference to the original setTimeout because we need it later
-    const [_setTimeout] = map([
+    const [_setTimeout] = [
       'setTimeout',
       'setInterval',
       'setImmediate',
       'requestAnimationFrame'
-    ], fn =>
+    ].map(fn =>
       __proxy(win, fn, original =>
         __traceOriginalScript(original, (args: any) => ({
           get: () => args[0],
@@ -112,13 +111,13 @@ export default (doc = document, win = window) => ({
     )
 
     // Proxy all the host objects whose prototypes have an addEventListener function
-    map([
-      'EventTarget', 'Window', 'Node', 'ApplicationCache', 'AudioTrackList', 'ChannelMergerNode',
-      'CryptoOperation', 'EventSource', 'FileReader', 'HTMLUnknownElement', 'IDBDatabase',
+    const eventListeners = ['EventTarget', 'Window', 'Node', 'ApplicationCache', 'AudioTrackList', 'ChannelMergerNode', 'CryptoOperation', 'EventSource', 'FileReader', 'HTMLUnknownElement', 'IDBDatabase',
       'IDBRequest', 'IDBTransaction', 'KeyOperation', 'MediaController', 'MessagePort', 'ModalWindow',
       'Notification', 'SVGElementInstance', 'Screen', 'TextTrack', 'TextTrackCue', 'TextTrackList',
       'WebSocket', 'WebSocketWorker', 'Worker', 'XMLHttpRequest', 'XMLHttpRequestEventTarget', 'XMLHttpRequestUpload'
-    ], o => {
+    ]
+    
+    eventListeners.map(o => {
       // @ts-expect-error Element implicitly has an 'any' type because index expression is not of type 'number'
       if (!win[o] || !win[o].prototype || !Object.prototype.hasOwnProperty.call(win[o].prototype, 'addEventListener')) return
       // @ts-expect-error Element implicitly has an 'any' type because index expression is not of type 'number'

packages/plugin-inline-script-content/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'
 
 export default createRollupConfig({
     input: 'src/interaction-breadcrumbs.ts',
-    external: ['@bugsnag/core']
+    external: [/node_modules/]
 })

packages/plugin-inline-script-content/src/inline-script-content.ts

@@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'
 
 export default createRollupConfig({
     input: 'src/navigation-breadcrumbs.ts',
-    external: ['@bugsnag/core']
+    external: [/node_modules/]
 })

packages/plugin-interaction-breadcrumbs/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/network-breadcrumbs.ts",
-  external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/includes"]
+  external: [/node_modules/],
 });

packages/plugin-navigation-breadcrumbs/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'
 
 export default createRollupConfig({
     input: 'src/throttle.ts',
-    external: ['@bugsnag/core', '@bugsnag/core/lib/validators/int-range']
+    external: [/node_modules/]
 })

packages/plugin-network-breadcrumbs/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";
 
 export default createRollupConfig({
   input: "src/strip-query-string.ts",
-  external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/map", "@bugsnag/core/lib/es-utils/reduce"]
+  external: [/node_modules/],
 });

packages/plugin-simple-throttle/rollup.config.npm.mjs

@@ -2,7 +2,6 @@
  * Remove query strings (and fragments) from stacktraces
  */
 import { Plugin, Stackframe } from '@bugsnag/core'
-import map from '@bugsnag/core/lib/es-utils/map'
 import reduce from '@bugsnag/core/lib/es-utils/reduce'
 
 const strip = (str: any) =>
@@ -18,7 +17,7 @@ const plugin: ExtendedPlugin = {
   load: (client) => {
     client.addOnError(event => {
       const allFrames: Stackframe[] = reduce(event.errors, (accum, er) => accum.concat(er.stacktrace), [])
-      map(allFrames, frame => {
+      allFrames.map(frame => {
         frame.file = strip(frame.file)
       })
     })

packages/plugin-strip-query-string/rollup.config.npm.mjs

@@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'
 
 export default createRollupConfig({
     input: 'src/onerror.ts',
-    external: ['@bugsnag/core']
+    external: [/node_modules/],
 })

packages/plugin-strip-query-string/src/strip-query-string.ts

@@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'
 
 export default createRollupConfig({
     input: 'src/unhandled-rejection.ts',
-    external: ['@bugsnag/core', '@bugsnag/core/lib/iserror', '@bugsnag/core/lib/es-utils/map']
+    external: [/node_modules/]
 })

packages/plugin-window-onerror/rollup.config.npm.mjs

@@ -1,5 +1,4 @@
 import { Config, Plugin } from '@bugsnag/core'
-import map from '@bugsnag/core/lib/es-utils/map'
 import isError from '@bugsnag/core/lib/iserror'
 import fixBluebirdStacktrace from './fix-bluebird-stacktrace'
 
@@ -45,7 +44,7 @@ export default (win = window): Plugin => {
         }, 'unhandledrejection handler', 1, client._logger)
 
         if (isBluebird) {
-          map(event.errors[0].stacktrace, fixBluebirdStacktrace(error))
+          event.errors[0].stacktrace.map(fixBluebirdStacktrace(error))
         }
 
         client._notify(event, (event) => {

packages/plugin-window-unhandled-rejection/rollup.config.npm.mjs

@@ -1,11 +1,10 @@
-import map from '@bugsnag/core/lib/es-utils/map'
-
 type LoggerMethod = 'debug' | 'info' | 'warn' | 'error'
 
 const getPrefixedConsole = () => {
   const logger: Record<string, unknown> = {}
   const consoleLog = console.log
-  map(['debug', 'info', 'warn', 'error'], (method: LoggerMethod) => {
+  const loggerMethods = ['debug', 'info', 'warn', 'error'] as const
+  loggerMethods.map((method: LoggerMethod) => {
     const consoleMethod = console[method]
     logger[method] = typeof consoleMethod === 'function'
       ? consoleMethod.bind(console, '[bugsnag]')