fix(lint): no more deep imports

Author: thomas-lebeau

eslint-local-rules/enforceProdDepsImports.js

@@ -38,7 +38,7 @@ export default {
     return moduleVisitor((source) => {
       const importTypeResult = importType(source.value, context)
       // Use an allow list instead of a deny list to make the rule more future-proof.
-      if (importTypeResult === 'parent' || importTypeResult === 'sibling') {
+      if (importTypeResult === 'parent' || importTypeResult === 'sibling' || importTypeResult === 'builtin') {
         return
       }
 

eslint.config.mjs

@@ -415,6 +415,18 @@ export default tseslint.config(
     },
   },
 
+  {
+    files: ['packages/electron/src/**/*.ts'],
+    ignores: [SPEC_FILES],
+    rules: {
+      // TODO: verify this is safe
+      'local-rules/disallow-side-effects': 'off',
+
+      // TODO: remove before merging this to main: quick dev only
+      'no-console': 'off',
+    },
+  },
+
   {
     // Files executed by nodejs
     files: [

packages/core/src/index.ts

@@ -1,4 +1,4 @@
-export type { Configuration, InitConfiguration, EndpointBuilder, ProxyFn } from './domain/configuration'
+export type { Configuration, InitConfiguration, EndpointBuilder, ProxyFn, TrackType } from './domain/configuration'
 export {
   validateAndBuildConfiguration,
   DefaultPrivacyLevel,
@@ -7,6 +7,7 @@ export {
   isSampleRate,
   buildEndpointHost,
   isIntakeUrl,
+  createEndpointBuilder,
 } from './domain/configuration'
 export * from './domain/intakeSites'
 export type { TrackingConsentState } from './domain/trackingConsent'
@@ -59,7 +60,17 @@ export {
   SESSION_NOT_TRACKED,
   SessionPersistence,
 } from './domain/session/sessionConstants'
-export type { BandwidthStats, HttpRequest, HttpRequestEvent, Payload, FlushEvent, FlushReason } from './transport'
+export type {
+  BandwidthStats,
+  HttpRequest,
+  HttpRequestEvent,
+  Payload,
+  FlushEvent,
+  FlushReason,
+  DatadogEventBridge,
+  BrowserWindowWithEventBridge,
+  Batch,
+} from './transport'
 export {
   createHttpRequest,
   canUseEventBridge,

packages/core/src/transport/index.ts

@@ -2,6 +2,7 @@ export type { BandwidthStats, HttpRequest, HttpRequestEvent, Payload, RetryInfo
 export { createHttpRequest } from './httpRequest'
 export type { BrowserWindowWithEventBridge, DatadogEventBridge } from './eventBridge'
 export { canUseEventBridge, bridgeSupports, getEventBridge, BridgeCapability } from './eventBridge'
+export type { Batch } from './batch'
 export { createBatch } from './batch'
 export type { FlushController, FlushEvent, FlushReason } from './flushController'
 export { createFlushController } from './flushController'

packages/electron/src/domain/plugin/plugin.ts

@@ -1,6 +1,5 @@
 import { generateUUID } from '@datadog/browser-core'
-import type { RumPlugin, RumPublicApi, StartRumResult } from '@datadog/browser-rum-core'
-import type { RawRumResourceEvent } from '@datadog/browser-rum-core/src/rawRumEvent.types'
+import type { RumPlugin, RumPublicApi, StartRumResult, RawRumResourceEvent } from '@datadog/browser-rum-core'
 import type { SpanInfo } from '../trace/trace'
 
 let globalPublicApi: RumPublicApi | undefined

packages/electron/src/domain/renderer/bridge.ts

@@ -1,5 +1,5 @@
 import { contextBridge, ipcRenderer } from 'electron'
-import type { DatadogEventBridge } from '@datadog/browser-core/src/transport'
+import type { DatadogEventBridge } from '@datadog/browser-core'
 
 export function setupRendererBridge() {
   contextBridge.exposeInMainWorld('DatadogEventBridge', {

packages/electron/src/domain/renderer/ipcRenderer.ts

@@ -1,5 +1,5 @@
 import type { IpcRenderer } from 'electron'
-import { createSpanIdentifier, createTraceIdentifier } from '@datadog/browser-rum-core/src/domain/tracing/identifier'
+import { createSpanIdentifier, createTraceIdentifier } from '@datadog/browser-rum-core'
 import { contextBridge, ipcRenderer } from 'electron'
 import type { Observable } from '@datadog/browser-core'
 import { BufferedObservable, clocksNow, elapsed, toServerDuration } from '@datadog/browser-core'

packages/electron/src/domain/rum/assembly.ts

@@ -1,9 +1,8 @@
-import type { Observable, Context } from '@datadog/browser-core'
+import type { Observable, Context, Batch } from '@datadog/browser-core'
 import { HookNames, DISCARDED, combine } from '@datadog/browser-core'
 import { RumEventType } from '@datadog/browser-rum-core'
 import type { Hooks } from '../../hooks'
 import type { CollectedRumEvent } from './events'
-import type { Batch } from '@datadog/browser-core/cjs/transport/batch'
 
 export function startRumEventAssembleAndSend(
   onRumEventObservable: Observable<CollectedRumEvent>,

packages/electron/src/entries/main.ts

@@ -1,4 +1,4 @@
-/* eslint-disable local-rules/disallow-side-effects */
+/* eslint-disable jsdoc/check-indentation */
 /**
  * TODO:
  * - [ ] Basic session management
@@ -9,20 +9,18 @@
  * - [x] setup bridge client with ipc from webviews (renderer processes)
  * - [x] use `exposeInMainWorld` to setup the bridge function that will setup the ipc to the main process
  */
-import type { RawError, PageMayExitEvent, Encoder, InitConfiguration } from '@datadog/browser-core'
+import type { RawError, PageMayExitEvent, Encoder, InitConfiguration, TrackType } from '@datadog/browser-core'
 import {
   Observable,
   DeflateEncoderStreamId,
   createBatch,
   createHttpRequest,
   createFlushController,
   createIdentityEncoder,
+  createEndpointBuilder,
 } from '@datadog/browser-core'
 import type { RumConfiguration, RumInitConfiguration } from '@datadog/browser-rum-core'
-import { createHooks } from '@datadog/browser-rum-core'
-import { validateAndBuildRumConfiguration } from '@datadog/browser-rum-core/cjs/domain/configuration'
-import type { TrackType } from '@datadog/browser-core/cjs/domain/configuration'
-import { createEndpointBuilder } from '@datadog/browser-core/cjs/domain/configuration'
+import { createHooks, validateAndBuildRumConfiguration } from '@datadog/browser-rum-core'
 import tracer from '../domain/trace/tracer'
 import { createIpcMain } from '../domain/main/ipcMain'
 import type { CollectedRumEvent } from '../domain/rum/events'
@@ -83,6 +81,7 @@ function makeDatadogElectron() {
       setupMainBridge(onRumEventObservable)
       createDdTraceAgent(onTraceObservable, hooks)
 
+      // eslint-disable-next-line
       setInterval(() => {
         pageMayExitObservable.notify({ reason: 'page_hide' })
       }, 1000)

packages/rum-core/src/domain/tracing/identifier.ts

@@ -1,4 +1,4 @@
-interface BaseIdentifier {
+export interface BaseIdentifier {
   toString(radix?: number): string
 }