From f8b9bf66fa907b3c06dae17da0547135cfaded3f Mon Sep 17 00:00:00 2001
From: Benjie Gillam <benjie@jemjie.com>
Date: Fri, 26 Jun 2026 15:59:12 +0100
Subject: [PATCH 1/4] Min node 22

---
 package.json  |  5 ++---
 tsconfig.json |  2 +-
 yarn.lock     | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index f1abd0c1..0493224a 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "@jest/globals": "^30.2.0",
     "@mdx-js/react": "^1.6.22",
     "@tsconfig/node-ts": "^23.6.4",
-    "@tsconfig/node20": "^20.1.9",
+    "@tsconfig/node22": "^22.0.0",
     "@types/jest": "^30.0.0",
     "@types/json5": "^2.2.0",
     "@types/node": "^20.8.7",
@@ -111,8 +111,7 @@
     "sql"
   ],
   "engines": {
-    "node": ">=20.0.0",
-    "yarn": "^1.22.22"
+    "node": ">=22.18.0"
   },
   "browserslist": {
     "production": [
diff --git a/tsconfig.json b/tsconfig.json
index 2a97176f..e774f683 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": [
-    "@tsconfig/node20/tsconfig.json",
+    "@tsconfig/node22/tsconfig.json",
     "@tsconfig/node-ts/tsconfig.json"
   ],
   "compilerOptions": {
diff --git a/yarn.lock b/yarn.lock
index 47d3ecab..602a5729 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3268,10 +3268,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tsconfig/node20@npm:^20.1.9":
-  version: 20.1.9
-  resolution: "@tsconfig/node20@npm:20.1.9"
-  checksum: 10/3d66cd9942175e477cb6b68d06d9523089fca32de8e63ef09433e2dc89fb737276b196700ee48e5991396a0ee35ba527a86599cf3c80310d6c569312ff79205e
+"@tsconfig/node22@npm:^22.0.0":
+  version: 22.0.5
+  resolution: "@tsconfig/node22@npm:22.0.5"
+  checksum: 10/2e21177946aa0bcd705e8303cd0844eb66d2abc1ceb9ca7bd7762443676e599bb11e7f7b257c027d8dec9d1c62cda114d1a3df5e38699c6b4943e6acadac261d
   languageName: node
   linkType: hard
 
@@ -8289,7 +8289,7 @@ __metadata:
     "@jest/globals": "npm:^30.2.0"
     "@mdx-js/react": "npm:^1.6.22"
     "@tsconfig/node-ts": "npm:^23.6.4"
-    "@tsconfig/node20": "npm:^20.1.9"
+    "@tsconfig/node22": "npm:^22.0.0"
     "@types/debug": "npm:^4.1.10"
     "@types/jest": "npm:^30.0.0"
     "@types/json5": "npm:^2.2.0"

From 36aae0a684296b976b6d87e8537404bb261003ef Mon Sep 17 00:00:00 2001
From: Benjie Gillam <benjie@jemjie.com>
Date: Fri, 26 Jun 2026 16:31:18 +0100
Subject: [PATCH 2/4] Simplify configuration of TypeScript

---
 package.json  |  1 -
 tsconfig.json | 10 ----------
 yarn.lock     |  1 -
 3 files changed, 12 deletions(-)

diff --git a/package.json b/package.json
index 0493224a..54cc8d1d 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,6 @@
     "graphile-config": "^0.0.1-beta.16",
     "json5": "^2.2.3",
     "pg": "^8.11.3",
-    "tslib": "^2.8.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
diff --git a/tsconfig.json b/tsconfig.json
index e774f683..19c0eece 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,18 +9,8 @@
 
     "verbatimModuleSyntax": false,
 
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
-    "isolatedModules": true,
-
     "declaration": true,
-    "allowJs": false,
     "sourceMap": true,
-    "pretty": true,
-    "importHelpers": true,
-    "experimentalDecorators": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
     "noFallthroughCasesInSwitch": true,
     "noUnusedParameters": false,
     "noUnusedLocals": false,
diff --git a/yarn.lock b/yarn.lock
index 602a5729..9fc8df4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8321,7 +8321,6 @@ __metadata:
     react-dom: "npm:^18.2.0"
     svgo: "npm:^2.0.0"
     ts-jest: "npm:^29.4.6"
-    tslib: "npm:^2.8.1"
     typescript: "npm:^5.9.3"
     yargs: "npm:^17.7.2"
     zx: "npm:^8.8.5"

From 894db59b56c51c22be8a84269e01699fcac631db Mon Sep 17 00:00:00 2001
From: Benjie Gillam <benjie@jemjie.com>
Date: Fri, 26 Jun 2026 18:45:57 +0100
Subject: [PATCH 3/4] No more tslib

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54cc8d1d..e61c201d 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "test": "yarn prepack && yarn depcheck && yarn test:setupdb && yarn test:only",
     "test:setupdb": "./scripts/setup_template_db.sh",
     "test:only": "NO_LOG_SUCCESS=1 node --experimental-vm-modules node_modules/.bin/jest",
-    "depcheck": "depcheck --ignores='graphile-worker,faktory-worker,@google-cloud/tasks,bullmq,jest-environment-node,@docusaurus/*,@fortawesome/*,@mdx-js/*,@types/jest,clsx,eslint_d,graphile,juice,postcss-nested,prism-react-renderer,react,react-dom,svgo,@types/*,@tsconfig/*,tslib,@typescript-eslint/*,eslint-*'",
+    "depcheck": "depcheck --ignores='graphile-worker,faktory-worker,@google-cloud/tasks,bullmq,jest-environment-node,@docusaurus/*,@fortawesome/*,@mdx-js/*,@types/jest,clsx,eslint_d,graphile,juice,postcss-nested,prism-react-renderer,react,react-dom,svgo,@types/*,@tsconfig/*,@typescript-eslint/*,eslint-*'",
     "db:dump": "./scripts/dump_db",
     "perfTest": "cd perfTest && node ./run.js",
     "towerDefence": "cd towerDefence && node ./run.mjs",

From 8e2fe129932ac92271231840eb839a661514f7ae Mon Sep 17 00:00:00 2001
From: Benjie Gillam <benjie@jemjie.com>
Date: Fri, 26 Jun 2026 18:46:11 +0100
Subject: [PATCH 4/4] Enable isolatedModules

---
 tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tsconfig.json b/tsconfig.json
index 19c0eece..fbf770bd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,6 +8,7 @@
     "outDir": "./dist",
 
     "verbatimModuleSyntax": false,
+    "isolatedModules": true,
 
     "declaration": true,
     "sourceMap": true,