starting

Author: timfish

packages/hub/src/hub.ts

@@ -23,8 +23,8 @@ import {
 import {
   consoleSandbox,
   dateTimestampInSeconds,
-  getGlobalObject,
   getGlobalSingleton,
+  GLOBAL_OBJ,
   isNodeEnv,
   logger,
   uuid4,
@@ -413,8 +413,7 @@ export class Hub implements HubInterface {
     const { release, environment } = (client && client.getOptions()) || {};
 
     // Will fetch userAgent if called from browser sdk
-    const global = getGlobalObject<{ navigator?: { userAgent?: string } }>();
-    const { userAgent } = global.navigator || {};
+    const { userAgent } = GLOBAL_OBJ.navigator || {};
 
     const session = makeSession({
       release,
@@ -500,12 +499,11 @@ export class Hub implements HubInterface {
  * at the call-site. We always access the carrier through this function, so we can guarantee that `__SENTRY__` is there.
  **/
 export function getMainCarrier(): Carrier {
-  const carrier = getGlobalObject();
-  carrier.__SENTRY__ = carrier.__SENTRY__ || {
+  GLOBAL_OBJ.__SENTRY__ = GLOBAL_OBJ.__SENTRY__ || {
     extensions: {},
     hub: undefined,
   };
-  return carrier;
+  return GLOBAL_OBJ;
 }
 
 /**

packages/utils/src/global.ts

@@ -7,8 +7,13 @@
 
 import { Integration } from '@sentry/types';
 
-/** Internal */
-interface SentryGlobal {
+/** An object representing properties that can be found on all globals */
+interface GlobalObject {
+  navigator?: Navigator;
+}
+
+/** Internal Sentry extensions on global */
+interface SentryGlobal extends GlobalObject {
   Sentry?: {
     Integrations?: Integration[];
   };
@@ -24,7 +29,7 @@ interface SentryGlobal {
   };
 }
 
-// The code below for 'isGlobalObj' and 'GLOBAL' was copied from core-js before modification
+// The code below for 'isGlobalObj' and 'GLOBAL_OBJ' was copied from core-js before modification
 // https://github.com/zloirock/core-js/blob/1b944df55282cdc99c90db5f49eb0b6eda2cc0a3/packages/core-js/internals/global.js
 // core-js has the following licence:
 //
@@ -53,7 +58,7 @@ function isGlobalObj(obj: { Math?: Math }): any | undefined {
   return obj && obj.Math == Math ? obj : undefined;
 }
 
-const GLOBAL =
+export const GLOBAL_OBJ: SentryGlobal =
   (typeof globalThis == 'object' && isGlobalObj(globalThis)) ||
   // eslint-disable-next-line no-restricted-globals
   (typeof window == 'object' && isGlobalObj(window)) ||
@@ -70,7 +75,7 @@ const GLOBAL =
  * @returns Global scope object
  */
 export function getGlobalObject<T>(): T & SentryGlobal {
-  return GLOBAL as T & SentryGlobal;
+  return GLOBAL_OBJ as T & SentryGlobal;
 }
 
 /**
@@ -85,7 +90,7 @@ export function getGlobalObject<T>(): T & SentryGlobal {
  * @returns the singleton
  */
 export function getGlobalSingleton<T>(name: keyof SentryGlobal['__SENTRY__'], creator: () => T, obj?: unknown): T {
-  const global = (obj || GLOBAL) as SentryGlobal;
+  const global = (obj || GLOBAL_OBJ) as SentryGlobal;
   const __SENTRY__ = (global.__SENTRY__ = global.__SENTRY__ || {});
   const singleton = __SENTRY__[name] || (__SENTRY__[name] = creator());
   return singleton;