From f45bceeb548eeb634f843c9ef40f8ceed6da1fe2 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 17 Oct 2022 11:39:25 +0200 Subject: [PATCH 1/3] fix(utils): Rename global.ts -> globalobject.ts --- packages/utils/src/browser.ts | 2 +- packages/utils/src/{global.ts => globalobject.ts} | 3 +++ packages/utils/src/index.ts | 2 +- packages/utils/src/logger.ts | 2 +- packages/utils/src/misc.ts | 2 +- packages/utils/test/{global.test.ts => globalobject.test.ts} | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) rename packages/utils/src/{global.ts => globalobject.ts} (94%) rename packages/utils/test/{global.test.ts => globalobject.test.ts} (84%) diff --git a/packages/utils/src/browser.ts b/packages/utils/src/browser.ts index 30cd546c6ad8..992d18254d21 100644 --- a/packages/utils/src/browser.ts +++ b/packages/utils/src/browser.ts @@ -1,4 +1,4 @@ -import { GLOBAL_OBJ } from './global'; +import { GLOBAL_OBJ } from './globalobject'; import { isString } from './is'; /** diff --git a/packages/utils/src/global.ts b/packages/utils/src/globalobject.ts similarity index 94% rename from packages/utils/src/global.ts rename to packages/utils/src/globalobject.ts index 72163749214a..04ac73f3d97e 100644 --- a/packages/utils/src/global.ts +++ b/packages/utils/src/globalobject.ts @@ -1,6 +1,9 @@ /** * NOTE: In order to avoid circular dependencies, if you add a function to this module and it needs to print something, * you must either a) use `console.log` rather than the logger, or b) put your function elsewhere. + * + * Note: This file was originally called `global.ts`, but was changed to unblock users which might be doing + * string replaces with bundlers like Vite for `global` (would break imports that rely on importing from utils/src/global). */ /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index b55e3b0303be..5e8b3e05ff3e 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -1,7 +1,7 @@ export * from './browser'; export * from './dsn'; export * from './error'; -export * from './global'; +export * from './globalobject'; export * from './instrument'; export * from './is'; export * from './logger'; diff --git a/packages/utils/src/logger.ts b/packages/utils/src/logger.ts index 031c969a930d..51d7f05d25c0 100644 --- a/packages/utils/src/logger.ts +++ b/packages/utils/src/logger.ts @@ -1,6 +1,6 @@ import { WrappedFunction } from '@sentry/types'; -import { getGlobalSingleton, GLOBAL_OBJ } from './global'; +import { getGlobalSingleton, GLOBAL_OBJ } from './globalobject'; /** Prefix for logging strings */ const PREFIX = 'Sentry Logger '; diff --git a/packages/utils/src/misc.ts b/packages/utils/src/misc.ts index 8c24439a47d4..287f9cb82c59 100644 --- a/packages/utils/src/misc.ts +++ b/packages/utils/src/misc.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Event, Exception, Mechanism, StackFrame } from '@sentry/types'; -import { GLOBAL_OBJ } from './global'; +import { GLOBAL_OBJ } from './globalobject'; import { addNonEnumerableProperty } from './object'; import { snipLine } from './string'; diff --git a/packages/utils/test/global.test.ts b/packages/utils/test/globalobject.test.ts similarity index 84% rename from packages/utils/test/global.test.ts rename to packages/utils/test/globalobject.test.ts index 722abf678bb0..1a9d7f6044ec 100644 --- a/packages/utils/test/global.test.ts +++ b/packages/utils/test/globalobject.test.ts @@ -1,4 +1,4 @@ -import { GLOBAL_OBJ } from '../src/global'; +import { GLOBAL_OBJ } from '../src/globalobject'; describe('GLOBAL_OBJ', () => { test('should return the same object', () => { From a01d1a35ffced2c317087c5adaf81beef50731ab Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 17 Oct 2022 11:49:45 +0200 Subject: [PATCH 2/3] Use worldwide instead of global lol --- packages/utils/src/browser.ts | 2 +- packages/utils/src/index.ts | 2 +- packages/utils/src/logger.ts | 2 +- packages/utils/src/misc.ts | 2 +- packages/utils/src/{globalobject.ts => worldwide.ts} | 4 ++++ .../utils/test/{globalobject.test.ts => worldwide.test.ts} | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) rename packages/utils/src/{globalobject.ts => worldwide.ts} (99%) rename packages/utils/test/{globalobject.test.ts => worldwide.test.ts} (84%) diff --git a/packages/utils/src/browser.ts b/packages/utils/src/browser.ts index 992d18254d21..9b31bce4f2e1 100644 --- a/packages/utils/src/browser.ts +++ b/packages/utils/src/browser.ts @@ -1,4 +1,4 @@ -import { GLOBAL_OBJ } from './globalobject'; +import { GLOBAL_OBJ } from './worldwide'; import { isString } from './is'; /** diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 5e8b3e05ff3e..260360522685 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -1,7 +1,7 @@ export * from './browser'; export * from './dsn'; export * from './error'; -export * from './globalobject'; +export * from './worldwide'; export * from './instrument'; export * from './is'; export * from './logger'; diff --git a/packages/utils/src/logger.ts b/packages/utils/src/logger.ts index 51d7f05d25c0..efa8f49716b9 100644 --- a/packages/utils/src/logger.ts +++ b/packages/utils/src/logger.ts @@ -1,6 +1,6 @@ import { WrappedFunction } from '@sentry/types'; -import { getGlobalSingleton, GLOBAL_OBJ } from './globalobject'; +import { getGlobalSingleton, GLOBAL_OBJ } from './worldwide'; /** Prefix for logging strings */ const PREFIX = 'Sentry Logger '; diff --git a/packages/utils/src/misc.ts b/packages/utils/src/misc.ts index 287f9cb82c59..0cc9629663d7 100644 --- a/packages/utils/src/misc.ts +++ b/packages/utils/src/misc.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Event, Exception, Mechanism, StackFrame } from '@sentry/types'; -import { GLOBAL_OBJ } from './globalobject'; +import { GLOBAL_OBJ } from './worldwide'; import { addNonEnumerableProperty } from './object'; import { snipLine } from './string'; diff --git a/packages/utils/src/globalobject.ts b/packages/utils/src/worldwide.ts similarity index 99% rename from packages/utils/src/globalobject.ts rename to packages/utils/src/worldwide.ts index 04ac73f3d97e..b882136689d0 100644 --- a/packages/utils/src/globalobject.ts +++ b/packages/utils/src/worldwide.ts @@ -4,6 +4,10 @@ * * Note: This file was originally called `global.ts`, but was changed to unblock users which might be doing * string replaces with bundlers like Vite for `global` (would break imports that rely on importing from utils/src/global). + * + * Why worldwide? + * + * Why not? */ /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/packages/utils/test/globalobject.test.ts b/packages/utils/test/worldwide.test.ts similarity index 84% rename from packages/utils/test/globalobject.test.ts rename to packages/utils/test/worldwide.test.ts index 1a9d7f6044ec..6137c95c093b 100644 --- a/packages/utils/test/globalobject.test.ts +++ b/packages/utils/test/worldwide.test.ts @@ -1,4 +1,4 @@ -import { GLOBAL_OBJ } from '../src/globalobject'; +import { GLOBAL_OBJ } from '../src/worldwide'; describe('GLOBAL_OBJ', () => { test('should return the same object', () => { From f168c92cf9c39601f8c229608e8646495393d741 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 17 Oct 2022 12:12:46 +0200 Subject: [PATCH 3/3] run linter --- packages/utils/src/browser.ts | 2 +- packages/utils/src/misc.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/utils/src/browser.ts b/packages/utils/src/browser.ts index 9b31bce4f2e1..25ccc443a03c 100644 --- a/packages/utils/src/browser.ts +++ b/packages/utils/src/browser.ts @@ -1,5 +1,5 @@ -import { GLOBAL_OBJ } from './worldwide'; import { isString } from './is'; +import { GLOBAL_OBJ } from './worldwide'; /** * TODO: Move me to @sentry/browser when @sentry/utils no longer contains any browser code diff --git a/packages/utils/src/misc.ts b/packages/utils/src/misc.ts index 0cc9629663d7..aacb4de786e0 100644 --- a/packages/utils/src/misc.ts +++ b/packages/utils/src/misc.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Event, Exception, Mechanism, StackFrame } from '@sentry/types'; -import { GLOBAL_OBJ } from './worldwide'; import { addNonEnumerableProperty } from './object'; import { snipLine } from './string'; +import { GLOBAL_OBJ } from './worldwide'; interface CryptoInternal { getRandomValues(array: Uint8Array): Uint8Array;