From 66d34ba97c665e6d4d2b12749d428274373fa42e Mon Sep 17 00:00:00 2001
From: Alexander <protonull@protonmail.com>
Date: Tue, 7 Apr 2026 20:54:21 +0100
Subject: [PATCH 1/3] Update to node25

---
 .github/workflows/build-server.yml | 2 +-
 Dockerfile                         | 2 +-
 mapsync-server/.editorconfig       | 3 +++
 mapsync-server/.nvmrc              | 2 +-
 mapsync-server/package.json        | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-server.yml b/.github/workflows/build-server.yml
index 8aa83a24..7c6a12d5 100644
--- a/.github/workflows/build-server.yml
+++ b/.github/workflows/build-server.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: "24"
+          node-version-file: ./mapsync-server/.nvmrc
           cache: "pnpm"
           cache-dependency-path: ./mapsync-server/pnpm-lock.yaml
 
diff --git a/Dockerfile b/Dockerfile
index fcfdc160..102e69b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # base is shared between build/test and deploy
-FROM node:24-alpine AS base
+FROM node:25-alpine AS base
 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
diff --git a/mapsync-server/.editorconfig b/mapsync-server/.editorconfig
index cfc8f3e6..ddbc0847 100644
--- a/mapsync-server/.editorconfig
+++ b/mapsync-server/.editorconfig
@@ -1,4 +1,7 @@
 # https://editorconfig.org
 
+[.nvmrc]
+insert_final_newline = false
+
 [*.{ts,json}]
 indent_style = space
diff --git a/mapsync-server/.nvmrc b/mapsync-server/.nvmrc
index a45fd52c..410b14d2 100644
--- a/mapsync-server/.nvmrc
+++ b/mapsync-server/.nvmrc
@@ -1 +1 @@
-24
+25
\ No newline at end of file
diff --git a/mapsync-server/package.json b/mapsync-server/package.json
index 8228fb01..c034f5cf 100644
--- a/mapsync-server/package.json
+++ b/mapsync-server/package.json
@@ -34,7 +34,7 @@
         "bufferutil": "4.1.0"
     },
     "engines": {
-        "node": "24.x"
+        "node": "25.x"
     },
     "prettier": {
         "useTabs": false,

From 3af0fb5bc408b8d32442a8b9a0e6038a4058f12f Mon Sep 17 00:00:00 2001
From: Alexander <protonull@protonmail.com>
Date: Tue, 7 Apr 2026 20:54:41 +0100
Subject: [PATCH 2/3] Rearrange pnpm-workspace.yaml

---
 mapsync-server/pnpm-workspace.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mapsync-server/pnpm-workspace.yaml b/mapsync-server/pnpm-workspace.yaml
index fc26b9ca..c08bae21 100644
--- a/mapsync-server/pnpm-workspace.yaml
+++ b/mapsync-server/pnpm-workspace.yaml
@@ -2,12 +2,12 @@ allowBuilds:
   better-sqlite3: true
   bufferutil: true
 
-blockExoticSubdeps: true
-# prevent packages newer than 1 day old from being installed
-minimumReleaseAge: 1440
-# https://pnpm.io/settings#trustpolicy
 onlyBuiltDependencies:
   - better-sqlite3
   - bufferutil
 
+blockExoticSubdeps: true
+# prevent packages newer than 1 day old from being installed
+minimumReleaseAge: 1440
+# https://pnpm.io/settings#trustpolicy
 trustPolicy: no-downgrade

From 259326aea35650b2f285f915f01ae398c621e2c2 Mon Sep 17 00:00:00 2001
From: Alexander <protonull@protonmail.com>
Date: Tue, 7 Apr 2026 20:59:40 +0100
Subject: [PATCH 3/3] Re-add compile step to start:dev

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

diff --git a/mapsync-server/package.json b/mapsync-server/package.json
index c034f5cf..910b6238 100644
--- a/mapsync-server/package.json
+++ b/mapsync-server/package.json
@@ -12,7 +12,7 @@
         "format": "prettier -w .",
         "test": "true",
         "start": "node -r source-map-support/register dist/main.js",
-        "start:dev": "node --inspect -r source-map-support/register dist/main.js"
+        "start:dev": "tsc && node --inspect -r source-map-support/register dist/main.js"
     },
     "dependencies": {
         "async-mutex": "0.5.0",