diff --git a/packages/browser/src/feedback.ts b/packages/browser/src/feedbackSync.ts similarity index 86% rename from packages/browser/src/feedback.ts rename to packages/browser/src/feedbackSync.ts index 2e959da9817d..b99c9a4b752f 100644 --- a/packages/browser/src/feedback.ts +++ b/packages/browser/src/feedbackSync.ts @@ -6,7 +6,7 @@ import { import { lazyLoadIntegration } from './utils/lazyLoadIntegration'; /** Add a widget to capture user feedback to your application. */ -export const feedbackIntegration = buildFeedbackIntegration({ +export const feedbackSyncIntegration = buildFeedbackIntegration({ lazyLoadIntegration, getModalIntegration: () => feedbackModalIntegration, getScreenshotIntegration: () => feedbackScreenshotIntegration, diff --git a/packages/browser/src/index.bundle.feedback.ts b/packages/browser/src/index.bundle.feedback.ts index eacbd0fb89c4..eecad6304ebf 100644 --- a/packages/browser/src/index.bundle.feedback.ts +++ b/packages/browser/src/index.bundle.feedback.ts @@ -1,8 +1,13 @@ import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims'; +import { feedbackAsyncIntegration } from './feedbackAsync'; export * from './index.bundle.base'; -export { feedbackIntegration } from './feedback'; export { getFeedback } from '@sentry-internal/feedback'; -export { browserTracingIntegrationShim as browserTracingIntegration, replayIntegrationShim as replayIntegration }; +export { + browserTracingIntegrationShim as browserTracingIntegration, + feedbackAsyncIntegration as feedbackAsyncIntegration, + feedbackAsyncIntegration as feedbackIntegration, + replayIntegrationShim as replayIntegration, +}; diff --git a/packages/browser/src/index.bundle.replay.ts b/packages/browser/src/index.bundle.replay.ts index c2d267a5227d..1a538a97162f 100644 --- a/packages/browser/src/index.bundle.replay.ts +++ b/packages/browser/src/index.bundle.replay.ts @@ -4,4 +4,8 @@ export * from './index.bundle.base'; export { replayIntegration } from '@sentry-internal/replay'; -export { browserTracingIntegrationShim as browserTracingIntegration, feedbackIntegrationShim as feedbackIntegration }; +export { + browserTracingIntegrationShim as browserTracingIntegration, + feedbackIntegrationShim as feedbackAsyncIntegration, + feedbackIntegrationShim as feedbackIntegration, +}; diff --git a/packages/browser/src/index.bundle.tracing.replay.feedback.ts b/packages/browser/src/index.bundle.tracing.replay.feedback.ts index 8e31dba14027..194a387bf4c4 100644 --- a/packages/browser/src/index.bundle.tracing.replay.feedback.ts +++ b/packages/browser/src/index.bundle.tracing.replay.feedback.ts @@ -15,13 +15,14 @@ export { setMeasurement, } from '@sentry/core'; -export { feedbackIntegration } from './feedback'; -export { getFeedback } from '@sentry-internal/feedback'; - export { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, } from './tracing/browserTracingIntegration'; +import { feedbackAsyncIntegration } from './feedbackAsync'; +export { getFeedback } from '@sentry-internal/feedback'; +export { feedbackAsyncIntegration as feedbackAsyncIntegration, feedbackAsyncIntegration as feedbackIntegration }; + export { replayIntegration } from '@sentry-internal/replay'; diff --git a/packages/browser/src/index.bundle.tracing.replay.ts b/packages/browser/src/index.bundle.tracing.replay.ts index f103fa297ace..3b8a51e661dc 100644 --- a/packages/browser/src/index.bundle.tracing.replay.ts +++ b/packages/browser/src/index.bundle.tracing.replay.ts @@ -1,4 +1,3 @@ -import { feedbackIntegrationShim } from '@sentry-internal/integration-shims'; import { registerSpanErrorInstrumentation } from '@sentry/core'; registerSpanErrorInstrumentation(); @@ -22,6 +21,7 @@ export { startBrowserTracingPageLoadSpan, } from './tracing/browserTracingIntegration'; -export { feedbackIntegrationShim as feedbackIntegration }; +import { feedbackIntegrationShim } from '@sentry-internal/integration-shims'; +export { feedbackIntegrationShim as feedbackAsyncIntegration, feedbackIntegrationShim as feedbackIntegration }; export { replayIntegration } from '@sentry-internal/replay'; diff --git a/packages/browser/src/index.bundle.tracing.ts b/packages/browser/src/index.bundle.tracing.ts index 9af45dfa8572..e93bf68994e3 100644 --- a/packages/browser/src/index.bundle.tracing.ts +++ b/packages/browser/src/index.bundle.tracing.ts @@ -22,4 +22,8 @@ export { startBrowserTracingPageLoadSpan, } from './tracing/browserTracingIntegration'; -export { feedbackIntegrationShim as feedbackIntegration, replayIntegrationShim as replayIntegration }; +export { + feedbackIntegrationShim as feedbackAsyncIntegration, + feedbackIntegrationShim as feedbackIntegration, + replayIntegrationShim as replayIntegration, +}; diff --git a/packages/browser/src/index.bundle.ts b/packages/browser/src/index.bundle.ts index f24e98b4f6db..5004b376cd46 100644 --- a/packages/browser/src/index.bundle.ts +++ b/packages/browser/src/index.bundle.ts @@ -8,6 +8,7 @@ export * from './index.bundle.base'; export { browserTracingIntegrationShim as browserTracingIntegration, + feedbackIntegrationShim as feedbackAsyncIntegration, feedbackIntegrationShim as feedbackIntegration, replayIntegrationShim as replayIntegration, }; diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts index d5e905ff568c..23b042ca8e09 100644 --- a/packages/browser/src/index.ts +++ b/packages/browser/src/index.ts @@ -30,8 +30,9 @@ export type { export { replayCanvasIntegration } from '@sentry-internal/replay-canvas'; -export { feedbackIntegration } from './feedback'; -export { feedbackAsyncIntegration } from './feedbackAsync'; +import { feedbackAsyncIntegration } from './feedbackAsync'; +import { feedbackSyncIntegration } from './feedbackSync'; +export { feedbackAsyncIntegration, feedbackSyncIntegration, feedbackSyncIntegration as feedbackIntegration }; export { getFeedback, sendFeedback, diff --git a/packages/browser/test/unit/index.bundle.feedback.test.ts b/packages/browser/test/unit/index.bundle.feedback.test.ts index bd231a95fe05..99516cca295e 100644 --- a/packages/browser/test/unit/index.bundle.feedback.test.ts +++ b/packages/browser/test/unit/index.bundle.feedback.test.ts @@ -1,12 +1,13 @@ import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims'; -import { feedbackIntegration } from '../../src'; +import { feedbackAsyncIntegration } from '../../src'; import * as FeedbackBundle from '../../src/index.bundle.feedback'; describe('index.bundle.feedback', () => { it('has correct exports', () => { expect(FeedbackBundle.browserTracingIntegration).toBe(browserTracingIntegrationShim); + expect(FeedbackBundle.feedbackAsyncIntegration).toBe(feedbackAsyncIntegration); + expect(FeedbackBundle.feedbackIntegration).toBe(feedbackAsyncIntegration); expect(FeedbackBundle.replayIntegration).toBe(replayIntegrationShim); - expect(FeedbackBundle.feedbackIntegration).toBe(feedbackIntegration); }); }); diff --git a/packages/browser/test/unit/index.bundle.replay.test.ts b/packages/browser/test/unit/index.bundle.replay.test.ts index 3fec5d2bb6ab..0fdbf95fe3e4 100644 --- a/packages/browser/test/unit/index.bundle.replay.test.ts +++ b/packages/browser/test/unit/index.bundle.replay.test.ts @@ -1,11 +1,13 @@ -import { feedbackIntegrationShim } from '@sentry-internal/integration-shims'; -import { replayIntegration } from '@sentry/browser'; +import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims'; +import { replayIntegration } from '../../src'; import * as ReplayBundle from '../../src/index.bundle.replay'; describe('index.bundle.replay', () => { it('has correct exports', () => { - expect(ReplayBundle.replayIntegration).toBe(replayIntegration); + expect(ReplayBundle.browserTracingIntegration).toBe(browserTracingIntegrationShim); + expect(ReplayBundle.feedbackAsyncIntegration).toBe(feedbackIntegrationShim); expect(ReplayBundle.feedbackIntegration).toBe(feedbackIntegrationShim); + expect(ReplayBundle.replayIntegration).toBe(replayIntegration); }); }); diff --git a/packages/browser/test/unit/index.bundle.test.ts b/packages/browser/test/unit/index.bundle.test.ts index 1d459ddfd731..1535d74d6b6a 100644 --- a/packages/browser/test/unit/index.bundle.test.ts +++ b/packages/browser/test/unit/index.bundle.test.ts @@ -1,10 +1,16 @@ -import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims'; +import { + browserTracingIntegrationShim, + feedbackIntegrationShim, + replayIntegrationShim, +} from '@sentry-internal/integration-shims'; import * as Bundle from '../../src/index.bundle'; describe('index.bundle', () => { it('has correct exports', () => { - expect(Bundle.replayIntegration).toBe(replayIntegrationShim); + expect(Bundle.browserTracingIntegration).toBe(browserTracingIntegrationShim); + expect(Bundle.feedbackAsyncIntegration).toBe(feedbackIntegrationShim); expect(Bundle.feedbackIntegration).toBe(feedbackIntegrationShim); + expect(Bundle.replayIntegration).toBe(replayIntegrationShim); }); }); diff --git a/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts b/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts index 72418b639241..2d62f247a1da 100644 --- a/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts +++ b/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts @@ -1,10 +1,12 @@ -import { browserTracingIntegration, feedbackIntegration, replayIntegration } from '../../src'; +import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../../src'; + import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback'; describe('index.bundle.tracing.replay.feedback', () => { it('has correct exports', () => { - expect(TracingReplayFeedbackBundle.replayIntegration).toBe(replayIntegration); expect(TracingReplayFeedbackBundle.browserTracingIntegration).toBe(browserTracingIntegration); - expect(TracingReplayFeedbackBundle.feedbackIntegration).toBe(feedbackIntegration); + expect(TracingReplayFeedbackBundle.feedbackAsyncIntegration).toBe(feedbackAsyncIntegration); + expect(TracingReplayFeedbackBundle.feedbackIntegration).toBe(feedbackAsyncIntegration); + expect(TracingReplayFeedbackBundle.replayIntegration).toBe(replayIntegration); }); }); diff --git a/packages/browser/test/unit/index.bundle.tracing.replay.test.ts b/packages/browser/test/unit/index.bundle.tracing.replay.test.ts index 5f5f1e649951..2cd3f5dca0f0 100644 --- a/packages/browser/test/unit/index.bundle.tracing.replay.test.ts +++ b/packages/browser/test/unit/index.bundle.tracing.replay.test.ts @@ -1,14 +1,13 @@ import { feedbackIntegrationShim } from '@sentry-internal/integration-shims'; - import { browserTracingIntegration, replayIntegration } from '../../src'; + import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay'; describe('index.bundle.tracing.replay', () => { it('has correct exports', () => { - expect(TracingReplayBundle.replayIntegration).toBe(replayIntegration); - expect(TracingReplayBundle.browserTracingIntegration).toBe(browserTracingIntegration); - + expect(TracingReplayBundle.feedbackAsyncIntegration).toBe(feedbackIntegrationShim); expect(TracingReplayBundle.feedbackIntegration).toBe(feedbackIntegrationShim); + expect(TracingReplayBundle.replayIntegration).toBe(replayIntegration); }); }); diff --git a/packages/browser/test/unit/index.bundle.tracing.test.ts b/packages/browser/test/unit/index.bundle.tracing.test.ts index 065654e054b9..942d185b2e91 100644 --- a/packages/browser/test/unit/index.bundle.tracing.test.ts +++ b/packages/browser/test/unit/index.bundle.tracing.test.ts @@ -1,12 +1,13 @@ import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims'; - import { browserTracingIntegration } from '../../src'; + import * as TracingBundle from '../../src/index.bundle.tracing'; describe('index.bundle.tracing', () => { it('has correct exports', () => { - expect(TracingBundle.replayIntegration).toBe(replayIntegrationShim); expect(TracingBundle.browserTracingIntegration).toBe(browserTracingIntegration); + expect(TracingBundle.feedbackAsyncIntegration).toBe(feedbackIntegrationShim); expect(TracingBundle.feedbackIntegration).toBe(feedbackIntegrationShim); + expect(TracingBundle.replayIntegration).toBe(replayIntegrationShim); }); });