feat(core): Write module injections to globalThis (#636)

getsentry · Dec 5, 2024 · 10e4689 · 10e4689
1 parent d811088
commit 10e4689
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/packages/bundler-plugin-core/sentry-esbuild-debugid-injection-file.js b/packages/bundler-plugin-core/sentry-esbuild-debugid-injection-file.js
@@ -4,6 +4,8 @@ try {
       ? window
       : "undefined" != typeof global
       ? global
+      : "undefined" != typeof globalThis
+      ? global
       : "undefined" != typeof self
       ? self
       : {};

diff --git a/packages/bundler-plugin-core/src/index.ts b/packages/bundler-plugin-core/src/index.ts
@@ -700,7 +700,7 @@ export function createComponentNameAnnotateHooks() {
 }
 
 export function getDebugIdSnippet(debugId: string): string {
-  return `;!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="${debugId}",e._sentryDebugIdIdentifier="sentry-dbid-${debugId}")}catch(e){}}();`;
+  return `;!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="${debugId}",e._sentryDebugIdIdentifier="sentry-dbid-${debugId}")}catch(e){}}();`;
 }
 
 export { stringToUUID, replaceBooleanFlagsInCode } from "./utils";

diff --git a/packages/bundler-plugin-core/src/utils.ts b/packages/bundler-plugin-core/src/utils.ts
@@ -318,9 +318,11 @@ export function generateGlobalInjectorCode({
         window :
         typeof global !== 'undefined' ?
           global :
-          typeof self !== 'undefined' ?
-            self :
-            {};
+          typeof globalThis !== 'undefined' ?
+            globalThis :
+            typeof self !== 'undefined' ?
+              self :
+              {};
 
     _global.SENTRY_RELEASE={id:${JSON.stringify(release)}};`;
 
@@ -345,6 +347,8 @@ export function generateModuleMetadataInjectorCode(metadata: any) {
       ? window
       : typeof global !== "undefined"
       ? global
+      : typeof globalThis !== "undefined"
+      ? globalThis
       : typeof self !== "undefined"
       ? self
       : {};

diff --git a/packages/bundler-plugin-core/test/index.test.ts b/packages/bundler-plugin-core/test/index.test.ts
@@ -4,7 +4,7 @@ describe("getDebugIdSnippet", () => {
   it("returns the debugId injection snippet for a passed debugId", () => {
     const snippet = getDebugIdSnippet("1234");
     expect(snippet).toMatchInlineSnapshot(
-      `";!function(){try{var e=\\"undefined\\"!=typeof window?window:\\"undefined\\"!=typeof global?global:\\"undefined\\"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]=\\"1234\\",e._sentryDebugIdIdentifier=\\"sentry-dbid-1234\\")}catch(e){}}();"`
+      `";!function(){try{var e=\\"undefined\\"!=typeof window?window:\\"undefined\\"!=typeof global?global:\\"undefined\\"!=typeof globalThis?globalThis:\\"undefined\\"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]=\\"1234\\",e._sentryDebugIdIdentifier=\\"sentry-dbid-1234\\")}catch(e){}}();"`
     );
   });
 });
diff --git a/packages/bundler-plugin-core/test/utils.test.ts b/packages/bundler-plugin-core/test/utils.test.ts
@@ -226,6 +226,8 @@ describe("generateModuleMetadataInjectorCode", () => {
             ? window
             : typeof global !== \\"undefined\\"
             ? global
+            : typeof globalThis !== \\"undefined\\"
+            ? globalThis
             : typeof self !== \\"undefined\\"
             ? self
             : {};
@@ -259,6 +261,8 @@ describe("generateModuleMetadataInjectorCode", () => {
             ? window
             : typeof global !== \\"undefined\\"
             ? global
+            : typeof globalThis !== \\"undefined\\"
+            ? globalThis
             : typeof self !== \\"undefined\\"
             ? self
             : {};