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]')