Merge branch 'develop' into renovate/csrf-csrf-4.x

Author: eliandoran

.github/workflows/dev.yml

@@ -19,9 +19,33 @@ permissions:
   pull-requests: write  # for PR comments
 
 jobs:
+  check-affected:
+    name: Check affected jobs (NX)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # needed for https://github.com/marketplace/actions/nx-set-shas
+
+      - uses: pnpm/action-setup@v4
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - uses: nrwl/nx-set-shas@v4
+      - name: Check affected
+        run: pnpm nx affected -t rebuild-deps
+
   report-electron-size:
     name: Report Electron size
     runs-on: ubuntu-latest
+    needs:
+      - check-affected
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
@@ -55,6 +79,8 @@ jobs:
   report-server-size:
     name: Report server size
     runs-on: ubuntu-latest
+    needs:
+      - check-affected
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
@@ -87,6 +113,8 @@ jobs:
   test_dev:
     name: Test development
     runs-on: ubuntu-latest
+    needs:
+      - check-affected
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
@@ -107,6 +135,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - test_dev
+      - check-affected
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
@@ -127,6 +156,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build_docker
+      - check-affected
     strategy:
       matrix:
         include:

_regroup/package.json

@@ -38,7 +38,7 @@
     "@playwright/test": "1.51.1",
     "@stylistic/eslint-plugin": "4.2.0",        
     "@types/express": "5.0.1",    
-    "@types/node": "22.14.1",    
+    "@types/node": "22.15.3",    
     "@types/yargs": "17.0.33",
     "@vitest/coverage-v8": "3.1.2",
     "eslint": "9.24.0",
@@ -49,7 +49,7 @@
     "rcedit": "4.0.1",
     "rimraf": "6.0.1",    
     "tslib": "2.8.1",    
-    "typedoc": "0.28.2",
+    "typedoc": "0.28.3",
     "typedoc-plugin-missing-exports": "4.0.0"
   },
   "optionalDependencies": {

_regroup_monorepo/apps/server/Dockerfile

@@ -22,7 +22,7 @@ RUN npm ci && \
 #      as we install necessary dependencies in runtime buildstage anyways
 
 # Runtime stage
-FROM node:22.14.0-bullseye-slim
+FROM node:22.15.0-bullseye-slim
 
 WORKDIR /usr/src/app
 

_regroup_monorepo/apps/server/Dockerfile.alpine

@@ -1,5 +1,5 @@
 # Build stage
-FROM node:22.14.0-alpine AS builder
+FROM node:22.15.0-alpine AS builder
 
 WORKDIR /usr/src/app/build
 

apps/client/package.json

@@ -38,7 +38,7 @@
     "jsplumb": "2.15.6",
     "knockout": "3.5.1",
     "leaflet": "1.9.4",
-    "leaflet-gpx": "2.1.2",
+    "leaflet-gpx": "2.2.0",
     "mark.js": "8.11.1",
     "marked": "15.0.11",
     "mermaid": "11.6.0",

apps/desktop/package.json

@@ -18,7 +18,7 @@
     "@triliumnext/server": "workspace:*",
     "copy-webpack-plugin": "13.0.0",
     "electron": "35.1.5",
-    "@electron/rebuild": "3.7.2",
+    "@electron/rebuild": "4.0.1",
     "@electron-forge/cli": "7.8.0",
     "@electron-forge/maker-deb": "7.8.0",
     "@electron-forge/maker-dmg": "7.8.0",
@@ -53,7 +53,7 @@
         "cache": true,
         "configurations": {
           "default": {
-            "command": "cross-env DEBUG=* tsx scripts/rebuild.ts",
+            "command": "cross-env DEBUG=* tsx scripts/rebuild.mts",
             "cwd": "{projectRoot}"
           },
           "nixos": {

apps/desktop/scripts/rebuild.ts renamed to apps/desktop/scripts/rebuild.mts

@@ -8,7 +8,7 @@
 
 import { fileURLToPath } from "url";
 import { dirname, join } from "path";
-import rebuild from "@electron/rebuild"
+import { rebuild } from "@electron/rebuild"
 import { readFileSync } from "fs";
 
 const scriptDir = dirname(fileURLToPath(import.meta.url));

apps/edit-docs/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "devDependencies": {
-    "@electron/rebuild": "3.7.2",
+    "@electron/rebuild": "4.0.1",
     "@triliumnext/client": "workspace:*",
     "@triliumnext/desktop": "workspace:*",
     "@types/fs-extra": "11.0.4",
@@ -21,7 +21,7 @@
         "cache": true,
         "configurations": {
           "default": {
-            "command": "cross-env DEBUG=* tsx scripts/rebuild.ts",
+            "command": "cross-env DEBUG=* tsx scripts/rebuild.mts",
             "cwd": "{projectRoot}"
           },
           "nixos": {

apps/edit-docs/scripts/rebuild.ts renamed to apps/edit-docs/scripts/rebuild.mts

@@ -10,7 +10,7 @@
 
 import { fileURLToPath } from "url";
 import { dirname, join } from "path";
-import rebuild from "@electron/rebuild"
+import { rebuild } from "@electron/rebuild"
 import { readFileSync } from "fs";
 
 const scriptDir = dirname(fileURLToPath(import.meta.url));

apps/edit-docs/tsconfig.app.json

@@ -18,9 +18,6 @@
     "eslint.config.mjs"
   ],
   "references": [
-    {
-      "path": "../server/tsconfig.app.json"
-    },
     {
       "path": "../desktop/tsconfig.app.json"
     },