Undo global change?

Author: lforst

packages/types/src/index.ts

@@ -29,7 +29,7 @@ export type { Event, EventHint } from './event';
 export type { EventProcessor } from './eventprocessor';
 export type { Exception } from './exception';
 export type { Extra, Extras } from './extra';
-export type {} from './globals';
+import './globals';
 export type { Hub } from './hub';
 export type { Integration, IntegrationClass } from './integration';
 export type { Mechanism } from './mechanism';

packages/utils/src/global.ts

@@ -57,8 +57,8 @@ export function getGlobalObject<T>(): T & SentryGlobal {
  * @returns the singleton
  */
 export function getGlobalSingleton<T>(name: keyof SentryGlobal['__SENTRY__'], creator: () => T, obj?: unknown): T {
-  const globalObject = (obj || getGlobalObject()) as SentryGlobal;
-  const __SENTRY__ = (globalObject.__SENTRY__ = globalObject.__SENTRY__ || {});
+  const global = (obj || getGlobalObject()) as SentryGlobal;
+  const __SENTRY__ = (global.__SENTRY__ = global.__SENTRY__ || {});
   const singleton = __SENTRY__[name] || (__SENTRY__[name] = creator());
   return singleton;
 }

packages/utils/src/logger.ts

@@ -2,6 +2,9 @@ import { WrappedFunction } from '@sentry/types';
 
 import { getGlobalObject, getGlobalSingleton } from './global';
 
+// TODO: Implement different loggers for different environments
+const global = getGlobalObject<Window | NodeJS.Global>();
+
 /** Prefix for logging strings */
 const PREFIX = 'Sentry Logger ';
 
@@ -23,21 +26,21 @@ interface Logger extends LoggerConsoleMethods {
  * @returns The results of the callback
  */
 export function consoleSandbox<T>(callback: () => T): T {
-  const globalObject = getGlobalObject<Window>();
+  const global = getGlobalObject<Window>();
 
-  if (!('console' in globalObject)) {
+  if (!('console' in global)) {
     return callback();
   }
 
-  const originalConsole = globalObject.console as Console & Record<string, unknown>;
+  const originalConsole = global.console as Console & Record<string, unknown>;
   const wrappedLevels: Partial<LoggerConsoleMethods> = {};
 
   // Restore all wrapped console methods
   CONSOLE_LEVELS.forEach(level => {
     // TODO(v7): Remove this check as it's only needed for Node 6
     const originalWrappedFunc =
       originalConsole[level] && (originalConsole[level] as WrappedFunction).__sentry_original__;
-    if (level in globalObject.console && originalWrappedFunc) {
+    if (level in global.console && originalWrappedFunc) {
       wrappedLevels[level] = originalConsole[level] as LoggerConsoleMethods[typeof level];
       originalConsole[level] = originalWrappedFunc as Console[typeof level];
     }
@@ -54,9 +57,6 @@ export function consoleSandbox<T>(callback: () => T): T {
 }
 
 function makeLogger(): Logger {
-  // TODO: Implement different loggers for different environments
-  const globalObject = getGlobalObject<Window | NodeJS.Global>();
-
   let enabled = false;
   const logger: Partial<Logger> = {
     enable: () => {
@@ -73,7 +73,7 @@ function makeLogger(): Logger {
       logger[name] = (...args: any[]) => {
         if (enabled) {
           consoleSandbox(() => {
-            globalObject.console[name](`${PREFIX}[${name}]:`, ...args);
+            global.console[name](`${PREFIX}[${name}]:`, ...args);
           });
         }
       };