ref(replay): Export WINDOW within Replay instead of importing it from Browser

Author: Lms24

packages/replay/src/createPerformanceEntry.ts

@@ -1,8 +1,7 @@
-import { WINDOW } from '@sentry/browser';
 import { browserPerformanceTimeOrigin } from '@sentry/utils';
 import { record } from 'rrweb';
 
-import { AllPerformanceEntry, PerformanceNavigationTiming, PerformancePaintTiming } from './types';
+import { AllPerformanceEntry, PerformanceNavigationTiming, PerformancePaintTiming, WINDOW } from './types';
 import { isIngestHost } from './util/isIngestHost';
 
 export interface ReplayPerformanceEntry {

packages/replay/src/index.ts

@@ -1,5 +1,4 @@
 /* eslint-disable max-lines */ // TODO: We might want to split this file up
-import { WINDOW } from '@sentry/browser';
 import { addGlobalEventProcessor, getCurrentHub, Scope, setContext } from '@sentry/core';
 import { Breadcrumb, Client, Event, Integration } from '@sentry/types';
 import { addInstrumentationHandler, createEnvelope, logger } from '@sentry/utils';
@@ -23,7 +22,7 @@ import { deleteSession } from './session/deleteSession';
 import { getSession } from './session/getSession';
 import { saveSession } from './session/saveSession';
 import { Session } from './session/Session';
-import type {
+import {
   AllPerformanceEntry,
   InstrumentationTypeBreadcrumb,
   InstrumentationTypeSpan,
@@ -34,6 +33,7 @@ import type {
   ReplayConfiguration,
   ReplayPluginOptions,
   SendReplay,
+  WINDOW,
 } from './types';
 import { addInternalBreadcrumb } from './util/addInternalBreadcrumb';
 import { captureInternalException } from './util/captureInternalException';

packages/replay/src/session/deleteSession.ts

@@ -1,5 +1,4 @@
-import { WINDOW } from '@sentry/browser';
-
+import { WINDOW } from '../types';
 import { REPLAY_SESSION_KEY } from './constants';
 
 /**

packages/replay/src/session/fetchSession.ts

@@ -1,6 +1,4 @@
-import { WINDOW } from '@sentry/browser';
-
-import { SampleRates } from '../types';
+import { SampleRates, WINDOW } from '../types';
 import { REPLAY_SESSION_KEY } from './constants';
 import { Session } from './Session';
 

packages/replay/src/session/saveSession.ts

@@ -1,5 +1,4 @@
-import { WINDOW } from '@sentry/browser';
-
+import { WINDOW } from '../types';
 import { REPLAY_SESSION_KEY } from './constants';
 import { Session } from './Session';
 

packages/replay/src/types.ts

@@ -1,5 +1,11 @@
+import { GLOBAL_OBJ } from '@sentry/utils';
 import type { eventWithTime, recordOptions } from 'rrweb/typings/types';
 
+// exporting WINDOW from within this package instead of importing it from @sentry/browser
+// this avoids the Browser package being bundled into the CDN bundle as well as a
+// circular dependency between the Browser and Replay packages in the future
+export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
+
 export type RecordingEvent = eventWithTime;
 export type RecordingOptions = recordOptions<eventWithTime>;
 

packages/replay/src/util/isInternal.ts

@@ -1,5 +1,4 @@
-import { WINDOW } from '@sentry/browser';
-
+import { WINDOW } from '../types';
 import { isBrowser } from './isBrowser';
 
 /**

packages/replay/test/unit/flush.test.ts

@@ -1,7 +1,7 @@
-import { WINDOW } from '@sentry/browser';
 import * as SentryUtils from '@sentry/utils';
 import { BASE_TIMESTAMP, mockRrweb, mockSdk } from '@test';
 
+import { WINDOW } from '../../src/types';
 import { Replay } from './../../src';
 import { createPerformanceEntries } from './../../src/createPerformanceEntry';
 import { SESSION_IDLE_DURATION } from './../../src/session/constants';

packages/replay/test/unit/index-errorSampleRate.test.ts

@@ -1,11 +1,12 @@
 jest.unmock('@sentry/browser');
 
-import { captureException, WINDOW } from '@sentry/browser';
+import { captureException } from '@sentry/browser';
 import { BASE_TIMESTAMP, RecordMock } from '@test';
 import { PerformanceEntryResource } from '@test/fixtures/performanceEntry/resource';
 import { resetSdkMock } from '@test/mocks';
 import { DomHandler, MockTransportSend } from '@test/types';
 
+import { WINDOW } from '../../src/types';
 import { Replay } from './../../src';
 import { REPLAY_SESSION_KEY, VISIBILITY_CHANGE_TIMEOUT } from './../../src/session/constants';
 import { useFakeTimers } from './../utils/use-fake-timers';

packages/replay/test/unit/index.test.ts

@@ -1,7 +1,6 @@
 jest.mock('./../../src/util/isInternal', () => ({
   isInternal: jest.fn(() => true),
 }));
-import { WINDOW } from '@sentry/browser';
 import { BASE_TIMESTAMP, RecordMock } from '@test';
 import { PerformanceEntryResource } from '@test/fixtures/performanceEntry/resource';
 import { resetSdkMock } from '@test/mocks';
@@ -10,7 +9,7 @@ import { EventType } from 'rrweb';
 
 import { Replay } from '../../src';
 import { MAX_SESSION_LIFE, REPLAY_SESSION_KEY, VISIBILITY_CHANGE_TIMEOUT } from '../../src/session/constants';
-import { RecordingEvent } from '../../src/types';
+import { RecordingEvent, WINDOW } from '../../src/types';
 import { useFakeTimers } from '../utils/use-fake-timers';
 
 useFakeTimers();

packages/replay/test/unit/session/Session.test.ts

@@ -24,9 +24,9 @@ jest.mock('@sentry/utils', () => {
 });
 
 import * as Sentry from '@sentry/browser';
-import { WINDOW } from '@sentry/browser';
 
 import { Session } from '../../../src/session/Session';
+import { WINDOW } from '../../../src/types';
 
 type CaptureEventMockType = jest.MockedFunction<typeof Sentry.captureEvent>;
 

packages/replay/test/unit/session/createSession.test.ts

@@ -1,8 +1,8 @@
-import { WINDOW } from '@sentry/browser';
 import * as Sentry from '@sentry/core';
 
 import { createSession } from '../../../src/session/createSession';
 import { saveSession } from '../../../src/session/saveSession';
+import { WINDOW } from '../../../src/types';
 
 jest.mock('./../../../src/session/saveSession');
 

packages/replay/test/unit/session/deleteSession.test.ts

@@ -1,7 +1,6 @@
-import { WINDOW } from '@sentry/browser';
-
 import { REPLAY_SESSION_KEY } from '../../../src/session/constants';
 import { deleteSession } from '../../../src/session/deleteSession';
+import { WINDOW } from '../../../src/types';
 
 const storageEngine = WINDOW.sessionStorage;
 

packages/replay/test/unit/session/fetchSession.test.ts

@@ -1,7 +1,6 @@
-import { WINDOW } from '@sentry/browser';
-
 import { REPLAY_SESSION_KEY } from '../../../src/session/constants';
 import { fetchSession } from '../../../src/session/fetchSession';
+import { WINDOW } from '../../../src/types';
 
 const oldSessionStorage = WINDOW.sessionStorage;
 

packages/replay/test/unit/session/getSession.test.ts

@@ -1,10 +1,9 @@
-import { WINDOW } from '@sentry/browser';
-
 import * as CreateSession from '../../../src/session/createSession';
 import * as FetchSession from '../../../src/session/fetchSession';
 import { getSession } from '../../../src/session/getSession';
 import { saveSession } from '../../../src/session/saveSession';
 import { Session } from '../../../src/session/Session';
+import { WINDOW } from '../../../src/types';
 
 jest.mock('@sentry/utils', () => {
   return {

packages/replay/test/unit/session/saveSession.test.ts

@@ -1,8 +1,7 @@
-import { WINDOW } from '@sentry/browser';
-
 import { REPLAY_SESSION_KEY } from '../../../src/session/constants';
 import { saveSession } from '../../../src/session/saveSession';
 import { Session } from '../../../src/session/Session';
+import { WINDOW } from '../../../src/types';
 
 beforeAll(() => {
   WINDOW.sessionStorage.clear();

packages/replay/test/unit/stop.test.ts

@@ -1,8 +1,8 @@
-import { WINDOW } from '@sentry/browser';
 import * as SentryUtils from '@sentry/utils';
 // mock functions need to be imported first
 import { BASE_TIMESTAMP, mockRrweb, mockSdk } from '@test';
 
+import { WINDOW } from '../../src/types';
 import { Replay } from './../../src';
 import { SESSION_IDLE_DURATION } from './../../src/session/constants';
 import { useFakeTimers } from './../utils/use-fake-timers';