diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f5ffc7daf..a2b8fdbe32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,8 +22,8 @@ jobs:
       run: |
         tsc -b addons/xterm-addon-image/src/tsconfig.json
         yarn esbuild
-    - name: Build
-      run: yarn setup
+    - name: Check types # TODO: This could be its own job
+      run: yarn check-types
     - name: Zip artifacts
       run: |
         zip -r compressed-build \
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 222627f0b1..6314b4dc4a 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -20,7 +20,7 @@
     {
       "label": "watch-types",
       "type": "npm",
-      "script": "watch",
+      "script": "watch-types",
       "group": "build",
       "isBackground": true,
       "problemMatcher": "$tsc-watch",
diff --git a/package.json b/package.json
index 75c776e2d5..74653a8760 100644
--- a/package.json
+++ b/package.json
@@ -52,11 +52,15 @@
     "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/test/benchmark/*benchmark.js",
     "clean": "rm -rf lib out addons/*/lib addons/*/out",
     "vtfeatures": "node bin/extract_vtfeatures.js src/**/*.ts src/*.ts",
+
     "esbuild": "node bin/esbuild_all.mjs",
     "esbuild-dev": "node bin/esbuild_all.mjs --dev",
     "esbuild-dev-watch": "node bin/esbuild_all.mjs --dev --watch",
     "esbuild-demo": "node bin/esbuild.mjs --demo-client",
-    "esbuild-demo-watch": "node bin/esbuild.mjs --demo-client --watch"
+    "esbuild-demo-watch": "node bin/esbuild.mjs --demo-client --watch",
+
+    "check-types": "tsc -b ./tsconfig.all.json --emitDeclarationOnly",
+    "watch-types": "tsc -w -b ./tsconfig.all.json --emitDeclarationOnly"
   },
   "devDependencies": {
     "@types/chai": "^4.2.22",