From db3cc48ddaf407955766aa22317edf24c9ba44ce Mon Sep 17 00:00:00 2001
From: dpiercey <dpiercey@ebay.com>
Date: Tue, 14 Apr 2026 11:04:48 -0700
Subject: [PATCH] feat: upgrade to typescript 6

---
 .changeset/dirty-toys-repeat.md       |  7 +++++++
 package-lock.json                     | 17 ++++++++++-------
 package.json                          |  2 +-
 packages/language-server/package.json |  2 +-
 packages/type-check/package.json      |  2 +-
 packages/vscode/package.json          |  2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/dirty-toys-repeat.md

diff --git a/.changeset/dirty-toys-repeat.md b/.changeset/dirty-toys-repeat.md
new file mode 100644
index 00000000..50c32bc8
--- /dev/null
+++ b/.changeset/dirty-toys-repeat.md
@@ -0,0 +1,7 @@
+---
+"@marko/language-server": major
+"@marko/type-check": major
+"marko-vscode": major
+---
+
+Upgrade to typescript 6.
diff --git a/package-lock.json b/package-lock.json
index 72c47c7f..0079309a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
         "prettier": "^3.8.2",
         "prettier-plugin-packagejson": "^3.0.2",
         "tsx": "^4.21.0",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.2",
         "typescript-eslint": "^8.58.2"
       }
     },
@@ -10476,9 +10476,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
+      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -11229,7 +11229,7 @@
         "prettier": "^3.8.2",
         "prettier-plugin-marko": "^4.0.9",
         "relative-import-path": "^1.0.0",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.2",
         "vscode-css-languageservice": "^6.3.10",
         "vscode-languageserver": "^9.0.1",
         "vscode-languageserver-textdocument": "^1.0.12",
@@ -11271,7 +11271,7 @@
         "@marko/language-tools": "^2.5.58",
         "arg": "^5.0.2",
         "kleur": "^4.1.5",
-        "typescript": "^5.9.3"
+        "typescript": "^6.0.2"
       },
       "bin": {
         "marko-type-check": "dist/cli.js",
@@ -11286,7 +11286,7 @@
         "@marko/language-server": "^2.1.31",
         "@types/vscode": "^1.80.0",
         "@vscode/test-electron": "^2.5.2",
-        "@vscode/vsce": "^3.7.1",
+        "@vscode/vsce": "^3.8.0",
         "ovsx": "^0.10.11",
         "tsx": "^4.21.0",
         "vscode-languageclient": "^9.0.1"
@@ -11294,6 +11294,9 @@
       "engines": {
         "vscode": "^1.80.0"
       }
+    },
+    "packages/vscode/node_modules/marko-ts-plugin": {
+      "extraneous": true
     }
   }
 }
diff --git a/package.json b/package.json
index 6105cef1..22b1d777 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "prettier": "^3.8.2",
     "prettier-plugin-packagejson": "^3.0.2",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.2",
     "typescript-eslint": "^8.58.2"
   }
 }
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
index dc0652b5..8f6fbceb 100644
--- a/packages/language-server/package.json
+++ b/packages/language-server/package.json
@@ -48,7 +48,7 @@
     "prettier": "^3.8.2",
     "prettier-plugin-marko": "^4.0.9",
     "relative-import-path": "^1.0.0",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.2",
     "vscode-css-languageservice": "^6.3.10",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.12",
diff --git a/packages/type-check/package.json b/packages/type-check/package.json
index 75d6597a..7226fb69 100644
--- a/packages/type-check/package.json
+++ b/packages/type-check/package.json
@@ -34,6 +34,6 @@
     "@marko/language-tools": "^2.5.58",
     "arg": "^5.0.2",
     "kleur": "^4.1.5",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   }
 }
diff --git a/packages/vscode/package.json b/packages/vscode/package.json
index 1c8e39d9..a5cfc3ad 100644
--- a/packages/vscode/package.json
+++ b/packages/vscode/package.json
@@ -122,7 +122,7 @@
     "@marko/language-server": "^2.1.31",
     "@types/vscode": "^1.80.0",
     "@vscode/test-electron": "^2.5.2",
-    "@vscode/vsce": "^3.7.1",
+    "@vscode/vsce": "^3.8.0",
     "ovsx": "^0.10.11",
     "tsx": "^4.21.0",
     "vscode-languageclient": "^9.0.1"