refactor additional packages

Author: gingerbenw

package.json

@@ -12,6 +12,7 @@
     "@babel/plugin-transform-destructuring": "^7.23.3",
     "@babel/plugin-transform-member-expression-literals": "^7.23.3",
     "@babel/plugin-transform-modules-commonjs": "^7.23.3",
+    "@babel/plugin-transform-object-assign": "^7.27.1",
     "@babel/plugin-transform-parameters": "^7.23.3",
     "@babel/plugin-transform-property-literals": "^7.23.3",
     "@babel/plugin-transform-shorthand-properties": "^7.23.3",
@@ -21,29 +22,24 @@
     "@babel/preset-typescript": "^7.23.3",
     "@cucumber/cucumber": "^7.2.1",
     "@jest-runner/electron": "^3.0.1",
+    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@rollup/plugin-replace": "^6.0.1",
+    "@rollup/plugin-typescript": "^12.1.0",
     "@types/jest": "^26.0.14",
     "@types/ncp": "^2.0.4",
-    "@types/node": "^13.7.1",
     "@types/node-fetch": "^2.5.7",
     "@types/react": "^16.9.49",
     "@types/react-dom": "^16.9.16",
     "@types/react-native": "0.67.8",
     "@types/react-test-renderer": "^16.9.3",
     "@types/rimraf": "^3.0.0",
     "@types/uuid": "^8.3.0",
-    "@typescript-eslint/eslint-plugin": "^2.19.2",
-    "@typescript-eslint/parser": "^2.19.2",
     "aws-sdk": "^2.1303.0",
     "babel-jest": "^29.7.0",
-    "babelify": "^10.0.0",
-    "browser-pack-flat": "^3.2.0",
-    "browserify": "^17.0.1",
-    "browserify-versionify": "^1.0.6",
     "coverage-diff": "^1.6.0",
-    "cross-env": "^7.0.3",
     "electron": "*",
     "envify": "^4.1.0",
-    "eslint": "^6.8.0",
     "eslint-config-standard": "^14.1.0",
     "eslint-config-standard-with-typescript": "^13.0.0",
     "eslint-plugin-import": "^2.20.1",
@@ -56,30 +52,32 @@
     "form-data": "^4.0.4",
     "formidable": "^1.2.2",
     "glob": "^7.1.6",
+    "globals": "^15.14.0",
     "jest": "^26.4.2",
     "lerna": "^8.1.8",
     "metro-react-native-babel-preset": "^0.58.0",
     "ncp": "^2.0.0",
+    "pkg-up": "3.1.0",
     "playwright": "^1.10.0",
-    "proxyquire": "^2.1.3",
     "ps-list": "^7.2.0",
     "react": "^16.13.1",
-    "react-native": "^0.63.4",
     "react-test-renderer": "^16.13.1",
     "rimraf": "^3.0.0",
+    "rollup": "^4.24.0",
     "semver": "^5.5.1",
     "source-map": "^0.5.7",
     "timekeeper": "^2.2.0",
     "ts-node": "^9.1.1",
-    "typescript": "^3.9.7",
+    "typescript-eslint": "^8.22.0",
+    "typescript": "^4.8.4",
     "uglify-js": "^3.15.1",
     "verdaccio": "^6.0.5",
     "xvfb-maybe": "^0.2.1"
   },
   "scripts": {
     "build": "lerna run build",
     "build:electron": "lerna run build --scope '@bugsnag/plugin-electron-ipc' --scope '@bugsnag/plugin-electron-app' --scope '@bugsnag/plugin-electron-client-state-persistence'",
-    "test:lint": "eslint --ext .ts,.js --report-unused-disable-directives --max-warnings=0 .",
+    "test:lint": "eslint --report-unused-disable-directives .",
     "test:lint-native": "bash scripts/cppcheck.sh",
     "test:unit:electron-runner": "xvfb-maybe --auto-servernum -- jest -c config/electron-jest.config.js --rootDir .",
     "test:unit": "xvfb-maybe --auto-servernum -- jest",
@@ -101,6 +99,7 @@
     },
     "@types/babel__traverse": "7.17.1",
     "@types/express-serve-static-core": "4.17.28",
+    "@types/node": "^18",
     "@types/prettier": "2.6.0",
     "@types/yargs": "17.0.10",
     "braces": "^3.0.3",

packages/delivery-fetch/delivery.d.ts

@@ -1,6 +1,9 @@
-import type { Client } from '@bugsnag/core'
-import type { Delivery } from '@bugsnag/core/client'
+/// <reference lib="webworker" />
 
-declare const delivery: (client: Client, fetch?: GlobalFetch['fetch']) => Delivery
+import type { Client, Delivery } from '@bugsnag/core'
+
+type Fetch = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>
+
+declare const delivery: (client: Client, fetch?: Fetch, windowOrWorkerGlobalScope?: Window | ServiceWorkerGlobalScope) => Delivery
 
 export default delivery

packages/delivery-fetch/delivery.js

@@ -1,4 +1,4 @@
-import payload from '@bugsnag/core/lib/json-payload'
+import * as jsonPayload from '@bugsnag/json-payload'
 
 function getIntegrityHeaderValue (sendPayloadChecksums, windowOrWorkerGlobalScope, requestBody, headers) {
   if (sendPayloadChecksums && windowOrWorkerGlobalScope.isSecureContext && windowOrWorkerGlobalScope.crypto && windowOrWorkerGlobalScope.crypto.subtle && windowOrWorkerGlobalScope.crypto.subtle.digest && typeof TextEncoder === 'function') {
@@ -20,7 +20,7 @@ const delivery = (client, fetch = global.fetch, windowOrWorkerGlobalScope = wind
   sendEvent: (event, cb = () => {}) => {
     const url = client._config.endpoints.notify
 
-    const body = payload.event(event, client._config.redactedKeys)
+    const body = jsonPayload.event(event, client._config.redactedKeys)
 
     getIntegrityHeaderValue(client._config.sendPayloadChecksums, windowOrWorkerGlobalScope, body).then(integrityHeaderValue => {
       const headers = {
@@ -49,7 +49,7 @@ const delivery = (client, fetch = global.fetch, windowOrWorkerGlobalScope = wind
   sendSession: (session, cb = () => { }) => {
     const url = client._config.endpoints.sessions
 
-    const body = payload.session(session, client._config.redactedKeys)
+    const body = jsonPayload.session(session, client._config.redactedKeys)
 
     getIntegrityHeaderValue(client._config.sendPayloadChecksums, windowOrWorkerGlobalScope, body).then((integrityHeaderValue) => {
       const headers = {

packages/delivery-fetch/package.json

@@ -13,10 +13,10 @@
         "access": "public"
     },
     "license": "MIT",
+    "dependencies": {
+        "@bugsnag/json-payload": "^8.4.0"
+    },
     "devDependencies": {
         "@bugsnag/core": "^8.4.0"
-    },
-    "peerDependencies": {
-        "@bugsnag/core": "^8.0.0"
     }
 }

packages/delivery-fetch/test/delivery.test.ts

@@ -1,6 +1,5 @@
 import delivery from '../delivery'
-import type { Client } from '@bugsnag/core'
-import type { EventDeliveryPayload, SessionDeliveryPayload } from '@bugsnag/core/client'
+import type { Client, EventDeliveryPayload, SessionDeliveryPayload } from '@bugsnag/core'
 
 const globalAny: any = global
 

packages/delivery-node/delivery.d.ts

@@ -1,5 +1,4 @@
-import { Delivery } from '@bugsnag/core/client'
-import { Client } from '@bugsnag/core'
+import { Client, Delivery } from '@bugsnag/core'
 
 declare const delivery: (client: Client) => Delivery
 

packages/delivery-node/delivery.js

@@ -1,9 +1,9 @@
-const payload = require('@bugsnag/core/lib/json-payload')
+const jsonPayload = require('@bugsnag/json-payload')
 const request = require('./request')
 
 module.exports = (client) => ({
   sendEvent: (event, cb = () => {}) => {
-    const body = payload.event(event, client._config.redactedKeys)
+    const body = jsonPayload.event(event, client._config.redactedKeys)
 
     const _cb = err => {
       if (err) client._logger.error(`Event failed to send…\n${(err && err.stack) ? err.stack : err}`, err)
@@ -54,7 +54,7 @@ module.exports = (client) => ({
           'Bugsnag-Payload-Version': '1',
           'Bugsnag-Sent-At': (new Date()).toISOString()
         },
-        body: payload.session(session, client._config.redactedKeys),
+        body: jsonPayload.session(session, client._config.redactedKeys),
         agent: client._config.agent
       }, err => _cb(err))
     } catch (e) {

packages/delivery-node/package.json

@@ -19,7 +19,7 @@
   "devDependencies": {
     "@bugsnag/core": "^8.4.0"
   },
-  "peerDependencies": {
-    "@bugsnag/core": "^8.0.0"
+  "dependencies": {
+    "@bugsnag/json-payload": "^8.4.0"
   }
 }

packages/delivery-node/request.js

@@ -1,6 +1,5 @@
 const http = require('http')
 const https = require('https')
-// eslint-disable-next-line node/no-deprecated-api
 const { parse } = require('url')
 
 module.exports = ({ url, headers, body, agent }, cb) => {

packages/delivery-node/test/delivery.test.ts

@@ -1,8 +1,7 @@
 import delivery from '../'
 import http from 'http'
-import { Client } from '@bugsnag/core'
-import { EventDeliveryPayload, SessionDeliveryPayload } from '@bugsnag/core/client'
-import { AddressInfo } from 'net'
+import type { Client, EventDeliveryPayload, SessionDeliveryPayload } from '@bugsnag/core'
+import type { AddressInfo } from 'net'
 
 interface Request {
   url?: string