Integrate roman/RUM-67-specialise-type-files (#2845) into staging-28

Integrated commit sha: 73b0514

Co-authored-by: roman.gaignault <[email protected]>

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'
 

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'

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'

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'

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'

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()

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'

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'

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({

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')
 

developer-extension/src/panel/sessionReplayPlayer/types.ts → 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',

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')
 

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 extends Event = Event> = E & { __ddIsTrusted?: boolean }
 

packages/core/src/domain/deflate/index.ts

@@ -1 +1 @@
-export * from './types'
+export * from './deflate.types'

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,

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'

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

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
 

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()

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
 

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

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
 

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

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
 

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<MouseInteractionCallback>

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

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<MousemoveCallBack>

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
 

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
 

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

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
 

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

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
 

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

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
 

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

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
 

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']
 

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'

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

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) {

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) {

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) {

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'

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

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

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