From 5ec3d58f6f7d44d02342d93e6802c434c44c03d1 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Wed, 26 Mar 2025 08:30:56 +0200
Subject: [PATCH 1/3] fix(electron): option does not exist

---
 electron.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron.ts b/electron.ts
index 6beda97cf..938440947 100644
--- a/electron.ts
+++ b/electron.ts
@@ -23,7 +23,7 @@ electronDl({ saveAs: true });
 
 // needed for excalidraw export https://github.com/zadam/trilium/issues/4271
 electron.app.commandLine.appendSwitch("enable-experimental-web-platform-features");
-electron.app.commandLine.appendSwitch("lang", options.getOption("formattingLocale") ?? "en");
+electron.app.commandLine.appendSwitch("lang", options.getOptionOrNull("formattingLocale") ?? "en");
 
 electron.app.userAgentFallback = `${electron.app.getName()} ${electron.app.getVersion()}`;
 

From b97c28bc135b5a3cff373b6a21aec1f69c3a8fb9 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Wed, 26 Mar 2025 08:10:04 +0100
Subject: [PATCH 2/3] ci: bump to node v22 -> fixes EBADENGINE warning

npm warn EBADENGINE Unsupported engine {
npm warn EBADENGINE   package: 'node-abi@4.2.0',
npm warn EBADENGINE   required: { node: '>=22.12.0' },
npm warn EBADENGINE   current: { node: 'v20.18.1', npm: '10.8.2' }
npm warn EBADENGINE }
---
 .github/actions/build-server/action.yml | 2 +-
 .github/workflows/dev.yml               | 2 +-
 .github/workflows/main-docker.yml       | 2 +-
 .github/workflows/nightly.yml           | 2 +-
 .github/workflows/release.yml           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/build-server/action.yml b/.github/actions/build-server/action.yml
index 7423b8c4a..d296838a2 100644
--- a/.github/actions/build-server/action.yml
+++ b/.github/actions/build-server/action.yml
@@ -11,7 +11,7 @@ runs:
     - name: Set up node & dependencies
       uses: actions/setup-node@v4
       with:
-        node-version: 20
+        node-version: 22
         cache: "npm"
     - name: Install dependencies
       shell: bash
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 18ff8190b..e7bff39e9 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: "npm"
 
       - run: npm ci
diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml
index 085ae836e..25277d30a 100644
--- a/.github/workflows/main-docker.yml
+++ b/.github/workflows/main-docker.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: "npm"
 
       - name: Install npm dependencies
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f63c9f578..95204f1d3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - name: Install dependencies
         run: npm ci
       - name: Update nightly version
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4f791bda0..b3f334ec8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - name: Run the build
         uses: ./.github/actions/build-electron
         with:

From 1e713469e797b54b192aa8d2c11d9bc1be466ca0 Mon Sep 17 00:00:00 2001
From: Panagiotis Papadopoulos <pano_90@gmx.net>
Date: Wed, 26 Mar 2025 08:12:22 +0100
Subject: [PATCH 3/3] build(server): bump to latest node v22.14.0 -> fixes
 EBADENGINE warning

npm warn EBADENGINE Unsupported engine {
npm warn EBADENGINE   package: 'node-abi@4.2.0',
npm warn EBADENGINE   required: { node: '>=22.12.0' },
npm warn EBADENGINE   current: { node: 'v20.18.1', npm: '10.8.2' }
npm warn EBADENGINE }
---
 bin/build-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/build-server.sh b/bin/build-server.sh
index 3af7ec9f5..052a8131b 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -21,7 +21,7 @@ fi
 echo "Selected Arch: $ARCH"
 
 # Set Node.js version and architecture-specific filename
-NODE_VERSION=20.15.1
+NODE_VERSION=22.14.0
 
 BUILD_DIR="./build"
 DIST_DIR="./dist"