diff --git a/developer-extension/src/background/devtoolsPanelConnection.ts b/developer-extension/src/background/devtoolsPanelConnection.ts index 8eddc7da70..9f34eb80d3 100644 --- a/developer-extension/src/background/devtoolsPanelConnection.ts +++ b/developer-extension/src/background/devtoolsPanelConnection.ts @@ -1,4 +1,4 @@ -import type { DevtoolsToBackgroundMessage } from '../common/types' +import type { DevtoolsToBackgroundMessage } from '../common/extension.types' import { EventListeners } from '../common/eventListeners' import { createLogger } from '../common/logger' diff --git a/developer-extension/src/background/domain/syncRules.ts b/developer-extension/src/background/domain/syncRules.ts index f605ddb8c4..c72911e924 100644 --- a/developer-extension/src/background/domain/syncRules.ts +++ b/developer-extension/src/background/domain/syncRules.ts @@ -1,4 +1,4 @@ -import type { NetRequestRulesOptions } from '../../common/types' +import type { NetRequestRulesOptions } from '../../common/extension.types' import { DEV_LOGS_URL, DEV_RUM_SLIM_URL, DEV_RUM_URL } from '../../common/packagesUrlConstants' import { INTAKE_DOMAINS } from '../../common/intakeDomainConstants' import { createLogger } from '../../common/logger' diff --git a/developer-extension/src/common/types.ts b/developer-extension/src/common/extension.types.ts similarity index 100% rename from developer-extension/src/common/types.ts rename to developer-extension/src/common/extension.types.ts diff --git a/developer-extension/src/content-scripts/main.ts b/developer-extension/src/content-scripts/main.ts index 093fdb8982..7b79335a62 100644 --- a/developer-extension/src/content-scripts/main.ts +++ b/developer-extension/src/content-scripts/main.ts @@ -1,4 +1,4 @@ -import type { Settings } from '../common/types' +import type { Settings } from '../common/extension.types' import { EventListeners } from '../common/eventListeners' import { DEV_LOGS_URL, DEV_RUM_URL } from '../common/packagesUrlConstants' import { SESSION_STORAGE_SETTINGS_KEY } from '../common/sessionKeyConstant' diff --git a/developer-extension/src/panel/backgroundScriptConnection.ts b/developer-extension/src/panel/backgroundScriptConnection.ts index d68ff6207d..52c5a6b596 100644 --- a/developer-extension/src/panel/backgroundScriptConnection.ts +++ b/developer-extension/src/panel/backgroundScriptConnection.ts @@ -1,4 +1,4 @@ -import type { BackgroundToDevtoolsMessage, DevtoolsToBackgroundMessage } from '../common/types' +import type { BackgroundToDevtoolsMessage, DevtoolsToBackgroundMessage } from '../common/extension.types' import { isDisconnectError } from '../common/isDisconnectError' import { createLogger } from '../common/logger' import { EventListeners } from '../common/eventListeners' diff --git a/developer-extension/src/panel/components/panel.tsx b/developer-extension/src/panel/components/panel.tsx index 2dbdd88ba6..8f57b83389 100644 --- a/developer-extension/src/panel/components/panel.tsx +++ b/developer-extension/src/panel/components/panel.tsx @@ -7,7 +7,7 @@ import { useAutoFlushEvents } from '../hooks/useAutoFlushEvents' import { useNetworkRules } from '../hooks/useNetworkRules' import { useSettings } from '../hooks/useSettings' import { DEFAULT_PANEL_TAB, PanelTabs } from '../../common/panelTabConstants' -import type { Settings } from '../../common/types' +import type { Settings } from '../../common/extension.types' import { useDebugMode } from '../hooks/useDebugMode' import { SettingsTab } from './tabs/settingsTab' import { InfosTab } from './tabs/infosTab' diff --git a/developer-extension/src/panel/components/tabs/settingsTab.tsx b/developer-extension/src/panel/components/tabs/settingsTab.tsx index f57ed4d810..97f9236aaf 100644 --- a/developer-extension/src/panel/components/tabs/settingsTab.tsx +++ b/developer-extension/src/panel/components/tabs/settingsTab.tsx @@ -4,7 +4,7 @@ import { DevServerStatus, useDevServerStatus } from '../../hooks/useDevServerSta import { useSettings } from '../../hooks/useSettings' import { Columns } from '../columns' import { TabBase } from '../tabBase' -import type { DevBundlesOverride, EventCollectionStrategy } from '../../../common/types' +import type { DevBundlesOverride, EventCollectionStrategy } from '../../../common/extension.types' export function SettingsTab() { const devServerStatus = useDevServerStatus() diff --git a/developer-extension/src/panel/hooks/useEvents/eventCollection.ts b/developer-extension/src/panel/hooks/useEvents/eventCollection.ts index e3922f7fea..cabe19636f 100644 --- a/developer-extension/src/panel/hooks/useEvents/eventCollection.ts +++ b/developer-extension/src/panel/hooks/useEvents/eventCollection.ts @@ -1,4 +1,4 @@ -import type { EventCollectionStrategy } from '../../../common/types' +import type { EventCollectionStrategy } from '../../../common/extension.types' import { INTAKE_DOMAINS } from '../../../common/intakeDomainConstants' import { onBackgroundMessage } from '../../backgroundScriptConnection' import { isRumViewEvent, type SdkEvent } from '../../sdkEvent' diff --git a/developer-extension/src/panel/hooks/useEvents/useEvents.ts b/developer-extension/src/panel/hooks/useEvents/useEvents.ts index ac0465cb20..9e6b79f492 100644 --- a/developer-extension/src/panel/hooks/useEvents/useEvents.ts +++ b/developer-extension/src/panel/hooks/useEvents/useEvents.ts @@ -1,6 +1,6 @@ import { useEffect, useRef, useState } from 'react' import type { SdkEvent } from '../../sdkEvent' -import type { EventCollectionStrategy } from '../../../common/types' +import type { EventCollectionStrategy } from '../../../common/extension.types' import type { EventFilters } from './eventFilters' import { DEFAULT_FILTERS, applyEventFilters } from './eventFilters' import type { EventCollection } from './eventCollection' diff --git a/developer-extension/src/panel/hooks/useNetworkRules.ts b/developer-extension/src/panel/hooks/useNetworkRules.ts index 6dce1d61ff..a8d28e386c 100644 --- a/developer-extension/src/panel/hooks/useNetworkRules.ts +++ b/developer-extension/src/panel/hooks/useNetworkRules.ts @@ -1,5 +1,5 @@ import { useEffect } from 'react' -import type { NetRequestRulesOptions } from '../../common/types' +import type { NetRequestRulesOptions } from '../../common/extension.types' import { sendMessageToBackground } from '../backgroundScriptConnection' export function useNetworkRules({ diff --git a/developer-extension/src/panel/hooks/useSettings.ts b/developer-extension/src/panel/hooks/useSettings.ts index a5a5f78760..87a349b7fb 100644 --- a/developer-extension/src/panel/hooks/useSettings.ts +++ b/developer-extension/src/panel/hooks/useSettings.ts @@ -3,7 +3,7 @@ import { SESSION_STORAGE_SETTINGS_KEY } from '../../common/sessionKeyConstant' import { EventListeners } from '../../common/eventListeners' import { createLogger } from '../../common/logger' import { evalInWindow } from '../evalInWindow' -import type { Settings } from '../../common/types' +import type { Settings } from '../../common/extension.types' const logger = createLogger('useSettings') diff --git a/developer-extension/src/panel/sessionReplayPlayer/types.ts b/developer-extension/src/panel/sessionReplayPlayer/sessionReplayPlayer.types.ts similarity index 98% rename from developer-extension/src/panel/sessionReplayPlayer/types.ts rename to developer-extension/src/panel/sessionReplayPlayer/sessionReplayPlayer.types.ts index 6138675cc5..d2b81fc657 100644 --- a/developer-extension/src/panel/sessionReplayPlayer/types.ts +++ b/developer-extension/src/panel/sessionReplayPlayer/sessionReplayPlayer.types.ts @@ -1,7 +1,7 @@ // Those types are coming from the Web-UI Session Replay Player. Please keep them as close as // possible to the original types. -import type { BrowserRecord, RecordType } from '../../../../packages/rum/src/types' +import type { BrowserRecord, RecordType } from '@datadog/browser-rum/src/types' export enum MessageBridgeUpType { READY = 'ready', diff --git a/developer-extension/src/panel/sessionReplayPlayer/startSessionReplayPlayer.ts b/developer-extension/src/panel/sessionReplayPlayer/startSessionReplayPlayer.ts index 20d373adda..1cf9af1d8a 100644 --- a/developer-extension/src/panel/sessionReplayPlayer/startSessionReplayPlayer.ts +++ b/developer-extension/src/panel/sessionReplayPlayer/startSessionReplayPlayer.ts @@ -1,9 +1,9 @@ -import type { BrowserRecord } from '../../../../packages/rum/src/types' -import { IncrementalSource, RecordType } from '../../../../packages/rum/src/types' +import { IncrementalSource, RecordType } from '@datadog/browser-rum/src/types' +import type { BrowserRecord } from '@datadog/browser-rum/src/types' import { createLogger } from '../../common/logger' import { onBackgroundMessage } from '../backgroundScriptConnection' -import type { MessageBridgeUp } from './types' -import { MessageBridgeDownType, MessageBridgeUpLogLevel, MessageBridgeUpType } from './types' +import type { MessageBridgeUp } from './sessionReplayPlayer.types' +import { MessageBridgeDownType, MessageBridgeUpLogLevel, MessageBridgeUpType } from './sessionReplayPlayer.types' const sandboxLogger = createLogger('sandbox') diff --git a/packages/core/src/browser/addEventListener.ts b/packages/core/src/browser/addEventListener.ts index 7e59489b5a..dd1e3747c2 100644 --- a/packages/core/src/browser/addEventListener.ts +++ b/packages/core/src/browser/addEventListener.ts @@ -1,6 +1,6 @@ import { monitor } from '../tools/monitor' import { getZoneJsOriginalValue } from '../tools/getZoneJsOriginalValue' -import type { CookieStore, CookieStoreEventMap, VisualViewport, VisualViewportEventMap } from './types' +import type { CookieStore, CookieStoreEventMap, VisualViewport, VisualViewportEventMap } from './browser.types' export type TrustableEvent = E & { __ddIsTrusted?: boolean } diff --git a/packages/core/src/browser/types.ts b/packages/core/src/browser/browser.types.ts similarity index 100% rename from packages/core/src/browser/types.ts rename to packages/core/src/browser/browser.types.ts diff --git a/packages/core/src/domain/deflate/types.ts b/packages/core/src/domain/deflate/deflate.types.ts similarity index 100% rename from packages/core/src/domain/deflate/types.ts rename to packages/core/src/domain/deflate/deflate.types.ts diff --git a/packages/core/src/domain/deflate/index.ts b/packages/core/src/domain/deflate/index.ts index c9f6f047dc..547acc8529 100644 --- a/packages/core/src/domain/deflate/index.ts +++ b/packages/core/src/domain/deflate/index.ts @@ -1 +1 @@ -export * from './types' +export * from './deflate.types' diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 4012855066..61ede06dcf 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -93,7 +93,7 @@ export { deleteCookie, resetInitCookies, } from './browser/cookie' -export { CookieStore, WeakRef, WeakRefConstructor } from './browser/types' +export { CookieStore, WeakRef, WeakRefConstructor } from './browser/browser.types' export { initXhrObservable, XhrCompleteContext, XhrStartContext } from './browser/xhrObservable' export { initFetchObservable, diff --git a/packages/rum/src/domain/record/trackers/index.ts b/packages/rum/src/domain/record/trackers/index.ts index 4a4fb792f4..907c8f1236 100644 --- a/packages/rum/src/domain/record/trackers/index.ts +++ b/packages/rum/src/domain/record/trackers/index.ts @@ -10,4 +10,4 @@ export { trackViewEnd } from './trackViewEnd' export { InputCallback, trackInput } from './trackInput' export { ScrollCallback } from './trackScroll' export { trackMutation, MutationCallBack, RumMutationRecord } from './trackMutation' -export { Tracker } from './types' +export { Tracker } from './tracker.types' diff --git a/packages/rum/src/domain/record/trackers/trackFocus.spec.ts b/packages/rum/src/domain/record/trackers/trackFocus.spec.ts index 8654b09f84..ded044c7f5 100644 --- a/packages/rum/src/domain/record/trackers/trackFocus.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackFocus.spec.ts @@ -3,7 +3,7 @@ import { createNewEvent, registerCleanupTask } from '@datadog/browser-core/test' import type { RumConfiguration } from '@datadog/browser-rum-core' import { RecordType } from '../../../types' import { trackFocus, type FocusCallback } from './trackFocus' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackFocus', () => { let focusTracker: Tracker diff --git a/packages/rum/src/domain/record/trackers/trackFocus.ts b/packages/rum/src/domain/record/trackers/trackFocus.ts index 8308be109f..9b68343ca3 100644 --- a/packages/rum/src/domain/record/trackers/trackFocus.ts +++ b/packages/rum/src/domain/record/trackers/trackFocus.ts @@ -1,7 +1,7 @@ import { DOM_EVENT, addEventListeners, timeStampNow } from '@datadog/browser-core' import type { RumConfiguration } from '@datadog/browser-rum-core' import { RecordType, type FocusRecord } from '../../../types' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' export type FocusCallback = (data: FocusRecord) => void diff --git a/packages/rum/src/domain/record/trackers/trackFrustration.spec.ts b/packages/rum/src/domain/record/trackers/trackFrustration.spec.ts index 3d88a0fa1d..c1762fac1e 100644 --- a/packages/rum/src/domain/record/trackers/trackFrustration.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackFrustration.spec.ts @@ -8,7 +8,7 @@ import type { RecordIds } from '../recordIds' import { initRecordIds } from '../recordIds' import type { FrustrationCallback } from './trackFrustration' import { trackFrustration } from './trackFrustration' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackFrustration', () => { const lifeCycle = new LifeCycle() diff --git a/packages/rum/src/domain/record/trackers/trackFrustration.ts b/packages/rum/src/domain/record/trackers/trackFrustration.ts index e55e62f6f1..e86dd67962 100644 --- a/packages/rum/src/domain/record/trackers/trackFrustration.ts +++ b/packages/rum/src/domain/record/trackers/trackFrustration.ts @@ -3,7 +3,7 @@ import { ActionType, RumEventType, LifeCycleEventType } from '@datadog/browser-r import type { FrustrationRecord } from '../../../types' import { RecordType } from '../../../types' import type { RecordIds } from '../recordIds' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' export type FrustrationCallback = (record: FrustrationRecord) => void diff --git a/packages/rum/src/domain/record/trackers/trackInput.spec.ts b/packages/rum/src/domain/record/trackers/trackInput.spec.ts index 712a9444a1..ce6be674dd 100644 --- a/packages/rum/src/domain/record/trackers/trackInput.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackInput.spec.ts @@ -10,7 +10,7 @@ import { IncrementalSource, RecordType } from '../../../types' import type { InputCallback } from './trackInput' import { trackInput } from './trackInput' import { DEFAULT_CONFIGURATION, DEFAULT_SHADOW_ROOT_CONTROLLER } from './trackers.specHelper' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackInput', () => { let inputTracker: Tracker diff --git a/packages/rum/src/domain/record/trackers/trackInput.ts b/packages/rum/src/domain/record/trackers/trackInput.ts index c1334e069b..ff1959a6a3 100644 --- a/packages/rum/src/domain/record/trackers/trackInput.ts +++ b/packages/rum/src/domain/record/trackers/trackInput.ts @@ -6,7 +6,7 @@ import type { BrowserIncrementalSnapshotRecord, InputData, InputState } from '.. import { getEventTarget } from '../eventsUtils' import { getElementInputValue, getSerializedNodeId, hasSerializedNode } from '../serialization' import { assembleIncrementalSnapshot } from '../assembly' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' export type InputCallback = (incrementalSnapshotRecord: BrowserIncrementalSnapshotRecord) => void diff --git a/packages/rum/src/domain/record/trackers/trackMediaInteraction.spec.ts b/packages/rum/src/domain/record/trackers/trackMediaInteraction.spec.ts index 9ef58fbc17..d436beb50f 100644 --- a/packages/rum/src/domain/record/trackers/trackMediaInteraction.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackMediaInteraction.spec.ts @@ -8,7 +8,7 @@ import { IncrementalSource, MediaInteractionType, RecordType } from '../../../ty import type { InputCallback } from './trackInput' import { DEFAULT_CONFIGURATION, DEFAULT_SHADOW_ROOT_CONTROLLER } from './trackers.specHelper' import { trackMediaInteraction } from './trackMediaInteraction' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackMediaInteraction', () => { let mediaInteractionTracker: Tracker diff --git a/packages/rum/src/domain/record/trackers/trackMediaInteraction.ts b/packages/rum/src/domain/record/trackers/trackMediaInteraction.ts index 13afc94fac..e45b0b6fe3 100644 --- a/packages/rum/src/domain/record/trackers/trackMediaInteraction.ts +++ b/packages/rum/src/domain/record/trackers/trackMediaInteraction.ts @@ -6,7 +6,7 @@ import { IncrementalSource, MediaInteractionType } from '../../../types' import { getEventTarget } from '../eventsUtils' import { getSerializedNodeId, hasSerializedNode } from '../serialization' import { assembleIncrementalSnapshot } from '../assembly' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' export type MediaInteractionCallback = (incrementalSnapshotRecord: BrowserIncrementalSnapshotRecord) => void diff --git a/packages/rum/src/domain/record/trackers/trackMouseInteraction.spec.ts b/packages/rum/src/domain/record/trackers/trackMouseInteraction.spec.ts index 6cae159108..789c28b707 100644 --- a/packages/rum/src/domain/record/trackers/trackMouseInteraction.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackMouseInteraction.spec.ts @@ -10,7 +10,7 @@ import { initRecordIds } from '../recordIds' import type { MouseInteractionCallback } from './trackMouseInteraction' import { trackMouseInteraction } from './trackMouseInteraction' import { DEFAULT_CONFIGURATION, DEFAULT_SHADOW_ROOT_CONTROLLER } from './trackers.specHelper' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackMouseInteraction', () => { let mouseInteractionCallbackSpy: jasmine.Spy diff --git a/packages/rum/src/domain/record/trackers/trackMouseInteraction.ts b/packages/rum/src/domain/record/trackers/trackMouseInteraction.ts index b5ad0895cd..2ed2255851 100644 --- a/packages/rum/src/domain/record/trackers/trackMouseInteraction.ts +++ b/packages/rum/src/domain/record/trackers/trackMouseInteraction.ts @@ -8,7 +8,7 @@ import { getEventTarget } from '../eventsUtils' import { getSerializedNodeId, hasSerializedNode } from '../serialization' import type { RecordIds } from '../recordIds' import { tryToComputeCoordinates } from './trackMove' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' const eventTypeToMouseInteraction = { // Listen for pointerup DOM events instead of mouseup for MouseInteraction/MouseUp records. This diff --git a/packages/rum/src/domain/record/trackers/trackMove.spec.ts b/packages/rum/src/domain/record/trackers/trackMove.spec.ts index 2dd7a1bff5..c4d86a4316 100644 --- a/packages/rum/src/domain/record/trackers/trackMove.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackMove.spec.ts @@ -7,7 +7,7 @@ import { IncrementalSource, RecordType } from '../../../types' import type { MousemoveCallBack } from './trackMove' import { trackMove } from './trackMove' import { DEFAULT_CONFIGURATION, DEFAULT_SHADOW_ROOT_CONTROLLER } from './trackers.specHelper' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackMove', () => { let mouseMoveCallbackSpy: jasmine.Spy diff --git a/packages/rum/src/domain/record/trackers/trackMove.ts b/packages/rum/src/domain/record/trackers/trackMove.ts index b8ff30b6c4..892540988c 100644 --- a/packages/rum/src/domain/record/trackers/trackMove.ts +++ b/packages/rum/src/domain/record/trackers/trackMove.ts @@ -6,7 +6,7 @@ import { IncrementalSource } from '../../../types' import { getEventTarget, isTouchEvent } from '../eventsUtils' import { convertMouseEventToLayoutCoordinates } from '../viewports' import { assembleIncrementalSnapshot } from '../assembly' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' const MOUSE_MOVE_OBSERVER_THRESHOLD = 50 diff --git a/packages/rum/src/domain/record/trackers/trackMutation.ts b/packages/rum/src/domain/record/trackers/trackMutation.ts index 5b705b5836..007eeb42fd 100644 --- a/packages/rum/src/domain/record/trackers/trackMutation.ts +++ b/packages/rum/src/domain/record/trackers/trackMutation.ts @@ -31,7 +31,7 @@ import { import { createMutationBatch } from '../mutationBatch' import type { ShadowRootCallBack, ShadowRootsController } from '../shadowRootsController' import { assembleIncrementalSnapshot } from '../assembly' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' export type MutationCallBack = (incrementalSnapshotRecord: BrowserIncrementalSnapshotRecord) => void diff --git a/packages/rum/src/domain/record/trackers/trackScroll.spec.ts b/packages/rum/src/domain/record/trackers/trackScroll.spec.ts index 64229b2f04..a97cca4477 100644 --- a/packages/rum/src/domain/record/trackers/trackScroll.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackScroll.spec.ts @@ -9,7 +9,7 @@ import { IncrementalSource, RecordType } from '../../../types' import type { InputCallback } from './trackInput' import { DEFAULT_CONFIGURATION, DEFAULT_SHADOW_ROOT_CONTROLLER } from './trackers.specHelper' import { trackScroll } from './trackScroll' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackScroll', () => { let scrollTracker: Tracker diff --git a/packages/rum/src/domain/record/trackers/trackScroll.ts b/packages/rum/src/domain/record/trackers/trackScroll.ts index 28aa1ac25e..81d1fc7456 100644 --- a/packages/rum/src/domain/record/trackers/trackScroll.ts +++ b/packages/rum/src/domain/record/trackers/trackScroll.ts @@ -7,7 +7,7 @@ import { getSerializedNodeId, hasSerializedNode } from '../serialization' import { IncrementalSource } from '../../../types' import type { BrowserIncrementalSnapshotRecord, ScrollData } from '../../../types' import { assembleIncrementalSnapshot } from '../assembly' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' const SCROLL_OBSERVER_THRESHOLD = 100 diff --git a/packages/rum/src/domain/record/trackers/trackStyleSheet.spec.ts b/packages/rum/src/domain/record/trackers/trackStyleSheet.spec.ts index 25015c128a..339b57f032 100644 --- a/packages/rum/src/domain/record/trackers/trackStyleSheet.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackStyleSheet.spec.ts @@ -6,7 +6,7 @@ import { IncrementalSource, RecordType } from '../../../types' import type { StyleSheetCallback } from './trackStyleSheet' import { trackStyleSheet, getPathToNestedCSSRule } from './trackStyleSheet' import { DEFAULT_CONFIGURATION, DEFAULT_SHADOW_ROOT_CONTROLLER } from './trackers.specHelper' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackStyleSheet', () => { let styleSheetTracker: Tracker diff --git a/packages/rum/src/domain/record/trackers/trackStyleSheet.ts b/packages/rum/src/domain/record/trackers/trackStyleSheet.ts index 18af6b4d9a..123c95677a 100644 --- a/packages/rum/src/domain/record/trackers/trackStyleSheet.ts +++ b/packages/rum/src/domain/record/trackers/trackStyleSheet.ts @@ -3,7 +3,7 @@ import { IncrementalSource } from '../../../types' import type { StyleSheetRuleData, BrowserIncrementalSnapshotRecord } from '../../../types' import { getSerializedNodeId, hasSerializedNode } from '../serialization' import { assembleIncrementalSnapshot } from '../assembly' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' type GroupingCSSRuleTypes = typeof CSSGroupingRule | typeof CSSMediaRule | typeof CSSSupportsRule diff --git a/packages/rum/src/domain/record/trackers/trackViewEnd.spec.ts b/packages/rum/src/domain/record/trackers/trackViewEnd.spec.ts index 21d38df5a8..b62abe8a2b 100644 --- a/packages/rum/src/domain/record/trackers/trackViewEnd.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackViewEnd.spec.ts @@ -2,7 +2,7 @@ import { LifeCycle, LifeCycleEventType } from '@datadog/browser-rum-core' import { RecordType } from '../../../types' import type { ViewEndCallback } from './trackViewEnd' import { trackViewEnd } from './trackViewEnd' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackViewEnd', () => { let lifeCycle: LifeCycle diff --git a/packages/rum/src/domain/record/trackers/trackViewEnd.ts b/packages/rum/src/domain/record/trackers/trackViewEnd.ts index 3da505ac56..9752b3d8b3 100644 --- a/packages/rum/src/domain/record/trackers/trackViewEnd.ts +++ b/packages/rum/src/domain/record/trackers/trackViewEnd.ts @@ -3,7 +3,7 @@ import type { LifeCycle } from '@datadog/browser-rum-core' import { LifeCycleEventType } from '@datadog/browser-rum-core' import type { ViewEndRecord } from '../../../types' import { RecordType } from '../../../types' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' export type ViewEndCallback = (record: ViewEndRecord) => void diff --git a/packages/rum/src/domain/record/trackers/trackViewportResize.spec.ts b/packages/rum/src/domain/record/trackers/trackViewportResize.spec.ts index c439ec878d..c08838fb55 100644 --- a/packages/rum/src/domain/record/trackers/trackViewportResize.spec.ts +++ b/packages/rum/src/domain/record/trackers/trackViewportResize.spec.ts @@ -8,7 +8,7 @@ import { RecordType } from '../../../types' import { DEFAULT_CONFIGURATION, DEFAULT_SHADOW_ROOT_CONTROLLER } from './trackers.specHelper' import type { VisualViewportResizeCallback } from './trackViewportResize' import { tackVisualViewportResize } from './trackViewportResize' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' describe('trackViewportResize', () => { let viewportResizeTracker: Tracker diff --git a/packages/rum/src/domain/record/trackers/trackViewportResize.ts b/packages/rum/src/domain/record/trackers/trackViewportResize.ts index f1a8d61992..8e931a3aaa 100644 --- a/packages/rum/src/domain/record/trackers/trackViewportResize.ts +++ b/packages/rum/src/domain/record/trackers/trackViewportResize.ts @@ -5,7 +5,7 @@ import { IncrementalSource, RecordType } from '../../../types' import type { BrowserIncrementalSnapshotRecord, ViewportResizeData, VisualViewportRecord } from '../../../types' import { getVisualViewport } from '../viewports' import { assembleIncrementalSnapshot } from '../assembly' -import type { Tracker } from './types' +import type { Tracker } from './tracker.types' const VISUAL_VIEWPORT_OBSERVER_THRESHOLD = 200 diff --git a/packages/rum/src/domain/record/trackers/types.ts b/packages/rum/src/domain/record/trackers/tracker.types.ts similarity index 100% rename from packages/rum/src/domain/record/trackers/types.ts rename to packages/rum/src/domain/record/trackers/tracker.types.ts diff --git a/performances/src/format.ts b/performances/src/format.ts index 1674d64d0e..f90c057877 100644 --- a/performances/src/format.ts +++ b/performances/src/format.ts @@ -1,4 +1,4 @@ -import type { ProfilingResult, ProfilingResults } from './types' +import type { ProfilingResult, ProfilingResults } from './profiling.types' const DURATION_UNITS = ['μs', 'ms', 's'] diff --git a/performances/src/main.ts b/performances/src/main.ts index 51834c77b8..3143c3477a 100644 --- a/performances/src/main.ts +++ b/performances/src/main.ts @@ -2,7 +2,7 @@ import type { Page } from 'puppeteer' import puppeteer from 'puppeteer' import { formatProfilingResults } from './format' import { startProfiling } from './profilers/startProfiling' -import type { ProfilingResults, ProfilingOptions } from './types' +import type { ProfilingResults, ProfilingOptions } from './profiling.types' import { startProxy } from './proxy' import { wikipediaScenario } from './scenarios/wikipediaScenario' import { twitterScenario } from './scenarios/twitterScenario' diff --git a/performances/src/profilers/profilingUtils.ts b/performances/src/profilers/profilingUtils.ts index 9da327c0fe..16e32b877b 100644 --- a/performances/src/profilers/profilingUtils.ts +++ b/performances/src/profilers/profilingUtils.ts @@ -1,4 +1,4 @@ -import type { ProfilingOptions } from '../types' +import type { ProfilingOptions } from '../profiling.types' export function isSdkBundleUrl(options: ProfilingOptions, url: string) { return url === options.bundleUrl diff --git a/performances/src/profilers/startCpuProfiling.ts b/performances/src/profilers/startCpuProfiling.ts index 8450385b85..1542418920 100644 --- a/performances/src/profilers/startCpuProfiling.ts +++ b/performances/src/profilers/startCpuProfiling.ts @@ -1,5 +1,5 @@ import type { CDPSession } from 'puppeteer' -import type { ProfilingOptions } from '../types' +import type { ProfilingOptions } from '../profiling.types' import { isSdkBundleUrl } from './profilingUtils' export async function startCPUProfiling(options: ProfilingOptions, client: CDPSession) { diff --git a/performances/src/profilers/startMemoryProfiling.ts b/performances/src/profilers/startMemoryProfiling.ts index 3a2f3276e5..98d4a9284d 100644 --- a/performances/src/profilers/startMemoryProfiling.ts +++ b/performances/src/profilers/startMemoryProfiling.ts @@ -1,5 +1,5 @@ import type { CDPSession } from 'puppeteer' -import type { ProfilingOptions } from '../types' +import type { ProfilingOptions } from '../profiling.types' import { isSdkBundleUrl } from './profilingUtils' export async function startMemoryProfiling(options: ProfilingOptions, client: CDPSession) { diff --git a/performances/src/profilers/startNetworkProfiling.ts b/performances/src/profilers/startNetworkProfiling.ts index 90841aa59f..4599152e91 100644 --- a/performances/src/profilers/startNetworkProfiling.ts +++ b/performances/src/profilers/startNetworkProfiling.ts @@ -1,5 +1,5 @@ import type { CDPSession, Protocol } from 'puppeteer' -import type { ProfilingOptions } from '../types' +import type { ProfilingOptions } from '../profiling.types' import { isSdkBundleUrl } from './profilingUtils' export async function startNetworkProfiling(options: ProfilingOptions, client: CDPSession) { diff --git a/performances/src/profilers/startProfiling.ts b/performances/src/profilers/startProfiling.ts index f8fc65e508..a7fe2e5f0a 100644 --- a/performances/src/profilers/startProfiling.ts +++ b/performances/src/profilers/startProfiling.ts @@ -1,5 +1,5 @@ import type { Page } from 'puppeteer' -import type { ProfilingOptions, ProfilingResults } from '../types' +import type { ProfilingOptions, ProfilingResults } from '../profiling.types' import { startNetworkProfiling } from './startNetworkProfiling' import { startCPUProfiling } from './startCpuProfiling' import { startMemoryProfiling } from './startMemoryProfiling' diff --git a/performances/src/types.ts b/performances/src/profiling.types.ts similarity index 100% rename from performances/src/types.ts rename to performances/src/profiling.types.ts diff --git a/performances/src/proxy.ts b/performances/src/proxy.ts index 2eb88a9caa..3a6aa2b8ac 100644 --- a/performances/src/proxy.ts +++ b/performances/src/proxy.ts @@ -3,7 +3,7 @@ import type { IncomingMessage, ServerResponse } from 'http' import { createServer } from 'https' import type { AddressInfo } from 'net' import { pki, md } from 'node-forge' -import type { RequestStatsForHost } from './types' +import type { RequestStatsForHost } from './profiling.types' export interface Proxy { origin: string diff --git a/performances/src/scenarios/twitterScenario.ts b/performances/src/scenarios/twitterScenario.ts index 19ce8a111c..9e5ac0c36c 100644 --- a/performances/src/scenarios/twitterScenario.ts +++ b/performances/src/scenarios/twitterScenario.ts @@ -1,5 +1,5 @@ import { trackNetwork } from '../trackNetwork' -import type { Scenario } from '../types' +import type { Scenario } from '../profiling.types' export const twitterScenario: Scenario = { description: `# Twitter diff --git a/performances/src/scenarios/wikipediaScenario.ts b/performances/src/scenarios/wikipediaScenario.ts index f2d20292ed..4d4f6549b2 100644 --- a/performances/src/scenarios/wikipediaScenario.ts +++ b/performances/src/scenarios/wikipediaScenario.ts @@ -1,4 +1,4 @@ -import type { Scenario } from '../types' +import type { Scenario } from '../profiling.types' export const wikipediaScenario: Scenario = { description: `# Wikipedia