From 6761c9b744593eef6dbe4123b375d69c8bb2d7a9 Mon Sep 17 00:00:00 2001
From: Zeke Foppa <bfops@users.noreply.github.com>
Date: Tue, 21 Apr 2026 11:44:27 -0700
Subject: [PATCH 1/4] [bfops/typescript-lint]: CI - Fold typescript lint into
 `cargo ci lint`

---
 .github/workflows/typescript-lint.yml | 40 ---------------------------
 tools/ci/src/main.rs                  |  4 ++-
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 .github/workflows/typescript-lint.yml

diff --git a/.github/workflows/typescript-lint.yml b/.github/workflows/typescript-lint.yml
deleted file mode 100644
index d7f51fae5d5..00000000000
--- a/.github/workflows/typescript-lint.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: TypeScript - Lint
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-  merge_group:
-
-jobs:
-  build:
-    runs-on: spacetimedb-new-runner-2
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      - uses: pnpm/action-setup@v4
-        with:
-          run_install: true
-
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Lint
-        run: pnpm lint
diff --git a/tools/ci/src/main.rs b/tools/ci/src/main.rs
index cef4b6fda34..95be20427ca 100644
--- a/tools/ci/src/main.rs
+++ b/tools/ci/src/main.rs
@@ -218,7 +218,8 @@ enum CiCmd {
     Test,
     /// Lints the codebase
     ///
-    /// Runs rustfmt, clippy, csharpier and generates rust docs to ensure there are no warnings.
+    /// Runs rustfmt, clippy, csharpier, TypeScript lint, and generates rust docs to ensure there
+    /// are no warnings.
     Lint,
     /// Tests Wasm bindings
     ///
@@ -426,6 +427,7 @@ fn main() -> Result<()> {
             cmd!("dotnet", "csharpier", "--check", ".")
                 .dir("crates/bindings-csharp")
                 .run()?;
+            cmd!("pnpm", "lint").run()?;
             // `bindings` is the only crate we care strongly about documenting,
             // since we link to its docs.rs from our website.
             // We won't pass `--no-deps`, though,

From e9f7aec05a0df4bf950227bf295091f90b79c3c1 Mon Sep 17 00:00:00 2001
From: Zeke Foppa <bfops@users.noreply.github.com>
Date: Tue, 21 Apr 2026 13:53:45 -0700
Subject: [PATCH 2/4] [bfops/typescript-lint]: fix?

---
 .github/workflows/ci.yml | 4 ++++
 tools/ci/README.md       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b34b882dfd..62003cfe696 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -299,6 +299,10 @@ jobs:
         with:
           global-json-file: global.json
 
+      - uses: pnpm/action-setup@v4
+        with:
+          run_install: true
+
       - name: Run ci lint
         run: cargo ci lint
 
diff --git a/tools/ci/README.md b/tools/ci/README.md
index c01598359e7..91bca8784f4 100644
--- a/tools/ci/README.md
+++ b/tools/ci/README.md
@@ -44,7 +44,7 @@ Usage: test
 
 Lints the codebase
 
-Runs rustfmt, clippy, csharpier and generates rust docs to ensure there are no warnings.
+Runs rustfmt, clippy, csharpier, TypeScript lint, and generates rust docs to ensure there are no warnings.
 
 **Usage:**
 ```bash

From ef28adce313ff7274795d51a16c69937757ec99e Mon Sep 17 00:00:00 2001
From: Zeke Foppa <bfops@users.noreply.github.com>
Date: Tue, 21 Apr 2026 14:13:29 -0700
Subject: [PATCH 3/4] [bfops/typescript-lint]: fix?

---
 .github/workflows/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 62003cfe696..c5540095bfc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -299,6 +299,11 @@ jobs:
         with:
           global-json-file: global.json
 
+      - name: Set up Node.js
+       uses: actions/setup-node@v4
+       with:
+         node-version: 22
+
       - uses: pnpm/action-setup@v4
         with:
           run_install: true

From 8d3c5eee79e404205f2e749e2554e1606859e44e Mon Sep 17 00:00:00 2001
From: Zeke Foppa <bfops@users.noreply.github.com>
Date: Tue, 21 Apr 2026 14:16:13 -0700
Subject: [PATCH 4/4] [bfops/typescript-lint]: fix?

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c5540095bfc..a8d30a2cfae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -300,9 +300,9 @@ jobs:
           global-json-file: global.json
 
       - name: Set up Node.js
-       uses: actions/setup-node@v4
-       with:
-         node-version: 22
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
 
       - uses: pnpm/action-setup@v4
         with: