make globalSentryValues type safe

Author: Lms24

packages/sveltekit/src/server/utils.ts

@@ -9,14 +9,16 @@ import type { RequestEvent } from '@sveltejs/kit';
 
 import { WRAPPED_MODULE_SUFFIX } from '../vite/autoInstrument';
 
+export type GlobalSentryValues = {
+  __sentry_sveltekit_output_dir?: string;
+};
+
 /**
  * Extend the `global` type with custom properties that are
  * injected by the SvelteKit SDK at build time.
  * @see packages/sveltekit/src/vite/sourcemaps.ts
  */
-export type GlobalWithSentryValues = typeof globalThis & {
-  __sentry_sveltekit_output_dir?: string;
-};
+export type GlobalWithSentryValues = typeof globalThis & GlobalSentryValues;
 
 /**
  * Takes a request event and extracts traceparent and DSC data

packages/sveltekit/src/vite/sourceMaps.ts

@@ -10,6 +10,7 @@ import * as path from 'path';
 import * as sorcery from 'sorcery';
 import type { Plugin } from 'vite';
 
+import type { GlobalSentryValues } from '../server/utils';
 import { WRAPPED_MODULE_SUFFIX } from './autoInstrument';
 import type { SupportedSvelteKitAdapters } from './detectAdapter';
 import { getAdapterOutputDir, getHooksFileName, loadSvelteConfig } from './svelteConfig';
@@ -78,6 +79,10 @@ export async function makeCustomSentryVitePlugin(options?: CustomSentryVitePlugi
 
   const serverHooksFile = getHooksFileName(svelteConfig, 'server');
 
+  const globalSentryValues: GlobalSentryValues = {
+    __sentry_sveltekit_output_dir: outputDir,
+  };
+
   const customPlugin: Plugin = {
     name: 'sentry-upload-source-maps',
     apply: 'build', // only apply this plugin at build time
@@ -117,8 +122,10 @@ export async function makeCustomSentryVitePlugin(options?: CustomSentryVitePlugi
       const isServerHooksFile = new RegExp(`/${escapeStringForRegex(serverHooksFile)}(.(js|ts|mjs|mts))?`).test(id);
 
       if (isServerHooksFile) {
-        const injectedCode = `global.__sentry_sveltekit_output_dir = "${outputDir || 'undefined'}";\n`;
-        modifiedCode = `${code}\n${injectedCode}`;
+        const injectedCode = Object.entries(globalSentryValues)
+          .map(([key, value]) => `globalThis["${key}"] = ${JSON.stringify(value)};`)
+          .join('\n');
+        modifiedCode = `${code}\n${injectedCode}\n`;
       }
       // @ts-ignore - this hook exists on the plugin!
       return sentryPlugin.transform(modifiedCode, id);

packages/sveltekit/test/vite/sourceMaps.test.ts

@@ -58,7 +58,7 @@ describe('makeCustomSentryVitePlugin()', () => {
       const plugin = await makeCustomSentryVitePlugin();
       // @ts-ignore this function exists!
       const transformedCode = await plugin.transform('foo', '/src/hooks.server.ts');
-      const expectedtransformedCode = 'foo\nglobal.__sentry_sveltekit_output_dir = ".svelte-kit/output";\n';
+      const expectedtransformedCode = 'foo\nglobalThis["__sentry_sveltekit_output_dir"] = ".svelte-kit/output";\n';
       expect(mockedSentryVitePlugin.transform).toHaveBeenCalledWith(expectedtransformedCode, '/src/hooks.server.ts');
       expect(transformedCode).toEqual(expectedtransformedCode);
     });