Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into renovate/jsdoc-4.x

Browse Source
This commit is contained in:
Elian Doran
2024-12-11 18:25:12 +02:00
parent f108775a6a e85da342d1
commit 1fa2758464
4 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dump-db/package-lock.json generated
View File

@@ -380,11 +380,10 @@
} }
}, },
"node_modules/@types/better-sqlite3": { "node_modules/@types/better-sqlite3": {
"version": "7.6.11", "version": "7.6.12",
"resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.11.tgz", "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.12.tgz",
"integrity": "sha512-i8KcD3PgGtGBLl3+mMYA8PdKkButvPyARxA7IQAd6qeslht13qxb1zzO8dRCtE7U3IoJS782zDBAeoKiM695kg==", "integrity": "sha512-fnQmj8lELIj7BSrZQAdBMHEHX8OZLYIHXqAKT1O7tDfLxaINzf00PMjw22r3N/xXh0w/sGHlO6SVaCQ2mj78lg==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
@@ -1461,9 +1460,9 @@
"optional": true "optional": true
}, },
"@types/better-sqlite3": { "@types/better-sqlite3": {
"version": "7.6.11", "version": "7.6.12",
"resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.11.tgz", "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.12.tgz",
"integrity": "sha512-i8KcD3PgGtGBLl3+mMYA8PdKkButvPyARxA7IQAd6qeslht13qxb1zzO8dRCtE7U3IoJS782zDBAeoKiM695kg==", "integrity": "sha512-fnQmj8lELIj7BSrZQAdBMHEHX8OZLYIHXqAKT1O7tDfLxaINzf00PMjw22r3N/xXh0w/sGHlO6SVaCQ2mj78lg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"

72
package-lock.json generated
View File

@@ -32,7 +32,7 @@
"dayjs-plugin-utc": "0.1.2", "dayjs-plugin-utc": "0.1.2",
"debounce": "2.2.0", "debounce": "2.2.0",
"ejs": "3.1.10", "ejs": "3.1.10",
"electron-debug": "4.0.1", "electron-debug": "4.1.0",
"electron-dl": "4.0.0", "electron-dl": "4.0.0",
"electron-squirrel-startup": "1.0.1", "electron-squirrel-startup": "1.0.1",
"electron-window-state": "5.0.3", "electron-window-state": "5.0.3",
@@ -69,7 +69,7 @@
"marked": "15.0.3", "marked": "15.0.3",
"mermaid": "11.4.1", "mermaid": "11.4.1",
"mime-types": "2.1.35", "mime-types": "2.1.35",
"mind-elixir": "4.3.1", "mind-elixir": "4.3.3",
"multer": "1.4.5-lts.1", "multer": "1.4.5-lts.1",
"normalize-strings": "1.1.1", "normalize-strings": "1.1.1",
"normalize.css": "8.0.1", "normalize.css": "8.0.1",
@@ -109,10 +109,10 @@
"@electron-forge/maker-squirrel": "7.6.0", "@electron-forge/maker-squirrel": "7.6.0",
"@electron-forge/maker-zip": "7.6.0", "@electron-forge/maker-zip": "7.6.0",
"@electron-forge/plugin-auto-unpack-natives": "7.6.0", "@electron-forge/plugin-auto-unpack-natives": "7.6.0",
"@playwright/test": "1.48.2", "@playwright/test": "1.49.1",
"@types/archiver": "6.0.2", "@types/archiver": "6.0.2",
"@types/better-sqlite3": "7.6.11", "@types/better-sqlite3": "7.6.12",
"@types/cls-hooked": "4.3.8", "@types/cls-hooked": "4.3.9",
"@types/compression": "1.7.5", "@types/compression": "1.7.5",
"@types/cookie-parser": "1.4.8", "@types/cookie-parser": "1.4.8",
"@types/csurf": "1.11.5", "@types/csurf": "1.11.5",
@@ -139,7 +139,7 @@
"@types/stream-throttle": "0.1.4", "@types/stream-throttle": "0.1.4",
"@types/tmp": "0.2.6", "@types/tmp": "0.2.6",
"@types/turndown": "5.0.5", "@types/turndown": "5.0.5",
"@types/ws": "8.5.12", "@types/ws": "8.5.13",
"@types/xml2js": "0.4.14", "@types/xml2js": "0.4.14",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",
"cross-env": "7.0.3", "cross-env": "7.0.3",
@@ -3459,12 +3459,13 @@
} }
}, },
"node_modules/@playwright/test": { "node_modules/@playwright/test": {
"version": "1.48.2", "version": "1.49.1",
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.2.tgz", "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz",
"integrity": "sha512-54w1xCWfXuax7dz4W2M9uw0gDyh+ti/0K/MxcCUxChFh37kkdxPdfZDw5QBbuPUJHr1CiHJ1hXgSs+GgeQc5Zw==", "integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==",
"dev": true, "dev": true,
"license": "Apache-2.0",
"dependencies": { "dependencies": {
"playwright": "1.48.2" "playwright": "1.49.1"
}, },
"bin": { "bin": {
"playwright": "cli.js" "playwright": "cli.js"
@@ -3560,10 +3561,11 @@
} }
}, },
"node_modules/@types/better-sqlite3": { "node_modules/@types/better-sqlite3": {
"version": "7.6.11", "version": "7.6.12",
"resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.11.tgz", "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.12.tgz",
"integrity": "sha512-i8KcD3PgGtGBLl3+mMYA8PdKkButvPyARxA7IQAd6qeslht13qxb1zzO8dRCtE7U3IoJS782zDBAeoKiM695kg==", "integrity": "sha512-fnQmj8lELIj7BSrZQAdBMHEHX8OZLYIHXqAKT1O7tDfLxaINzf00PMjw22r3N/xXh0w/sGHlO6SVaCQ2mj78lg==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
@@ -3591,10 +3593,11 @@
} }
}, },
"node_modules/@types/cls-hooked": { "node_modules/@types/cls-hooked": {
"version": "4.3.8", "version": "4.3.9",
"resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.8.tgz", "resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.9.tgz",
"integrity": "sha512-tf/7H883gFA6MPlWI15EQtfNZ+oPL0gLKkOlx9UHFrun1fC/FkuyNBpTKq1B5E3T4fbvjId6WifHUdSGsMMuPg==", "integrity": "sha512-CMtHMz6Q/dkfcHarq9nioXH8BDPP+v5xvd+N90lBQ2bdmu06UvnLDqxTKoOJzz4SzIwb/x9i4UXGAAcnUDuIvg==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
@@ -4323,10 +4326,11 @@
"dev": true "dev": true
}, },
"node_modules/@types/ws": { "node_modules/@types/ws": {
"version": "8.5.12", "version": "8.5.13",
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
"integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
@@ -7714,9 +7718,10 @@
} }
}, },
"node_modules/electron-debug": { "node_modules/electron-debug": {
"version": "4.0.1", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/electron-debug/-/electron-debug-4.0.1.tgz", "resolved": "https://registry.npmjs.org/electron-debug/-/electron-debug-4.1.0.tgz",
"integrity": "sha512-PdUG3SvcK70P05z99PFLUzn0+lPZl5c4quG1bXI7OtPaXxidwh8UONcdRLsr+6J9kf5y1FycJD5nBd80dYrcsA==", "integrity": "sha512-rdbvmotqbaNcSuinPe1tzB5zK+JKal+4LSDbguBcqTLARNqWrGoRS/TkR1gGH4+63boYH3HUaf9r9ECAxgIe9g==",
"license": "MIT",
"dependencies": { "dependencies": {
"electron-is-dev": "^3.0.1", "electron-is-dev": "^3.0.1",
"electron-localshortcut": "^3.2.1" "electron-localshortcut": "^3.2.1"
@@ -13069,9 +13074,10 @@
} }
}, },
"node_modules/mind-elixir": { "node_modules/mind-elixir": {
"version": "4.3.1", "version": "4.3.3",
"resolved": "https://registry.npmjs.org/mind-elixir/-/mind-elixir-4.3.1.tgz", "resolved": "https://registry.npmjs.org/mind-elixir/-/mind-elixir-4.3.3.tgz",
"integrity": "sha512-9dHqiNRlAFUlGUKHwPwLC+Dka2cEaNunzHbZkOw+mafz8pqeZbmmm7Xxlk2S2zbKPGxeayxTYrDDg2tmNAXe3Q==" "integrity": "sha512-kBPMy8Skn6ep1Sd42xZ/XAcQVDi9ca/yTz+Z7ZezCTHA6pWcFG6U/eNseYxatOCxBii38baY8eslck43vxRbWw==",
"license": "MIT"
}, },
"node_modules/minimalistic-assert": { "node_modules/minimalistic-assert": {
"version": "1.0.1", "version": "1.0.1",
@@ -14280,12 +14286,13 @@
} }
}, },
"node_modules/playwright": { "node_modules/playwright": {
"version": "1.48.2", "version": "1.49.1",
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.2.tgz", "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz",
"integrity": "sha512-NjYvYgp4BPmiwfe31j4gHLa3J7bD2WiBz8Lk2RoSsmX38SVIARZ18VYjxLjAcDsAhA+F4iSEXTSGgjua0rrlgQ==", "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==",
"dev": true, "dev": true,
"license": "Apache-2.0",
"dependencies": { "dependencies": {
"playwright-core": "1.48.2" "playwright-core": "1.49.1"
}, },
"bin": { "bin": {
"playwright": "cli.js" "playwright": "cli.js"
@@ -14298,10 +14305,11 @@
} }
}, },
"node_modules/playwright-core": { "node_modules/playwright-core": {
"version": "1.48.2", "version": "1.49.1",
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.2.tgz", "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz",
"integrity": "sha512-sjjw+qrLFlriJo64du+EK0kJgZzoQPsabGF4lBvsid+3CNIZIYLgnMj9V6JY5VhM2Peh20DJWIVpVljLLnlawA==", "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==",
"dev": true, "dev": true,
"license": "Apache-2.0",
"bin": { "bin": {
"playwright-core": "cli.js" "playwright-core": "cli.js"
}, },

16
package.json
View File

@@ -26,9 +26,9 @@
"start-test-server": "npm run switch-server; rimraf ./data-test; cross-env TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/main.ts", "start-test-server": "npm run switch-server; rimraf ./data-test; cross-env TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/main.ts",
"qstart-server": "npm run switch-server && npm run start-server", "qstart-server": "npm run switch-server && npm run start-server",
"start-electron": "npm run prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron-main.js --inspect=5858 .", "start-electron": "npm run prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron-main.js --inspect=5858 .",
"start-electron-nix": "npm run prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_31 --run \"electron ./dist/electron-main.js --inspect=5858 .\"", "start-electron-nix": "npm run prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"",
"start-electron-no-dir": "npm run prepare-dist && cross-env TRILIUM_ENV=dev electron --inspect=5858 .", "start-electron-no-dir": "npm run prepare-dist && cross-env TRILIUM_ENV=dev electron --inspect=5858 .",
"start-electron-no-dir-nix": "npm run prepare-dist && cross-env TRILIUM_ENV=dev nix-shell -p electron_31 --run \"electron ./dist/electron-main.js --inspect=5858 .\"", "start-electron-no-dir-nix": "npm run prepare-dist && cross-env TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"",
"qstart-electron": "npm run switch-electron && npm run start-electron", "qstart-electron": "npm run switch-electron && npm run start-electron",
"switch-server": "rimraf ./node_modules/better-sqlite3 && npm install", "switch-server": "rimraf ./node_modules/better-sqlite3 && npm install",
"switch-electron": "npx electron-rebuild", "switch-electron": "npx electron-rebuild",
@@ -75,7 +75,7 @@
"dayjs-plugin-utc": "0.1.2", "dayjs-plugin-utc": "0.1.2",
"debounce": "2.2.0", "debounce": "2.2.0",
"ejs": "3.1.10", "ejs": "3.1.10",
"electron-debug": "4.0.1", "electron-debug": "4.1.0",
"electron-dl": "4.0.0", "electron-dl": "4.0.0",
"electron-squirrel-startup": "1.0.1", "electron-squirrel-startup": "1.0.1",
"electron-window-state": "5.0.3", "electron-window-state": "5.0.3",
@@ -112,7 +112,7 @@
"marked": "15.0.3", "marked": "15.0.3",
"mermaid": "11.4.1", "mermaid": "11.4.1",
"mime-types": "2.1.35", "mime-types": "2.1.35",
"mind-elixir": "4.3.1", "mind-elixir": "4.3.3",
"multer": "1.4.5-lts.1", "multer": "1.4.5-lts.1",
"normalize-strings": "1.1.1", "normalize-strings": "1.1.1",
"normalize.css": "8.0.1", "normalize.css": "8.0.1",
@@ -149,10 +149,10 @@
"@electron-forge/maker-squirrel": "7.6.0", "@electron-forge/maker-squirrel": "7.6.0",
"@electron-forge/maker-zip": "7.6.0", "@electron-forge/maker-zip": "7.6.0",
"@electron-forge/plugin-auto-unpack-natives": "7.6.0", "@electron-forge/plugin-auto-unpack-natives": "7.6.0",
"@playwright/test": "1.48.2", "@playwright/test": "1.49.1",
"@types/archiver": "6.0.2", "@types/archiver": "6.0.2",
"@types/better-sqlite3": "7.6.11", "@types/better-sqlite3": "7.6.12",
"@types/cls-hooked": "4.3.8", "@types/cls-hooked": "4.3.9",
"@types/compression": "1.7.5", "@types/compression": "1.7.5",
"@types/cookie-parser": "1.4.8", "@types/cookie-parser": "1.4.8",
"@types/csurf": "1.11.5", "@types/csurf": "1.11.5",
@@ -179,7 +179,7 @@
"@types/stream-throttle": "0.1.4", "@types/stream-throttle": "0.1.4",
"@types/tmp": "0.2.6", "@types/tmp": "0.2.6",
"@types/turndown": "5.0.5", "@types/turndown": "5.0.5",
"@types/ws": "8.5.12", "@types/ws": "8.5.13",
"@types/xml2js": "0.4.14", "@types/xml2js": "0.4.14",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",
"cross-env": "7.0.3", "cross-env": "7.0.3",

4
src/routes/api/sender.ts
View File

@@ -7,7 +7,7 @@ import sanitize_attribute_name from "../../services/sanitize_attribute_name.js";
import specialNotesService from "../../services/special_notes.js"; import specialNotesService from "../../services/special_notes.js";
import { Request } from 'express'; import { Request } from 'express';
function uploadImage(req: Request) { async function uploadImage(req: Request) {
const file = req.file; const file = req.file;
if (!file) { if (!file) {
@@ -24,7 +24,7 @@ function uploadImage(req: Request) {
return [400, "Invalid image content type."]; return [400, "Invalid image content type."];
} }
const uploadedImageType = imageType(file.buffer); const uploadedImageType = await imageType(file.buffer);
if (!uploadedImageType) { if (!uploadedImageType) {
return [400, "Unable to determine image type."]; return [400, "Unable to determine image type."];
} }