build: Update to typescript 5.8.0 (#17710)

mydea · s1gr1d · web-flow · commit 55f03e019f6e · 2025-10-17T14:33:29.000+02:00
This updates the TS version we use to 5.8.0. We still downlevel to 3.8 so this should not be breaking (even if we were to use newer features eventually), downlevel-dts will fail/or our tests anyhow if we use some features that cannot be downlevelled.  --- > [!NOTE] > Upgrade TypeScript to 5.8 across the repo, adjust tsconfigs and deps, and fix minor type issues to satisfy stricter checks. > > - **Tooling/Versions**: > - Bump `typescript` to `~5.8.0` and update version guard in `scripts/verify-packages-versions.js`. > - Update `yarn.lock` and package constraints; add new e2e app `dev-packages/e2e-tests/test-applications/generic-ts5.0`. > - **TS Configs**: > - Add `moduleResolution: "Node16"` in multiple `tsconfig.json` files and test configs. > - Add `@types/node` and include `"node"` in `types` where needed (e.g., Hydrogen test app). > - **Type/Code Adjustments**: > - Remove unnecessary casts and add explicit non-null assertions for `Map.keys().next().value`. > - Simplify handler registration (`handlers[type].push(handler)`), and minor TS cleanups in profiling/LRU/debug-id utilities. > - Cloudflare/Nuxt/SvelteKit: relax Request typing and use `@ts-expect-error` for `cf` init property; avoid unused CF type import. > - Next.js webpack: remove unnecessary non-null assertion when joining `appDirPath`. > - Remix: streamline FormData attribute handling and vendor instrumentation check. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 5ec5959. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup>  --------- Co-authored-by: s1gr1d <sigrid.huemer@posteo.at>
diff --git a/dev-packages/e2e-tests/test-applications/generic-ts5.0/.npmrc b/dev-packages/e2e-tests/test-applications/generic-ts5.0/.npmrc
@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
diff --git a/dev-packages/e2e-tests/test-applications/generic-ts5.0/index.ts b/dev-packages/e2e-tests/test-applications/generic-ts5.0/index.ts
@@ -0,0 +1,5 @@
+import * as _SentryReplay from '@sentry-internal/replay';
+import * as _SentryBrowser from '@sentry/browser';
+import * as _SentryCore from '@sentry/core';
+import * as _SentryNode from '@sentry/node';
+import * as _SentryWasm from '@sentry/wasm';
diff --git a/dev-packages/e2e-tests/test-applications/generic-ts5.0/package.json b/dev-packages/e2e-tests/test-applications/generic-ts5.0/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@sentry-internal/ts5.0-test",
+  "private": true,
+  "license": "MIT",
+  "scripts": {
+    "build:types": "pnpm run type-check",
+    "ts-version": "tsc --version",
+    "type-check": "tsc --project tsconfig.json",
+    "test:build": "pnpm install && pnpm run build:types",
+    "test:assert": "pnpm -v"
+  },
+  "devDependencies": {
+    "typescript": "5.0.2",
+    "@types/node": "^18.19.1"
+  },
+  "dependencies": {
+    "@sentry/browser": "latest || *",
+    "@sentry/core": "latest || *",
+    "@sentry/node": "latest || *",
+    "@sentry-internal/replay": "latest || *",
+    "@sentry/wasm": "latest || *"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/generic-ts5.0/tsconfig.json b/dev-packages/e2e-tests/test-applications/generic-ts5.0/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "include": ["index.ts"],
+  "compilerOptions": {
+    "lib": ["es2018", "DOM"],
+    "skipLibCheck": false,
+    "noEmit": true,
+    "types": [],
+    "target": "es2018",
+    "moduleResolution": "node"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json
@@ -41,6 +41,7 @@
     "@total-typescript/ts-reset": "^0.4.2",
     "@types/eslint": "^8.4.10",
     "@types/react": "^18.2.22",
+    "@types/node": "^18.19.1",
     "@types/react-dom": "^18.2.7",
     "esbuild": "0.25.0",
     "eslint": "^9.18.0",
diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/tsconfig.json b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/tsconfig.json
@@ -14,7 +14,7 @@
     "forceConsistentCasingInFileNames": true,
     "skipLibCheck": true,
     "baseUrl": ".",
-    "types": ["@shopify/oxygen-workers-types"],
+    "types": ["@shopify/oxygen-workers-types", "node"],
     "paths": {
       "~/*": ["app/*"]
     },
diff --git a/package.json b/package.json
@@ -135,7 +135,7 @@
     "size-limit": "~11.1.6",
     "sucrase": "^3.35.0",
     "ts-node": "10.9.1",
-    "typescript": "~5.0.0",
+    "typescript": "~5.8.0",
     "vitest": "^3.2.4",
     "yalc": "^1.0.0-pre.53",
     "yarn-deduplicate": "6.0.2"
diff --git a/packages/browser-utils/src/metrics/instrument.ts b/packages/browser-utils/src/metrics/instrument.ts
@@ -301,7 +301,7 @@ function instrumentPerformanceObserver(type: InstrumentHandlerTypePerformanceObs
 
 function addHandler(type: InstrumentHandlerType, handler: InstrumentHandlerCallback): void {
   handlers[type] = handlers[type] || [];
-  (handlers[type] as InstrumentHandlerCallback[]).push(handler);
+  handlers[type].push(handler);
 }
 
 // Get a callback which can be called to remove the instrumentation handler
diff --git a/packages/browser/src/profiling/utils.ts b/packages/browser/src/profiling/utils.ts
@@ -564,7 +564,8 @@ export function addProfileToGlobalCache(profile_id: string, profile: JSSelfProfi
   PROFILE_MAP.set(profile_id, profile);
 
   if (PROFILE_MAP.size > 30) {
-    const last: string = PROFILE_MAP.keys().next().value;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const last = PROFILE_MAP.keys().next().value!;
     PROFILE_MAP.delete(last);
   }
 }
diff --git a/packages/core/src/instrument/handlers.ts b/packages/core/src/instrument/handlers.ts
@@ -21,7 +21,7 @@ const instrumented: { [key in InstrumentHandlerType]?: boolean } = {};
 /** Add a handler function. */
 export function addHandler(type: InstrumentHandlerType, handler: InstrumentHandlerCallback): void {
   handlers[type] = handlers[type] || [];
-  (handlers[type] as InstrumentHandlerCallback[]).push(handler);
+  handlers[type].push(handler);
 }
 
 /**
diff --git a/packages/core/src/utils/debug-ids.ts b/packages/core/src/utils/debug-ids.ts
@@ -105,7 +105,7 @@ export function getDebugImagesForResources(
       images.push({
         type: 'sourcemap',
         code_file: path,
-        debug_id: filenameDebugIdMap[path] as string,
+        debug_id: filenameDebugIdMap[path],
       });
     }
   }
diff --git a/packages/core/src/utils/lru.ts b/packages/core/src/utils/lru.ts
@@ -27,7 +27,9 @@ export class LRUMap<K, V> {
   public set(key: K, value: V): void {
     if (this._cache.size >= this._maxSize) {
       // keys() returns an iterator in insertion order so keys().next() gives us the oldest key
-      this._cache.delete(this._cache.keys().next().value);
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const nextKey = this._cache.keys().next().value!;
+      this._cache.delete(nextKey);
     }
     this._cache.set(key, value);
   }
diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
@@ -331,7 +331,7 @@ export function constructWebpackConfigFunction({
         .map(extension => `global-error.${extension}`)
         .some(
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          globalErrorFile => fs.existsSync(path.join(appDirPath!, globalErrorFile)),
+          globalErrorFile => fs.existsSync(path.join(appDirPath, globalErrorFile)),
         );
 
       if (
diff --git a/packages/nextjs/tsconfig.test.json b/packages/nextjs/tsconfig.test.json
@@ -9,6 +9,7 @@
 
     // require for top-level await
     "module": "Node16",
+    "moduleResolution": "Node16",
     "target": "es2020",
 
     // other package-specific, test-specific options
diff --git a/packages/node-core/src/integrations/anr/worker.ts b/packages/node-core/src/integrations/anr/worker.ts
@@ -110,7 +110,7 @@ function applyDebugMeta(event: Event): void {
     for (const frame of exception.stacktrace?.frames || []) {
       const filename = frame.abs_path || frame.filename;
       if (filename && normalisedDebugImages[filename]) {
-        filenameToDebugId.set(filename, normalisedDebugImages[filename] as string);
+        filenameToDebugId.set(filename, normalisedDebugImages[filename]);
       }
     }
   }
diff --git a/packages/node-core/test/helpers/mockSdkInit.ts b/packages/node-core/test/helpers/mockSdkInit.ts
@@ -149,7 +149,7 @@ export function getSpanProcessor(): SentrySpanProcessor | undefined {
 
   const spanProcessor = multiSpanProcessor?.['_spanProcessors']?.find(
     (spanProcessor: SpanProcessor) => spanProcessor instanceof SentrySpanProcessor,
-  ) as SentrySpanProcessor | undefined;
+  );
 
   return spanProcessor;
 }
diff --git a/packages/node-core/tsconfig.json b/packages/node-core/tsconfig.json
@@ -5,6 +5,7 @@
 
   "compilerOptions": {
     "lib": ["ES2020", "ES2021.WeakRef"],
-    "module": "Node16"
+    "module": "Node16",
+    "moduleResolution": "Node16"
   }
 }
diff --git a/packages/node-native/src/event-loop-block-watchdog.ts b/packages/node-native/src/event-loop-block-watchdog.ts
@@ -149,7 +149,7 @@ function applyDebugMeta(event: Event, debugImages: Record<string, string>): void
     for (const frame of exception.stacktrace?.frames || []) {
       const filename = stripFileProtocol(frame.abs_path || frame.filename);
       if (filename && normalisedDebugImages[filename]) {
-        filenameToDebugId.set(filename, normalisedDebugImages[filename] as string);
+        filenameToDebugId.set(filename, normalisedDebugImages[filename]);
       }
     }
   }
@@ -158,7 +158,7 @@ function applyDebugMeta(event: Event, debugImages: Record<string, string>): void
     for (const frame of thread.stacktrace?.frames || []) {
       const filename = stripFileProtocol(frame.abs_path || frame.filename);
       if (filename && normalisedDebugImages[filename]) {
-        filenameToDebugId.set(filename, normalisedDebugImages[filename] as string);
+        filenameToDebugId.set(filename, normalisedDebugImages[filename]);
       }
     }
   }
diff --git a/packages/node/test/helpers/mockSdkInit.ts b/packages/node/test/helpers/mockSdkInit.ts
@@ -61,7 +61,7 @@ export function getSpanProcessor(): SentrySpanProcessor | undefined {
 
   const spanProcessor = multiSpanProcessor?.['_spanProcessors']?.find(
     (spanProcessor: SpanProcessor) => spanProcessor instanceof SentrySpanProcessor,
-  ) as SentrySpanProcessor | undefined;
+  );
 
   return spanProcessor;
 }
diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json
@@ -5,6 +5,7 @@
 
   "compilerOptions": {
     "lib": ["es2020"],
-    "module": "Node16"
+    "module": "Node16",
+    "moduleResolution": "Node16"
   }
 }
diff --git a/packages/nuxt/src/module.ts b/packages/nuxt/src/module.ts
@@ -76,14 +76,16 @@ export default defineNuxtModule<ModuleOptions>({
 
       // Add the sentry config file to the include array
       nuxt.hook('prepare:types', options => {
-        if (!options.tsConfig.include) {
-          options.tsConfig.include = [];
+        const tsConfig = options.tsConfig as { include?: string[] };
+
+        if (!tsConfig.include) {
+          tsConfig.include = [];
         }
 
         // Add type references for useRuntimeConfig in root files for nuxt v4
         // Should be relative to `root/.nuxt`
         const relativePath = path.relative(nuxt.options.buildDir, clientConfigFile);
-        options.tsConfig.include.push(relativePath);
+        tsConfig.include.push(relativePath);
       });
     }
 
diff --git a/packages/nuxt/src/runtime/plugins/sentry-cloudflare.server.ts b/packages/nuxt/src/runtime/plugins/sentry-cloudflare.server.ts
@@ -1,4 +1,3 @@
-import type { IncomingRequestCfProperties } from '@cloudflare/workers-types';
 import type { CloudflareOptions } from '@sentry/cloudflare';
 import { setAsyncLocalStorageAsyncContextStrategy, wrapRequestHandler } from '@sentry/cloudflare';
 import { debug, getDefaultIsolationScope, getIsolationScope, getTraceData } from '@sentry/core';
@@ -64,8 +63,9 @@ export const sentryCloudflareNitroPlugin =
           const request = new Request(url, {
             method: event.method,
             headers: event.headers,
+            // @ts-expect-error - 'cf' is a valid property in the RequestInit type for Cloudflare
             cf: getCfProperties(event),
-          }) as Request<unknown, IncomingRequestCfProperties<unknown>>;
+          });
 
           const requestHandlerOptions = {
             options: cloudflareOptions,
diff --git a/packages/remix/src/utils/utils.ts b/packages/remix/src/utils/utils.ts
@@ -29,7 +29,7 @@ export async function storeFormDataKeys(
 
       if (formDataKeys?.[key]) {
         if (typeof formDataKeys[key] === 'string') {
-          attrKey = formDataKeys[key] as string;
+          attrKey = formDataKeys[key];
         }
 
         span.setAttribute(
diff --git a/packages/remix/src/vendor/instrumentation.ts b/packages/remix/src/vendor/instrumentation.ts
@@ -310,11 +310,7 @@ export class RemixInstrumentation extends InstrumentationBase {
                   const { actionFormDataAttributes: actionFormAttributes } = plugin.getConfig();
 
                   formData.forEach((value: unknown, key: string) => {
-                    if (
-                      actionFormAttributes?.[key] &&
-                      actionFormAttributes[key] !== false &&
-                      typeof value === 'string'
-                    ) {
+                    if (actionFormAttributes?.[key] && typeof value === 'string') {
                       const keyName = actionFormAttributes[key] === true ? key : actionFormAttributes[key];
                       span.setAttribute(`formData.${keyName}`, value.toString());
                     }
diff --git a/packages/remix/test/integration/package.json b/packages/remix/test/integration/package.json
@@ -21,7 +21,7 @@
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "nock": "^13.5.5",
-    "typescript": "~5.0.0"
+    "typescript": "~5.8.0"
   },
   "resolutions": {
     "@sentry/browser": "file:../../../browser",
diff --git a/packages/remix/tsconfig.test.json b/packages/remix/tsconfig.test.json
@@ -8,6 +8,7 @@
     "types": ["node"],
     // Required for top-level await in tests
     "module": "Node16",
+    "moduleResolution": "Node16",
     "target": "es2020",
 
     "esModuleInterop": true
diff --git a/packages/sveltekit/src/worker/cloudflare.ts b/packages/sveltekit/src/worker/cloudflare.ts
@@ -39,7 +39,7 @@ export function initCloudflareSentryHandle(options: CloudflareOptions): Handle {
       return wrapRequestHandler(
         {
           options: opts,
-          request: event.request as Request<unknown, IncomingRequestCfProperties<unknown>>,
+          request: event.request,
           // @ts-expect-error This will exist in Cloudflare
           context: event.platform.context,
           // We don't want to capture errors here, as we want to capture them in the `sentryHandle` handler
diff --git a/packages/tanstackstart-react/tsconfig.json b/packages/tanstackstart-react/tsconfig.json
@@ -3,6 +3,7 @@
   "include": ["src/**/*"],
   "compilerOptions": {
     "lib": ["es2020"],
-    "module": "Node16"
+    "module": "Node16",
+    "moduleResolution": "Node16"
   }
 }
diff --git a/packages/tanstackstart/tsconfig.json b/packages/tanstackstart/tsconfig.json
@@ -3,6 +3,7 @@
   "include": ["src/**/*"],
   "compilerOptions": {
     "lib": ["es2020"],
-    "module": "Node16"
+    "module": "Node16",
+    "moduleResolution": "Node16"
   }
 }
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
@@ -13,7 +13,7 @@
     "tsconfig.json"
   ],
   "peerDependencies": {
-    "typescript": "~5.0.0"
+    "typescript": "~5.8.0"
   },
   "scripts": {
     "clean": "yarn rimraf sentry-internal-typescript-*.tgz",
diff --git a/scripts/verify-packages-versions.js b/scripts/verify-packages-versions.js
@@ -1,6 +1,6 @@
 const pkg = require('../package.json');
 
-const TYPESCRIPT_VERSION = '~5.0.0';
+const TYPESCRIPT_VERSION = '~5.8.0';
 
 if (pkg.devDependencies.typescript !== TYPESCRIPT_VERSION) {
   console.error(`
diff --git a/yarn.lock b/yarn.lock
@@ -30045,7 +30045,7 @@ typescript@4.6.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
   integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
 
-"typescript@>=3 < 6", typescript@^5.0.4, typescript@^5.4.4, typescript@^5.7.3:
+"typescript@>=3 < 6", typescript@^5.0.4, typescript@^5.4.4, typescript@^5.7.3, typescript@~5.8.0:
   version "5.8.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
   integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
@@ -30060,11 +30060,6 @@ typescript@next:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.0-dev.20230530.tgz#4251ade97a9d8a86850c4d5c3c4f3e1cb2ccf52c"
   integrity sha512-bIoMajCZWzLB+pWwncaba/hZc6dRnw7x8T/fenOnP9gYQB/gc4xdm48AXp5SH5I/PvvSeZ/dXkUMtc8s8BiDZw==
 
-typescript@~5.0.0:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"
-  integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
-
 typeson-registry@^1.0.0-alpha.20:
   version "1.0.0-alpha.39"
   resolved "https://registry.yarnpkg.com/typeson-registry/-/typeson-registry-1.0.0-alpha.39.tgz#9e0f5aabd5eebfcffd65a796487541196f4b1211"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@sentry:registry=http://127.0.0.1:4873`
	`2`	`+@sentry-internal:registry=http://127.0.0.1:4873`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ function instrumentPerformanceObserver(type: InstrumentHandlerTypePerformanceObs`
`301`	`301`
`302`	`302`	`function addHandler(type: InstrumentHandlerType, handler: InstrumentHandlerCallback): void {`
`303`	`303`	`handlers[type] = handlers[type] \|\| [];`
`304`		`- (handlers[type] as InstrumentHandlerCallback[]).push(handler);`
	`304`	`+ handlers[type].push(handler);`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`// Get a callback which can be called to remove the instrumentation handler`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,8 @@ export function addProfileToGlobalCache(profile_id: string, profile: JSSelfProfi`
`564`	`564`	`PROFILE_MAP.set(profile_id, profile);`
`565`	`565`
`566`	`566`	`if (PROFILE_MAP.size > 30) {`
`567`		`- const last: string = PROFILE_MAP.keys().next().value;`
	`567`	`+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion`
	`568`	`+ const last = PROFILE_MAP.keys().next().value!;`
`568`	`569`	`PROFILE_MAP.delete(last);`
`569`	`570`	`}`
`570`	`571`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ const instrumented: { [key in InstrumentHandlerType]?: boolean } = {};`
`21`	`21`	`/** Add a handler function. */`
`22`	`22`	`export function addHandler(type: InstrumentHandlerType, handler: InstrumentHandlerCallback): void {`
`23`	`23`	`handlers[type] = handlers[type] \|\| [];`
`24`		`- (handlers[type] as InstrumentHandlerCallback[]).push(handler);`
	`24`	`+ handlers[type].push(handler);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/**`