#12: Fix some server dependencies

regroup/package.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/zadam/trilium.git"
   },
-  "scripts": {    
+  "scripts": {
     "start-electron": "rimraf ./dist && tsc && ts-node ./bin/copy-dist.ts && cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron.js --inspect=5858 .",
     "start-electron-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .",
     "qstart-electron": "npm run qswitch-electron && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron --inspect=5858 .",
@@ -31,39 +31,33 @@
     "test": "npm run test-jasmine && npm run test-es6",
     "postinstall": "rimraf ./node_modules/canvas && npm run rebuild"
   },
-  "dependencies": {    
+  "dependencies": {
     "@electron/remote": "2.1.2",
-    "@excalidraw/excalidraw": "0.17.3",        
+    "@excalidraw/excalidraw": "0.17.3",
     "boxicons": "2.1.4",
-    "chokidar": "3.6.0",        
+    "chokidar": "3.6.0",
     "electron-debug": "3.2.0",
     "electron-dl": "3.5.2",
     "electron-window-state": "5.0.3",
-    "force-graph": "1.43.5",        
+    "force-graph": "1.43.5",
     "http-proxy-agent": "7.0.2",
     "https-proxy-agent": "7.0.4",
-    "image-type": "4.1.0",
-    "is-animated": "2.0.2",
-    "is-svg": "4.3.2",
-    "jimp": "0.22.12",
     "jquery": "3.7.1",
     "jquery-hotkeys": "0.2.2",
     "katex": "0.16.9",
-    "marked": "12.0.0",
     "mermaid": "10.9.0",
-    "node-abi": "3.56.0",    
+    "node-abi": "3.56.0",
     "open": "8.4.1",
     "panzoom": "9.4.3",
-    "print-this": "2.0.0",    
+    "print-this": "2.0.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "request": "2.88.2",
     "rimraf": "5.0.5",
-    "split.js": "1.6.5",    
+    "split.js": "1.6.5",
-    "tree-kill": "1.2.2",    
+    "tree-kill": "1.2.2"
-    "yauzl": "3.1.2"
   },
-  "devDependencies": {    
+  "devDependencies": {
     "electron": "25.9.8",
     "electron-builder": "24.13.3",
     "electron-packager": "17.1.2",
@@ -71,12 +65,12 @@
     "esm": "3.2.25",
     "jasmine": "5.1.0",
     "jsdoc": "4.0.2",
-    "lorem-ipsum": "2.0.8",    
+    "lorem-ipsum": "2.0.8",
-    "rcedit": "4.0.1",    
+    "rcedit": "4.0.1",
     "webpack": "5.90.3",
     "webpack-cli": "5.1.4"
   },
   "optionalDependencies": {
     "electron-installer-debian": "3.2.0"
   }
-}
+}

server/package.json

@@ -9,28 +9,39 @@
     "qstart-server": "npm run qswitch-server && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.ts"
   },
   "dependencies": {
+    "@braintree/sanitize-url": "6.0.4",
     "archiver": "7.0.0",
+    "async-mutex": "0.4.1",
     "axios": "1.6.7",
     "better-sqlite3": "8.4.0",
     "cls-hooked": "4.2.2",
     "compression": "1.7.4",
     "cookie-parser": "1.4.6",
     "csurf": "1.11.0",
-    "dayjs": "1.11.10",
     "dayjs-plugin-utc": "0.1.2",
+    "dayjs": "1.11.10",
+    "debounce": "1.2.1",
     "ejs": "3.1.9",
     "escape-html": "1.0.3",
-    "express": "4.18.3",
     "express-partial-content": "1.0.2",
     "express-rate-limit": "7.2.0",
     "express-session": "1.18.0",
+    "express": "4.18.3",
     "fs-extra": "11.2.0",
     "helmet": "7.1.0",
     "html": "1.0.0",
+    "html2plaintext": "2.1.4",
+    "image-type": "4.1.0",
     "ini": "3.0.1",
+    "is-animated": "2.0.2",
+    "is-svg": "4.3.2",
+    "jimp": "0.22.12",
+    "joplin-turndown-plugin-gfm": "1.0.12",
     "jsdom": "24.0.0",
+    "marked": "12.0.0",
     "mime-types": "2.1.35",
     "multer": "1.4.5-lts.1",
+    "normalize-strings": "1.1.1",
     "rand-token": "1.0.1",
     "safe-compare": "1.1.4",
     "sanitize-filename": "1.6.3",
@@ -40,18 +51,13 @@
     "serve-favicon": "2.5.0",
     "session-file-store": "1.5.0",
     "stream-throttle": "0.1.3",
+    "striptags": "3.2.0",
     "tmp": "0.2.3",
     "turndown": "7.1.2",
     "unescape": "1.0.1",
     "ws": "8.16.0",
     "xml2js": "0.6.2",
-    "async-mutex": "0.4.1",
+    "yauzl": "3.1.2"
-    "debounce": "1.2.1",
-    "@braintree/sanitize-url": "6.0.4",
-    "html2plaintext": "2.1.4",
-    "normalize-strings": "1.1.1",
-    "striptags": "3.2.0",
-    "joplin-turndown-plugin-gfm": "1.0.12"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.2",
@@ -62,8 +68,8 @@
     "@types/csurf": "^1.11.5",
     "@types/ejs": "^3.1.5",
     "@types/escape-html": "^1.0.4",
-    "@types/express": "^4.17.21",
     "@types/express-session": "^1.18.0",
+    "@types/express": "^4.17.21",
     "@types/fs-extra": "^11.0.4",
     "@types/html": "^1.0.4",
     "@types/ini": "^4.1.0",
@@ -81,6 +87,7 @@
     "@types/turndown": "^5.0.4",
     "@types/ws": "^8.5.10",
     "@types/xml2js": "^0.4.14",
+    "@types/yauzl": "^2.10.3",
     "cross-env": "7.0.3",
     "nodemon": "3.1.0",
     "ts-node": "^10.9.2",
@@ -90,4 +97,4 @@
   "keywords": [],
   "author": "",
   "license": "ISC"
-}
+}