Skip to content

Commit

Permalink
Merge pull request #2316 from bugsnag/plat-12947-5
Browse files Browse the repository at this point in the history
drop @bugsnag/core/breadcrumb export
  • Loading branch information
djskinner authored Feb 13, 2025
2 parents 7c5083b + b8c07a9 commit 35e8daf
Show file tree
Hide file tree
Showing 38 changed files with 47 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .rollup/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function createRollupConfig (options = defaultOptions()) {
format: 'esm'
}
],
external: ['@bugsnag/core'].concat(options.external),
external: options.external,
plugins: [
replace({
preventAssignment: true,
Expand Down
3 changes: 2 additions & 1 deletion packages/browser/src/index-cjs.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Client from '@bugsnag/core/client'
import Event from '@bugsnag/core/event'
import Session from '@bugsnag/core/session'
import Breadcrumb from '@bugsnag/core/breadcrumb'

import { Breadcrumb } from '@bugsnag/core'

import assign from '@bugsnag/core/lib/es-utils/assign'

Expand Down
3 changes: 2 additions & 1 deletion packages/browser/src/index-umd.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Client from '@bugsnag/core/client'
import Event from '@bugsnag/core/event'
import Session from '@bugsnag/core/session'
import Breadcrumb from '@bugsnag/core/breadcrumb'

import { Breadcrumb } from '@bugsnag/core'

import assign from '@bugsnag/core/lib/es-utils/assign'

Expand Down
5 changes: 2 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bugsnag/core",
"main": "src/index.js",
"main": "./dist/index.cjs",
"version": "8.2.0",
"types": "types/index.d.ts",
"exports": {
Expand Down Expand Up @@ -40,8 +40,7 @@
"default": "./src/event.js",
"types": "./src/event.d.ts"
},
"./session": "./src/session.js",
"./breadcrumb": "./src/breadcrumb.js"
"./session": "./src/session.js"
},
"description": "Core classes and utilities for Bugsnag notifiers",
"homepage": "https://www.bugsnag.com/",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const plugins = [
]

const external = [
// '@bugsnag/cuid',
'@bugsnag/cuid',
]

export default [
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/breadcrumb.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Breadcrumb from '../src/breadcrumb'

describe('@bugsnag/core/breadcrumb', () => {
describe('Breadcrumb', () => {
describe('toJSON()', () => {
it('returns the correct data structure', () => {
const d = new Date()
Expand Down
1 change: 1 addition & 0 deletions packages/core/types/breadcrumb.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { BreadcrumbType } from './common'

declare class Breadcrumb {
public constructor(message: string, metadata: { [key: string]: any }, type: BreadcrumbType, timestamp?: Date)
public message: string;
public metadata: { [key: string]: any };
public type: BreadcrumbType;
Expand Down
2 changes: 1 addition & 1 deletion packages/delivery-x-domain-request/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/delivery.ts",
external: ['@bugsnag/core/lib/json-payload']
external: ['@bugsnag/core', '@bugsnag/core/lib/json-payload']
});
2 changes: 1 addition & 1 deletion packages/delivery-xml-http-request/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/delivery.ts",
external: ['@bugsnag/core/lib/json-payload']
external: ['@bugsnag/core', '@bugsnag/core/lib/json-payload']
});
2 changes: 1 addition & 1 deletion packages/electron/src/client/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const electron = require('electron')

const Client = require('@bugsnag/core/client')
const Event = require('@bugsnag/core/event')
const Breadcrumb = require('@bugsnag/core/breadcrumb')
const { Breadcrumb } = require('@bugsnag/core')
const Session = require('@bugsnag/core/session')
const {
plugin: PluginClientStatePersistence,
Expand Down
2 changes: 1 addition & 1 deletion packages/electron/src/client/renderer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const Client = require('@bugsnag/core/client')
const Event = require('@bugsnag/core/event')
const Breadcrumb = require('@bugsnag/core/breadcrumb')
const { Breadcrumb } = require('@bugsnag/core')
const Session = require('@bugsnag/core/session')

const createClient = require('./createClient')
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/index-cjs.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Client from '@bugsnag/core/client'
import Event from '@bugsnag/core/event'
import Session from '@bugsnag/core/session'
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'

import assign from '@bugsnag/core/lib/es-utils/assign'

Expand Down
3 changes: 2 additions & 1 deletion packages/plugin-app-duration/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import createRollupConfig from '../../.rollup/index.mjs'

export default createRollupConfig({
input: 'src/app-duration.ts'
input: 'src/app-duration.ts',
external: ['@bugsnag/core']
})
3 changes: 2 additions & 1 deletion packages/plugin-browser-context/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/context.ts"
input: "src/context.ts",
external: ["@bugsnag/core"],
});
2 changes: 1 addition & 1 deletion packages/plugin-browser-device/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'

export default createRollupConfig({
input: 'src/device.ts',
external: ['@bugsnag/cuid'],
external: ['@bugsnag/core', '@bugsnag/cuid'],
})
2 changes: 1 addition & 1 deletion packages/plugin-browser-request/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/request.ts",
external: ['@bugsnag/core/lib/es-utils/assign']
external: ['@bugsnag/core', '@bugsnag/core/lib/es-utils/assign']
});
2 changes: 1 addition & 1 deletion packages/plugin-browser-session/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/session.ts",
external: ["@bugsnag/core/lib/es-utils/includes"]
external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/includes"]
});
2 changes: 1 addition & 1 deletion packages/plugin-client-ip/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/client-ip.ts",
external: ["@bugsnag/core/lib/es-utils/assign"]
external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/assign"]
});
2 changes: 1 addition & 1 deletion packages/plugin-console-breadcrumbs/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/console-breadcrumbs.ts",
external: ["@bugsnag/core/lib/es-utils/filter", "@bugsnag/core/lib/es-utils/map", "@bugsnag/core/lib/es-utils/reduce"]
external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/filter", "@bugsnag/core/lib/es-utils/map", "@bugsnag/core/lib/es-utils/reduce"]
});
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'
import Client from '@bugsnag/core/client'
import { makeApp, makeBrowserWindow } from '@bugsnag/electron-test-helpers'
import plugin from '../'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const Event = require('@bugsnag/core/event')
const Session = require('@bugsnag/core/session')
const Breadcrumb = require('@bugsnag/core/breadcrumb')
const { Breadcrumb } = require('@bugsnag/core')

const supportedProperties = [
'app',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import EventEmitter from 'events'
import Session from '@bugsnag/core/session'
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'
import NetworkStatus from '@bugsnag/electron-network-status'
import MinidumpDeliveryLoop from '../minidump-loop'

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-electron-ipc/bugsnag-ipc-main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const Event = require('@bugsnag/core/event')
const Breadcrumb = require('@bugsnag/core/breadcrumb')
const { Breadcrumb } = require('@bugsnag/core')
const runCallbacks = require('@bugsnag/core/lib/callback-runner')
const featureFlagDelegate = require('@bugsnag/core/lib/feature-flag-delegate')

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import BugsnagIpcRenderer from '../bugsnag-ipc-renderer'
import { CHANNEL_RENDERER_TO_MAIN, CHANNEL_RENDERER_TO_MAIN_SYNC } from '../lib/constants'
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'

import * as electron from 'electron'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'
import { net } from 'electron'
import { AddressInfo } from 'net'
import { createServer, STATUS_CODES, Server, IncomingMessage, ServerResponse } from 'http'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { PowerMonitorEvent } from '@bugsnag/electron-test-helpers/src/PowerMonitor'
import { makePowerMonitor, makeClientForPlugin } from '@bugsnag/electron-test-helpers'
import plugin from '../'
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'

describe('plugin: electron power monitor breadcrumbs', () => {
const events: Array<[PowerMonitorEvent, string]> = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { makeClientForPlugin } from '@bugsnag/electron-test-helpers'
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'
import plugin from '../'

describe('plugin: electron renderer event data', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'
import { makeClientForPlugin, makeDisplay, makeScreen } from '@bugsnag/electron-test-helpers'
import plugin from '../'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import createRollupConfig from '../../.rollup/index.mjs'

export default createRollupConfig({
input: 'src/interaction-breadcrumbs.ts'
input: 'src/interaction-breadcrumbs.ts',
external: ['@bugsnag/core']
})
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import plugin from '../src/interaction-breadcrumbs'

import Client from '@bugsnag/core/client'
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb, Client } from '@bugsnag/core'

const lotsOfWhitespace = ' '.repeat(100000)
const lotsOfText = 'a'.repeat(100000)
Expand Down Expand Up @@ -54,12 +53,10 @@ describe('plugin: interaction breadcrumbs', () => {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
document.querySelector('button')!.click()

// TODO: targetSelector should be 'BUTTON.button' but for some reason seems to be ' > HTML:nth-child(2) > BODY:nth-child(2) > DIV > BUTTON.button'
// SEE PLAT-12831
expect(c._breadcrumbs).toStrictEqual([
new Breadcrumb(
'UI click',
{ targetText: 'Click me', targetSelector: expect.stringContaining('BUTTON.button') },
{ targetText: 'Click me', targetSelector: 'BUTTON.button' },
'user',
expect.any(Date)
)
Expand Down
3 changes: 2 additions & 1 deletion packages/plugin-navigation-breadcrumbs/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import createRollupConfig from '../../.rollup/index.mjs'

export default createRollupConfig({
input: 'src/navigation-breadcrumbs.ts'
input: 'src/navigation-breadcrumbs.ts',
external: ['@bugsnag/core']
})
2 changes: 1 addition & 1 deletion packages/plugin-network-breadcrumbs/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/network-breadcrumbs.ts",
external: ["@bugsnag/core/lib/es-utils/includes"]
external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/includes"]
});
2 changes: 1 addition & 1 deletion packages/plugin-simple-throttle/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'

export default createRollupConfig({
input: 'src/throttle.ts',
external: ['@bugsnag/core/lib/validators/int-range']
external: ['@bugsnag/core', '@bugsnag/core/lib/validators/int-range']
})
2 changes: 1 addition & 1 deletion packages/plugin-strip-query-string/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from "../../.rollup/index.mjs";

export default createRollupConfig({
input: "src/strip-query-string.ts",
external: ["@bugsnag/core/lib/es-utils/map", "@bugsnag/core/lib/es-utils/reduce"]
external: ['@bugsnag/core', "@bugsnag/core/lib/es-utils/map", "@bugsnag/core/lib/es-utils/reduce"]
});
3 changes: 2 additions & 1 deletion packages/plugin-window-onerror/rollup.config.npm.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import createRollupConfig from '../../.rollup/index.mjs'

export default createRollupConfig({
input: 'src/onerror.ts'
input: 'src/onerror.ts',
external: ['@bugsnag/core']
})
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import createRollupConfig from '../../.rollup/index.mjs'

export default createRollupConfig({
input: 'src/unhandled-rejection.ts',
external: ['@bugsnag/core/lib/iserror', '@bugsnag/core/lib/es-utils/map']
external: ['@bugsnag/core', '@bugsnag/core/lib/iserror', '@bugsnag/core/lib/es-utils/map']
})
2 changes: 1 addition & 1 deletion packages/react-native/src/notifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const React = require('react')
const Client = require('@bugsnag/core/client')
const Event = require('@bugsnag/core/event')
const Session = require('@bugsnag/core/session')
const Breadcrumb = require('@bugsnag/core/breadcrumb')
const { Breadcrumb } = require('@bugsnag/core')

Event.__type = 'reactnativejs'

Expand Down
2 changes: 1 addition & 1 deletion packages/web-worker/src/index-umd.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Client from '@bugsnag/core/client'
import Event from '@bugsnag/core/event'
import Session from '@bugsnag/core/session'
import Breadcrumb from '@bugsnag/core/breadcrumb'
import { Breadcrumb } from '@bugsnag/core'

import assign from '@bugsnag/core/lib/es-utils/assign'

Expand Down

0 comments on commit 35e8daf

Please sign in to comment.