diff --git a/package.json b/package.json
index 8670654b51..94a5471c91 100644
--- a/package.json
+++ b/package.json
@@ -188,7 +188,7 @@
     "storybook": "^10.3.0",
     "stylelint": "^17.0.0",
     "stylelint-config-standard-scss": "^17.0.0",
-    "typescript": "~5.9.0",
+    "typescript": "~6.0.0",
     "typescript-eslint": "^8.55.0",
     "typescript-plugin-css-modules": "^5.2.0",
     "vitest": "^4.1.0"
diff --git a/streaming/package.json b/streaming/package.json
index 3989917b08..04ab576f89 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -38,7 +38,7 @@
     "@types/ws": "^8.5.9",
     "globals": "^17.3.0",
     "pino-pretty": "^13.0.0",
-    "typescript": "~5.9.0",
+    "typescript": "~6.0.0",
     "typescript-eslint": "^8.55.0"
   },
   "optionalDependencies": {
diff --git a/tsconfig.json b/tsconfig.json
index db727baf18..98401ec95a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,9 +1,6 @@
 {
   "compilerOptions": {
     "jsx": "react-jsx",
-    "target": "esnext",
-    "module": "ES2022",
-    "moduleResolution": "bundler",
     "allowJs": true,
     "resolveJsonModule": true,
     "noEmit": true,
@@ -14,15 +11,14 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "types": ["vite/client", "vitest/globals"],
-    "baseUrl": "./",
     "incremental": true,
     "tsBuildInfoFile": "tmp/cache/tsconfig.tsbuildinfo",
     "paths": {
-      "@/*": ["app/javascript/*"],
-      "mastodon": ["app/javascript/mastodon"],
-      "mastodon/*": ["app/javascript/mastodon/*"],
-      "images/*": ["app/javascript/images/*"],
-      "styles/*": ["app/javascript/styles/*"]
+      "@/*": ["./app/javascript/*"],
+      "mastodon": ["./app/javascript/mastodon"],
+      "mastodon/*": ["./app/javascript/mastodon/*"],
+      "images/*": ["./app/javascript/images/*"],
+      "styles/*": ["./app/javascript/styles/*"]
     },
     "plugins": [{ "name": "typescript-plugin-css-modules" }]
   },
diff --git a/yarn.lock b/yarn.lock
index e4b7b7da1c..725844c107 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2939,7 +2939,7 @@ __metadata:
     tesseract.js: "npm:^7.0.0"
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
-    typescript: "npm:~5.9.0"
+    typescript: "npm:~6.0.0"
     typescript-eslint: "npm:^8.55.0"
     typescript-plugin-css-modules: "npm:^5.2.0"
     use-debounce: "npm:^10.0.0"
@@ -2985,7 +2985,7 @@ __metadata:
     pino-http: "npm:^11.0.0"
     pino-pretty: "npm:^13.0.0"
     prom-client: "npm:^15.0.0"
-    typescript: "npm:~5.9.0"
+    typescript: "npm:~6.0.0"
     typescript-eslint: "npm:^8.55.0"
     utf-8-validate: "npm:^6.0.3"
     uuid: "npm:^13.0.0"
@@ -14114,7 +14114,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.6.0, typescript@npm:~5.9.0":
+"typescript@npm:^5.6.0":
   version: 5.9.3
   resolution: "typescript@npm:5.9.3"
   bin:
@@ -14124,7 +14124,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.6.0#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.9.0#optional!builtin<compat/typescript>":
+"typescript@npm:~6.0.0":
+  version: 6.0.2
+  resolution: "typescript@npm:6.0.2"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/4b860b0bf87cc0fee0f66d8ef2640b5a8a8a8c74d1129adb82e389e5f97124383823c47946bef8a73ede371461143a3aa8544399d2133c7b2e4f07e81860af7f
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A^5.6.0#optional!builtin<compat/typescript>":
   version: 5.9.3
   resolution: "typescript@patch:typescript@npm%3A5.9.3#optional!builtin<compat/typescript>::version=5.9.3&hash=5786d5"
   bin:
@@ -14134,6 +14144,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@npm%3A~6.0.0#optional!builtin<compat/typescript>":
+  version: 6.0.2
+  resolution: "typescript@patch:typescript@npm%3A6.0.2#optional!builtin<compat/typescript>::version=6.0.2&hash=5786d5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/49f0b84fc6ca55653e77752b8a61beabc09ee3dae5d965c31596225aa6ef213c5727b1d2e895b900416dc603854ba0872ac4a812c2a4ed6793a601f9c675de02
+  languageName: node
+  linkType: hard
+
 "unbox-primitive@npm:^1.1.0":
   version: 1.1.0
   resolution: "unbox-primitive@npm:1.1.0"