fix(datadog): bundle dependencies properly

Author: aweiss-dev

apps/webapp/src/script/browser/CheckBrowser.ts

@@ -33,12 +33,8 @@
 
 import Cookies from 'js-cookie';
 
-import {getLogger} from 'Util/Logger';
-
 import {QUERY_KEY} from '../auth/route';
 
-const logger = getLogger('CheckBrowser');
-
 const isOauth = (): boolean => location?.hash?.includes(QUERY_KEY.SCOPE) ?? false;
 
 const cookieName = 'cookie_supported_test_wire_cookie_name';
@@ -71,7 +67,7 @@ const supportsCookies = (): boolean => {
 
 const redirectUnsupportedBrowser = (error: string): void => {
   location.href = '/unsupported/';
-  logger.development.error(error);
+  console.error('[CheckBrowser]', error);
 };
 
 const supportsIndexDB = (): Promise<boolean> =>

libraries/Logger/package.json

@@ -4,14 +4,15 @@
   "description": "Security-critical unified logging library with automatic PII sanitization, multi-transport support, and global singleton for Electron + Browser contexts",
   "license": "GPL-3.0",
   "author": "Wire Swiss GmbH",
-  "main": "./lib/index.cjs",
+  "type": "module",
+  "main": "./lib/index.js",
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
       "import": "./lib/index.js",
-      "require": "./lib/index.cjs"
+      "default": "./lib/index.js"
     },
     "./package.json": "./package.json"
   },

libraries/Logger/src/transports/DatadogTransport.ts

@@ -22,18 +22,9 @@ import logdown from 'logdown';
 import {Transport, LogEntry, LogLevel, DatadogTransportConfig} from '../types';
 import {isAllowedAVSLog} from '../utils/avsFilter';
 
-// Datadog SDK imports
-let datadogLogs: any;
-let datadogRum: any;
-
-try {
-  // Dynamic imports for browser environment
-  datadogLogs = require('@datadog/browser-logs');
-  datadogRum = require('@datadog/browser-rum');
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-} catch (error) {
-  // Datadog SDKs not available - transport will remain uninitialized
-}
+// Datadog SDK imports - these will be bundled with the library
+import {datadogLogs} from '@datadog/browser-logs';
+import {datadogRum} from '@datadog/browser-rum';
 
 /**
  * Datadog transport implementation - Sends production logs to DataDog
@@ -131,7 +122,7 @@ export class DatadogTransport implements Transport {
         env: this.config.env,
         version: this.config.version,
         forwardErrorsToLogs: true,
-        forwardConsoleLogs: this.config.forwardConsoleLogs, // Should always be false in config
+        forwardConsoleLogs: this.config.forwardConsoleLogs ? 'all' : undefined, // Should always be false in config
         sessionSampleRate: 100,
         beforeSend: (log: any) => {
           // Filter AVS logs (they are very verbose)
@@ -235,7 +226,20 @@ export class DatadogTransport implements Transport {
       }
 
       // Log to Datadog with structured context
-      datadogLogs.logger[datadogLevel](entry.message, logContext, entry.error);
+      switch (datadogLevel) {
+        case 'debug':
+          datadogLogs.logger.debug(entry.message, logContext, entry.error);
+          break;
+        case 'info':
+          datadogLogs.logger.info(entry.message, logContext, entry.error);
+          break;
+        case 'warn':
+          datadogLogs.logger.warn(entry.message, logContext, entry.error);
+          break;
+        case 'error':
+          datadogLogs.logger.error(entry.message, logContext, entry.error);
+          break;
+      }
 
       // Debug log for successful Datadog call
       this.debugLogger.debug('Successfully logged to Datadog', {

libraries/Logger/vite.config.ts

@@ -7,16 +7,15 @@ export default defineConfig({
     target: 'esnext',
     lib: {
       entry: resolve(__dirname, 'src/index.ts'),
-      formats: ['es', 'cjs'],
-      fileName: format => {
-        if (format === 'cjs') {
-          return 'index.cjs';
-        }
-        return 'index.js';
-      },
+      // Only build ESM format to avoid Datadog being loaded twice
+      // Webpack can consume ESM modules natively
+      formats: ['es'],
+      fileName: () => 'index.js',
     },
     rollupOptions: {
-      external: ['logdown', '@datadog/browser-logs', '@datadog/browser-rum', 'fs', 'path', 'fs/promises'],
+      // Bundle all dependencies to avoid require() issues in webpack
+      // Only keep Node.js built-ins as external
+      external: ['fs', 'path', 'fs/promises'],
     },
     outDir: 'lib',
   },