add domain to extensions interface and active to domain interface

Author: lobsterkatie

packages/hub/src/hub.ts

@@ -465,8 +465,7 @@ export function getCurrentHub(): Hub {
 export function getActiveDomain(): DomainAsCarrier | undefined {
   const sentry = getMainCarrier().__SENTRY__;
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-  return sentry && sentry.extensions && sentry.extensions.domain && (sentry.extensions.domain as any).active;
+  return sentry && sentry.extensions && sentry.extensions.domain && sentry.extensions.domain.active;
 }
 
 /**

packages/hub/src/interfaces.ts

@@ -21,10 +21,22 @@ export interface Carrier {
   __SENTRY__?: {
     hub?: Hub;
     /**
-     * These are extension methods for the hub, the current instance of the hub will be bound to it
+     * Extra Hub properties injected by various SDKs
      */
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    extensions?: { [key: string]: Function };
+    extensions?: {
+      /** Hack to prevent bundlers from breaking our usage of the domain package in the cross-platform Hub package */
+      domain?: typeof domain & {
+        /**
+         * The currently active domain. This is part of the domain package, but for some reason not declared in the
+         * package's typedef.
+         */
+        active?: domain.Domain;
+      };
+    } & {
+      /** Extension methods for the hub, which are bound to the current Hub instance */
+      // eslint-disable-next-line @typescript-eslint/ban-types
+      [key: string]: Function;
+    };
   };
 }
 

packages/node/src/index.ts

@@ -57,13 +57,10 @@ const INTEGRATIONS = {
 
 export { INTEGRATIONS as Integrations, Transports, Handlers };
 
-// We need to patch domain on the global __SENTRY__ object to make it work for node
-// if we don't do this, browser bundlers will have troubles resolving require('domain')
+// We need to patch domain on the global __SENTRY__ object to make it work for node in cross-platform packages like
+// @sentry/hub. If we don't do this, browser bundlers will have troubles resolving `require('domain')`.
 const carrier = getMainCarrier();
 if (carrier.__SENTRY__) {
   carrier.__SENTRY__.extensions = carrier.__SENTRY__.extensions || {};
-  if (!carrier.__SENTRY__.extensions.domain) {
-    // @ts-ignore domain is missing from extensions Type
-    carrier.__SENTRY__.extensions.domain = domain;
-  }
+  carrier.__SENTRY__.extensions.domain = carrier.__SENTRY__.extensions.domain || domain;
 }