From 3860f1cf7f131cbd61b1e4ddcadfa46d3169993b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Harrtell?=
 <bjornharrtell@users.noreply.github.com>
Date: Mon, 30 Mar 2026 14:32:24 +0200
Subject: [PATCH] [TS] Fixup TS test run at CI (#9004)

---
 .github/workflows/build.yml |  2 +-
 pnpm-lock.yaml              |  6 ++++++
 pnpm-workspace.yaml         |  2 ++
 tests/ts/TypeScriptTest.py  | 12 +++---------
 tests/ts/package.json       |  2 +-
 tests/ts/pnpm-lock.yaml     | 10 ----------
 6 files changed, 13 insertions(+), 21 deletions(-)
 create mode 100644 pnpm-workspace.yaml
 delete mode 100644 tests/ts/pnpm-lock.yaml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c50c6af2f..c7cae714c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -545,7 +545,7 @@ jobs:
       # FIXME: make test script not rely on flatc
       run: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_INSTALL=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF . && make -j
     - name: pnpm
-      run: npm install -g pnpm esbuild
+      run: npm install -g pnpm
     - name: deps
       run: pnpm i
     - name: compile
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9d5791710..315c14ceb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -33,6 +33,12 @@ importers:
         specifier: ^8.34.1
         version: 8.34.1(eslint@9.29.0)(typescript@5.8.3)
 
+  tests/ts:
+    dependencies:
+      flatbuffers:
+        specifier: workspace:*
+        version: link:../..
+
 packages:
 
   '@esbuild/aix-ppc64@0.25.5':
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 000000000..340c44e00
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+  - tests/ts
diff --git a/tests/ts/TypeScriptTest.py b/tests/ts/TypeScriptTest.py
index 9c1765f09..7bf4317f0 100755
--- a/tests/ts/TypeScriptTest.py
+++ b/tests/ts/TypeScriptTest.py
@@ -62,16 +62,10 @@ def flatc(
 
 # Execute esbuild with the specified parameters
 def esbuild(input, output):
-  cmd = ["esbuild", input, "--outfile=" + output]
+  cmd = ["../../node_modules/.bin/esbuild", input, "--outfile=" + output]
   cmd += ["--format=cjs", "--bundle", "--external:flatbuffers"]
   check_call(cmd)
 
-
-print("Removing node_modules/ directory...")
-shutil.rmtree(Path(tests_path, "node_modules"), ignore_errors=True)
-
-check_call(["npm", "install", "--silent"])
-
 flatc(
     options=[
         "--ts",
@@ -228,12 +222,12 @@ flatc(
 )
 
 print("Running TypeScript Compiler...")
-check_call(["tsc"])
+check_call(["../../node_modules/.bin/tsc"])
 print(
     "Running TypeScript Compiler in old node resolution mode for"
     " no_import_ext..."
 )
-check_call(["tsc", "-p", "./tsconfig.node.json"])
+check_call(["../../node_modules/.bin/tsc", "-p", "./tsconfig.node.json"])
 
 NODE_CMD = ["node"]
 
diff --git a/tests/ts/package.json b/tests/ts/package.json
index 1639cf831..6afc78544 100644
--- a/tests/ts/package.json
+++ b/tests/ts/package.json
@@ -1,6 +1,6 @@
 {
     "type": "module",
     "dependencies": {
-        "flatbuffers": "../../"
+        "flatbuffers": "workspace:*"
     }
 }
diff --git a/tests/ts/pnpm-lock.yaml b/tests/ts/pnpm-lock.yaml
deleted file mode 100644
index 730e4d7b2..000000000
--- a/tests/ts/pnpm-lock.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-lockfileVersion: '6.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-dependencies:
-  flatbuffers:
-    specifier: ../../
-    version: link:../..