From e176c57667f9d4a51aeb6480a4e6942ac393e7ef Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 14 Jun 2023 09:10:31 -0400 Subject: [PATCH 1/3] fix(serverless): Export captureCheckIn (#8333) --- packages/serverless/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts index e0513a53cd3e..284aef1331af 100644 --- a/packages/serverless/src/index.ts +++ b/packages/serverless/src/index.ts @@ -18,6 +18,7 @@ export { captureEvent, captureException, captureMessage, + captureCheckIn, configureScope, createTransport, getActiveTransaction, From d04488e92ae2d9504c620ead463b50a73ee08d28 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Wed, 14 Jun 2023 15:12:09 +0200 Subject: [PATCH 2/3] fix(replay): Stop exporting `EventType` from `@sentry-internal/rrweb` (#8334) --- packages/replay/src/index.ts | 1 + packages/replay/src/types/replayFrame.ts | 2 +- packages/replay/src/types/rrweb.ts | 13 +++++++++++-- .../integration/beforeAddRecordingEvent.test.ts | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/replay/src/index.ts b/packages/replay/src/index.ts index 7664b4d4e592..3b05202fc541 100644 --- a/packages/replay/src/index.ts +++ b/packages/replay/src/index.ts @@ -1,5 +1,6 @@ export { Replay } from './integration'; export type { + EventType, eventWithTime, BreadcrumbFrame, BreadcrumbFrameEvent, diff --git a/packages/replay/src/types/replayFrame.ts b/packages/replay/src/types/replayFrame.ts index 529b1b428a6f..f0107fdbf77a 100644 --- a/packages/replay/src/types/replayFrame.ts +++ b/packages/replay/src/types/replayFrame.ts @@ -1,4 +1,3 @@ -import type { EventType } from '@sentry-internal/rrweb'; import type { Breadcrumb } from '@sentry/types'; import type { @@ -10,6 +9,7 @@ import type { PaintData, ResourceData, } from './performance'; +import type { EventType } from './rrweb'; interface BaseBreadcrumbFrame { timestamp: number; diff --git a/packages/replay/src/types/rrweb.ts b/packages/replay/src/types/rrweb.ts index cfbe4cddf4c3..75a596fb4385 100644 --- a/packages/replay/src/types/rrweb.ts +++ b/packages/replay/src/types/rrweb.ts @@ -1,10 +1,19 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import type { EventType } from '@sentry-internal/rrweb'; - type blockClass = string | RegExp; type maskTextClass = string | RegExp; +/** Duplicate this from @sentry-internal/rrweb so we can export this as well. */ +export enum EventType { + DomContentLoaded = 0, + Load = 1, + FullSnapshot = 2, + IncrementalSnapshot = 3, + Meta = 4, + Custom = 5, + Plugin = 6, +} + /** * This is a partial copy of rrweb's eventWithTime type which only contains the properties * we specifcally need in the SDK. diff --git a/packages/replay/test/integration/beforeAddRecordingEvent.test.ts b/packages/replay/test/integration/beforeAddRecordingEvent.test.ts index 9f89aba9b517..af552e6104d8 100644 --- a/packages/replay/test/integration/beforeAddRecordingEvent.test.ts +++ b/packages/replay/test/integration/beforeAddRecordingEvent.test.ts @@ -1,4 +1,3 @@ -import type { EventType } from '@sentry-internal/rrweb'; import * as SentryCore from '@sentry/core'; import type { Transport } from '@sentry/types'; import * as SentryUtils from '@sentry/utils'; @@ -6,6 +5,7 @@ import * as SentryUtils from '@sentry/utils'; import type { Replay } from '../../src'; import type { ReplayContainer } from '../../src/replay'; import { clearSession } from '../../src/session/clearSession'; +import type { EventType } from '../../src/types'; import * as SendReplayRequest from '../../src/util/sendReplayRequest'; import { BASE_TIMESTAMP, mockRrweb, mockSdk } from '../index'; import { useFakeTimers } from '../utils/use-fake-timers'; From c4241eb101b11578e22739c31b9e71d6abef9d05 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Wed, 14 Jun 2023 15:15:26 +0200 Subject: [PATCH 3/3] meta(changelog): Update changelog for 7.55.2 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53e54fd33bba..4ceb218a3a05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott +## 7.55.2 + +- fix(replay): Stop exporting `EventType` from `@sentry-internal/rrweb` (#8334) +- fix(serverless): Export captureCheckIn (#8333) + ## 7.55.1 - fix(replay): Do not export types from `@sentry-internal/rrweb` (#8329)