From d26ef269717460304dd26ed63706caf6022ce8ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:28:01 +0000 Subject: [PATCH 1/9] chore(deps): update dependency @types/better-sqlite3 to v7.6.12 --- dump-db/package-lock.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dump-db/package-lock.json b/dump-db/package-lock.json index 34f880948..097b1e2cf 100644 --- a/dump-db/package-lock.json +++ b/dump-db/package-lock.json @@ -380,11 +380,10 @@ } }, "node_modules/@types/better-sqlite3": { - "version": "7.6.11", - "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.11.tgz", - "integrity": "sha512-i8KcD3PgGtGBLl3+mMYA8PdKkButvPyARxA7IQAd6qeslht13qxb1zzO8dRCtE7U3IoJS782zDBAeoKiM695kg==", + "version": "7.6.12", + "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.12.tgz", + "integrity": "sha512-fnQmj8lELIj7BSrZQAdBMHEHX8OZLYIHXqAKT1O7tDfLxaINzf00PMjw22r3N/xXh0w/sGHlO6SVaCQ2mj78lg==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } @@ -1461,9 +1460,9 @@ "optional": true }, "@types/better-sqlite3": { - "version": "7.6.11", - "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.11.tgz", - "integrity": "sha512-i8KcD3PgGtGBLl3+mMYA8PdKkButvPyARxA7IQAd6qeslht13qxb1zzO8dRCtE7U3IoJS782zDBAeoKiM695kg==", + "version": "7.6.12", + "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.12.tgz", + "integrity": "sha512-fnQmj8lELIj7BSrZQAdBMHEHX8OZLYIHXqAKT1O7tDfLxaINzf00PMjw22r3N/xXh0w/sGHlO6SVaCQ2mj78lg==", "dev": true, "requires": { "@types/node": "*" From 156dded1cc1241d713c2fda3df443e705bceee97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:28:15 +0000 Subject: [PATCH 2/9] chore(deps): update dependency @types/better-sqlite3 to v7.6.12 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47e4aede6..7ed043ecc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -111,7 +111,7 @@ "@electron-forge/plugin-auto-unpack-natives": "7.6.0", "@playwright/test": "1.48.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/compression": "1.7.5", "@types/cookie-parser": "1.4.8", @@ -3560,10 +3560,11 @@ } }, "node_modules/@types/better-sqlite3": { - "version": "7.6.11", - "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.11.tgz", - "integrity": "sha512-i8KcD3PgGtGBLl3+mMYA8PdKkButvPyARxA7IQAd6qeslht13qxb1zzO8dRCtE7U3IoJS782zDBAeoKiM695kg==", + "version": "7.6.12", + "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.12.tgz", + "integrity": "sha512-fnQmj8lELIj7BSrZQAdBMHEHX8OZLYIHXqAKT1O7tDfLxaINzf00PMjw22r3N/xXh0w/sGHlO6SVaCQ2mj78lg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } diff --git a/package.json b/package.json index 8c67cfba6..b4ce8c099 100644 --- a/package.json +++ b/package.json @@ -151,7 +151,7 @@ "@electron-forge/plugin-auto-unpack-natives": "7.6.0", "@playwright/test": "1.48.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/compression": "1.7.5", "@types/cookie-parser": "1.4.8", From 9becc021ae4cbe92e30e4734818dd67989195078 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:29:13 +0000 Subject: [PATCH 3/9] fix(deps): update dependency mind-elixir to v4.3.3 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47e4aede6..98ee383ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,7 +69,7 @@ "marked": "15.0.3", "mermaid": "11.4.1", "mime-types": "2.1.35", - "mind-elixir": "4.3.1", + "mind-elixir": "4.3.3", "multer": "1.4.5-lts.1", "normalize-strings": "1.1.1", "normalize.css": "8.0.1", @@ -13069,9 +13069,10 @@ } }, "node_modules/mind-elixir": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/mind-elixir/-/mind-elixir-4.3.1.tgz", - "integrity": "sha512-9dHqiNRlAFUlGUKHwPwLC+Dka2cEaNunzHbZkOw+mafz8pqeZbmmm7Xxlk2S2zbKPGxeayxTYrDDg2tmNAXe3Q==" + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/mind-elixir/-/mind-elixir-4.3.3.tgz", + "integrity": "sha512-kBPMy8Skn6ep1Sd42xZ/XAcQVDi9ca/yTz+Z7ZezCTHA6pWcFG6U/eNseYxatOCxBii38baY8eslck43vxRbWw==", + "license": "MIT" }, "node_modules/minimalistic-assert": { "version": "1.0.1", diff --git a/package.json b/package.json index 8c67cfba6..b98175ecf 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "marked": "15.0.3", "mermaid": "11.4.1", "mime-types": "2.1.35", - "mind-elixir": "4.3.1", + "mind-elixir": "4.3.3", "multer": "1.4.5-lts.1", "normalize-strings": "1.1.1", "normalize.css": "8.0.1", From 2c6bc4b47b5631c439de7339124316d3f40b35df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:29:25 +0000 Subject: [PATCH 4/9] chore(deps): update dependency @playwright/test to v1.49.1 --- package-lock.json | 27 +++++++++++++++------------ package.json | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47e4aede6..c3e43fd1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -109,7 +109,7 @@ "@electron-forge/maker-squirrel": "7.6.0", "@electron-forge/maker-zip": "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/better-sqlite3": "7.6.11", "@types/cls-hooked": "4.3.8", @@ -3459,12 +3459,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.48.2", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.2.tgz", - "integrity": "sha512-54w1xCWfXuax7dz4W2M9uw0gDyh+ti/0K/MxcCUxChFh37kkdxPdfZDw5QBbuPUJHr1CiHJ1hXgSs+GgeQc5Zw==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz", + "integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright": "1.48.2" + "playwright": "1.49.1" }, "bin": { "playwright": "cli.js" @@ -14280,12 +14281,13 @@ } }, "node_modules/playwright": { - "version": "1.48.2", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.2.tgz", - "integrity": "sha512-NjYvYgp4BPmiwfe31j4gHLa3J7bD2WiBz8Lk2RoSsmX38SVIARZ18VYjxLjAcDsAhA+F4iSEXTSGgjua0rrlgQ==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz", + "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.48.2" + "playwright-core": "1.49.1" }, "bin": { "playwright": "cli.js" @@ -14298,10 +14300,11 @@ } }, "node_modules/playwright-core": { - "version": "1.48.2", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.2.tgz", - "integrity": "sha512-sjjw+qrLFlriJo64du+EK0kJgZzoQPsabGF4lBvsid+3CNIZIYLgnMj9V6JY5VhM2Peh20DJWIVpVljLLnlawA==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz", + "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==", "dev": true, + "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" }, diff --git a/package.json b/package.json index 8c67cfba6..8823710ad 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "@electron-forge/maker-squirrel": "7.6.0", "@electron-forge/maker-zip": "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/better-sqlite3": "7.6.11", "@types/cls-hooked": "4.3.8", From c97a4f1bc5e8cc1b6ad696e7460eb19c1006e061 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 00:29:42 +0000 Subject: [PATCH 5/9] fix(deps): update dependency electron-debug to v4.1.0 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47e4aede6..ac6498d08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "dayjs-plugin-utc": "0.1.2", "debounce": "2.2.0", "ejs": "3.1.10", - "electron-debug": "4.0.1", + "electron-debug": "4.1.0", "electron-dl": "4.0.0", "electron-squirrel-startup": "1.0.1", "electron-window-state": "5.0.3", @@ -7713,9 +7713,10 @@ } }, "node_modules/electron-debug": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/electron-debug/-/electron-debug-4.0.1.tgz", - "integrity": "sha512-PdUG3SvcK70P05z99PFLUzn0+lPZl5c4quG1bXI7OtPaXxidwh8UONcdRLsr+6J9kf5y1FycJD5nBd80dYrcsA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/electron-debug/-/electron-debug-4.1.0.tgz", + "integrity": "sha512-rdbvmotqbaNcSuinPe1tzB5zK+JKal+4LSDbguBcqTLARNqWrGoRS/TkR1gGH4+63boYH3HUaf9r9ECAxgIe9g==", + "license": "MIT", "dependencies": { "electron-is-dev": "^3.0.1", "electron-localshortcut": "^3.2.1" diff --git a/package.json b/package.json index 8c67cfba6..2d080486c 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "dayjs-plugin-utc": "0.1.2", "debounce": "2.2.0", "ejs": "3.1.10", - "electron-debug": "4.0.1", + "electron-debug": "4.1.0", "electron-dl": "4.0.0", "electron-squirrel-startup": "1.0.1", "electron-window-state": "5.0.3", From 181ee3ef6d53a3b215c63529d4f9345a6e805c6a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 11 Dec 2024 08:16:37 +0200 Subject: [PATCH 6/9] fix(server): not building due to API change --- src/routes/api/sender.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/api/sender.ts b/src/routes/api/sender.ts index 890eefa98..22eea766d 100644 --- a/src/routes/api/sender.ts +++ b/src/routes/api/sender.ts @@ -7,7 +7,7 @@ import sanitize_attribute_name from "../../services/sanitize_attribute_name.js"; import specialNotesService from "../../services/special_notes.js"; import { Request } from 'express'; -function uploadImage(req: Request) { +async function uploadImage(req: Request) { const file = req.file; if (!file) { @@ -24,7 +24,7 @@ function uploadImage(req: Request) { return [400, "Invalid image content type."]; } - const uploadedImageType = imageType(file.buffer); + const uploadedImageType = await imageType(file.buffer); if (!uploadedImageType) { return [400, "Unable to determine image type."]; } From 55e3eae322cd631db3899a2a8a9050a37be4c783 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 11 Dec 2024 08:16:48 +0200 Subject: [PATCH 7/9] chore(build): switch nix to electron 33 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8c67cfba6..62c37af8a 100644 --- a/package.json +++ b/package.json @@ -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", "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-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-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", "switch-server": "rimraf ./node_modules/better-sqlite3 && npm install", "switch-electron": "npx electron-rebuild", From e23fe010b54696a478315e9e19d0a2990442b261 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:48:28 +0000 Subject: [PATCH 8/9] chore(deps): update dependency @types/cls-hooked to v4.3.9 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ed043ecc..389efe0ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "@playwright/test": "1.48.2", "@types/archiver": "6.0.2", "@types/better-sqlite3": "7.6.12", - "@types/cls-hooked": "4.3.8", + "@types/cls-hooked": "4.3.9", "@types/compression": "1.7.5", "@types/cookie-parser": "1.4.8", "@types/csurf": "1.11.5", @@ -3592,10 +3592,11 @@ } }, "node_modules/@types/cls-hooked": { - "version": "4.3.8", - "resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.8.tgz", - "integrity": "sha512-tf/7H883gFA6MPlWI15EQtfNZ+oPL0gLKkOlx9UHFrun1fC/FkuyNBpTKq1B5E3T4fbvjId6WifHUdSGsMMuPg==", + "version": "4.3.9", + "resolved": "https://registry.npmjs.org/@types/cls-hooked/-/cls-hooked-4.3.9.tgz", + "integrity": "sha512-CMtHMz6Q/dkfcHarq9nioXH8BDPP+v5xvd+N90lBQ2bdmu06UvnLDqxTKoOJzz4SzIwb/x9i4UXGAAcnUDuIvg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } diff --git a/package.json b/package.json index 42f19aa19..eea291a02 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "@playwright/test": "1.48.2", "@types/archiver": "6.0.2", "@types/better-sqlite3": "7.6.12", - "@types/cls-hooked": "4.3.8", + "@types/cls-hooked": "4.3.9", "@types/compression": "1.7.5", "@types/cookie-parser": "1.4.8", "@types/csurf": "1.11.5", From 7dc9befc7a8e1aade21371ffa4c6594f2073cfd5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:41:29 +0000 Subject: [PATCH 9/9] chore(deps): update dependency @types/ws to v8.5.13 --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 389efe0ce..c599e6b90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -139,7 +139,7 @@ "@types/stream-throttle": "0.1.4", "@types/tmp": "0.2.6", "@types/turndown": "5.0.5", - "@types/ws": "8.5.12", + "@types/ws": "8.5.13", "@types/xml2js": "0.4.14", "@types/yargs": "17.0.33", "cross-env": "7.0.3", @@ -4325,10 +4325,11 @@ "dev": true }, "node_modules/@types/ws": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", - "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz", + "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } diff --git a/package.json b/package.json index eea291a02..4a57d1aab 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "@types/stream-throttle": "0.1.4", "@types/tmp": "0.2.6", "@types/turndown": "5.0.5", - "@types/ws": "8.5.12", + "@types/ws": "8.5.13", "@types/xml2js": "0.4.14", "@types/yargs": "17.0.33", "cross-env": "7.0.3",