gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 15:19:01 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'main' into renovate/express-rate-limit-7.x

Browse Source
This commit is contained in:
Elian Doran 2025-06-22 14:12:21 +03:00 committed by GitHub
commit 18c96cd2bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/package.json
View File

@ -18,7 +18,7 @@
"@fullcalendar/list": "6.1.17", "@fullcalendar/list": "6.1.17",
"@fullcalendar/multimonth": "6.1.17", "@fullcalendar/multimonth": "6.1.17",
"@fullcalendar/timegrid": "6.1.17", "@fullcalendar/timegrid": "6.1.17",
"@mermaid-js/layout-elk": "0.1.7", "@mermaid-js/layout-elk": "0.1.8",
"@mind-elixir/node-menu": "1.0.5", "@mind-elixir/node-menu": "1.0.5",
"@popperjs/core": "2.11.8", "@popperjs/core": "2.11.8",
"@triliumnext/ckeditor5": "workspace:*", "@triliumnext/ckeditor5": "workspace:*",
@ -47,7 +47,7 @@
"leaflet-gpx": "2.2.0", "leaflet-gpx": "2.2.0",
"mark.js": "8.11.1", "mark.js": "8.11.1",
"marked": "15.0.12", "marked": "15.0.12",
"mermaid": "11.6.0", "mermaid": "11.7.0",
"mind-elixir": "4.6.1", "mind-elixir": "4.6.1",
"normalize.css": "8.0.1", "normalize.css": "8.0.1",
"panzoom": "9.4.3", "panzoom": "9.4.3",

2
apps/desktop/package.json
View File

@ -6,7 +6,7 @@
"main": "main.cjs", "main": "main.cjs",
"dependencies": { "dependencies": {
"@electron/remote": "2.1.2", "@electron/remote": "2.1.2",
"better-sqlite3": "^11.9.1", "better-sqlite3": "^12.0.0",
"electron-debug": "4.1.0", "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",

2
apps/dump-db/package.json
View File

@ -4,7 +4,7 @@
"description": "Standalone tool to dump contents of Trilium document.db file into a directory tree of notes", "description": "Standalone tool to dump contents of Trilium document.db file into a directory tree of notes",
"private": true, "private": true,
"dependencies": { "dependencies": {
"better-sqlite3": "^11.1.2", "better-sqlite3": "^12.0.0",
"mime-types": "^3.0.0", "mime-types": "^3.0.0",
"sanitize-filename": "^1.6.3", "sanitize-filename": "^1.6.3",
"tsx": "^4.19.3", "tsx": "^4.19.3",

2
apps/edit-docs/package.json
View File

@ -5,7 +5,7 @@
"description": "Desktop version of Trilium which imports the demo database (presented to new users at start-up) or the user guide and other documentation and saves the modifications for committing.", "description": "Desktop version of Trilium which imports the demo database (presented to new users at start-up) or the user guide and other documentation and saves the modifications for committing.",
"dependencies": { "dependencies": {
"archiver": "7.0.1", "archiver": "7.0.1",
"better-sqlite3": "^11.9.1" "better-sqlite3": "^12.0.0"
}, },
"devDependencies": { "devDependencies": {
"@triliumnext/client": "workspace:*", "@triliumnext/client": "workspace:*",

2
apps/server/docker/package.json
View File

@ -1,5 +1,5 @@
{ {
"dependencies": { "dependencies": {
"better-sqlite3": "11.10.0" "better-sqlite3": "12.0.0"
} }
} }

4
apps/server/package.json
View File

@ -4,7 +4,7 @@
"description": "The server-side component of TriliumNext, which exposes the client via the web, allows for sync and provides a REST API for both internal and external use.", "description": "The server-side component of TriliumNext, which exposes the client via the web, allows for sync and provides a REST API for both internal and external use.",
"private": true, "private": true,
"dependencies": { "dependencies": {
"better-sqlite3": "11.10.0" "better-sqlite3": "12.0.0"
}, },
"devDependencies": { "devDependencies": {
"@electron/remote": "2.1.2", "@electron/remote": "2.1.2",
@ -88,7 +88,7 @@
"multer": "2.0.1", "multer": "2.0.1",
"normalize-strings": "1.1.1", "normalize-strings": "1.1.1",
"ollama": "0.5.16", "ollama": "0.5.16",
"openai": "5.5.1", "openai": "5.6.0",
"rand-token": "1.0.1", "rand-token": "1.0.1",
"safe-compare": "1.1.4", "safe-compare": "1.1.4",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",

2
package.json
View File

@ -90,7 +90,7 @@
}, },
"overrides": { "overrides": {
"node-abi": "4.9.0", "node-abi": "4.9.0",
"mermaid": "11.6.0", "mermaid": "11.7.0",
"preact": "10.26.9", "preact": "10.26.9",
"roughjs": "4.6.6", "roughjs": "4.6.6",
"@types/express-serve-static-core": "5.0.6", "@types/express-serve-static-core": "5.0.6",

71
pnpm-lock.yaml generated
View File

@ -6,7 +6,7 @@ settings:
overrides: overrides:
node-abi: 4.9.0 node-abi: 4.9.0
mermaid: 11.6.0 mermaid: 11.7.0
preact: 10.26.9 preact: 10.26.9
roughjs: 4.6.6 roughjs: 4.6.6
'@types/express-serve-static-core': 5.0.6 '@types/express-serve-static-core': 5.0.6
@ -180,8 +180,8 @@ importers:
specifier: 6.1.17 specifier: 6.1.17
version: 6.1.17(@fullcalendar/core@6.1.17) version: 6.1.17(@fullcalendar/core@6.1.17)
'@mermaid-js/layout-elk': '@mermaid-js/layout-elk':
specifier: 0.1.7 specifier: 0.1.8
version: 0.1.7(mermaid@11.6.0) version: 0.1.8(mermaid@11.7.0)
'@mind-elixir/node-menu': '@mind-elixir/node-menu':
specifier: 1.0.5 specifier: 1.0.5
version: 1.0.5(mind-elixir@4.6.1) version: 1.0.5(mind-elixir@4.6.1)
@ -267,8 +267,8 @@ importers:
specifier: 15.0.12 specifier: 15.0.12
version: 15.0.12 version: 15.0.12
mermaid: mermaid:
specifier: 11.6.0 specifier: 11.7.0
version: 11.6.0 version: 11.7.0
mind-elixir: mind-elixir:
specifier: 4.6.1 specifier: 4.6.1
version: 4.6.1 version: 4.6.1
@ -343,8 +343,8 @@ importers:
specifier: 2.1.2 specifier: 2.1.2
version: 2.1.2(electron@36.5.0) version: 2.1.2(electron@36.5.0)
better-sqlite3: better-sqlite3:
specifier: ^11.9.1 specifier: ^12.0.0
version: 11.10.0 version: 12.0.0
electron-debug: electron-debug:
specifier: 4.1.0 specifier: 4.1.0
version: 4.1.0 version: 4.1.0
@ -413,8 +413,8 @@ importers:
apps/dump-db: apps/dump-db:
dependencies: dependencies:
better-sqlite3: better-sqlite3:
specifier: ^11.1.2 specifier: ^12.0.0
version: 11.10.0 version: 12.0.0
mime-types: mime-types:
specifier: ^3.0.0 specifier: ^3.0.0
version: 3.0.1 version: 3.0.1
@ -444,8 +444,8 @@ importers:
specifier: 7.0.1 specifier: 7.0.1
version: 7.0.1 version: 7.0.1
better-sqlite3: better-sqlite3:
specifier: ^11.9.1 specifier: ^12.0.0
version: 11.10.0 version: 12.0.0
devDependencies: devDependencies:
'@triliumnext/client': '@triliumnext/client':
specifier: workspace:* specifier: workspace:*
@ -469,8 +469,8 @@ importers:
apps/server: apps/server:
dependencies: dependencies:
better-sqlite3: better-sqlite3:
specifier: 11.10.0 specifier: 12.0.0
version: 11.10.0 version: 12.0.0
devDependencies: devDependencies:
'@anthropic-ai/sdk': '@anthropic-ai/sdk':
specifier: 0.54.0 specifier: 0.54.0
@ -716,8 +716,8 @@ importers:
specifier: 0.5.16 specifier: 0.5.16
version: 0.5.16 version: 0.5.16
openai: openai:
specifier: 5.5.1 specifier: 5.6.0
version: 5.5.1(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5))(zod@3.24.4) version: 5.6.0(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5))(zod@3.24.4)
rand-token: rand-token:
specifier: 1.0.1 specifier: 1.0.1
version: 1.0.1 version: 1.0.1
@ -3599,13 +3599,13 @@ packages:
'@marijn/find-cluster-break@1.0.2': '@marijn/find-cluster-break@1.0.2':
resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==} resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==}
'@mermaid-js/layout-elk@0.1.7': '@mermaid-js/layout-elk@0.1.8':
resolution: {integrity: sha512-G3AJ2jMaCAqky2CT3z/sf3pK5UuS3tne98GsXDl3PkKByCmPmOYmJPf+6oX5PUlV3HNWWHuSgtZ9NU/CZDSuHQ==} resolution: {integrity: sha512-uU+Glm1tQZScphrFuzf6dzPpYTrET3sz6Q2SqpLj/nr+FpO6cfgJmYdJ+vWA8oGoeNQZLVey480qbKAFk8DBuQ==}
peerDependencies: peerDependencies:
mermaid: 11.6.0 mermaid: 11.7.0
'@mermaid-js/parser@0.4.0': '@mermaid-js/parser@0.5.0':
resolution: {integrity: sha512-wla8XOWvQAwuqy+gxiZqY+c7FokraOTHRWMsbB4AgRx9Sy7zKslNyejy7E+a77qHfey5GXw/ik3IXv/NHMJgaA==} resolution: {integrity: sha512-AiaN7+VjXC+3BYE+GwNezkpjIcCI2qIMB/K4S2/vMWe0q/XJCBbx5+K7iteuz7VyltX9iAK4FmVTvGc9kjOV4w==}
'@microsoft/api-extractor-model@7.30.6': '@microsoft/api-extractor-model@7.30.6':
resolution: {integrity: sha512-znmFn69wf/AIrwHya3fxX6uB5etSIn6vg4Q4RB/tb5VDDs1rqREc+AvMC/p19MUN13CZ7+V/8pkYPTj7q8tftg==} resolution: {integrity: sha512-znmFn69wf/AIrwHya3fxX6uB5etSIn6vg4Q4RB/tb5VDDs1rqREc+AvMC/p19MUN13CZ7+V/8pkYPTj7q8tftg==}
@ -6324,8 +6324,9 @@ packages:
batch@0.6.1: batch@0.6.1:
resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==} resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==}
better-sqlite3@11.10.0: better-sqlite3@12.0.0:
resolution: {integrity: sha512-EwhOpyXiOEL/lKzHz9AW1msWFNzGc/z+LzeB3/jnFJpxu+th2yqvzsSWas1v9jgs9+xiXJcD5A8CJxAG2TaghQ==} resolution: {integrity: sha512-ElLgwbEth4MHBrDXEqzkE7Hm2+ACw5+KKBhkLArcjJrVFJyOXvzcE/if2dx7/m5pXTc8vqJjsCQUt1AFQY+TTQ==}
engines: {node: 20.x || 22.x || 23.x || 24.x}
bezier-easing@2.1.0: bezier-easing@2.1.0:
resolution: {integrity: sha512-gbIqZ/eslnUFC1tjEvtz0sgx+xTK20wDnYMIA27VA04R7w6xxXQPZDbibjA9DTWZRA2CXtwHykkVzlCaAJAZig==} resolution: {integrity: sha512-gbIqZ/eslnUFC1tjEvtz0sgx+xTK20wDnYMIA27VA04R7w6xxXQPZDbibjA9DTWZRA2CXtwHykkVzlCaAJAZig==}
@ -10091,8 +10092,8 @@ packages:
resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
engines: {node: '>= 8'} engines: {node: '>= 8'}
mermaid@11.6.0: mermaid@11.7.0:
resolution: {integrity: sha512-PE8hGUy1LDlWIHWBP05SFdqUHGmRcCcK4IzpOKPE35eOw+G9zZgcnMpyunJVUEOgb//KBORPjysKndw8bFLuRg==} resolution: {integrity: sha512-/1/5R0rt0Z1Ak0CuznAnCF3HtQgayRXUz6SguzOwN4L+DuCobz0UxnQ+ZdTSZ3AugKVVh78tiVmsHpHWV25TCw==}
methods@1.1.2: methods@1.1.2:
resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
@ -10587,8 +10588,8 @@ packages:
resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
engines: {node: '>=12'} engines: {node: '>=12'}
openai@5.5.1: openai@5.6.0:
resolution: {integrity: sha512-5i19097mGotHA1eFsM6Tjd/tJ8uo9sa5Ysv4Q6bKJ2vtN6rc0MzMrUefXnLXYAJcmMQrC1Efhj0AvfIkXrQamw==} resolution: {integrity: sha512-jNH5z+hYAdOMZXyEt0yZ7246s+UZjg2AwFQqkAhZIPPjxNtHHO5mykOefau6FkOqj16aC94MOdJl/rZBcKj/cQ==}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
ws: ^8.18.0 ws: ^8.18.0
@ -17253,7 +17254,7 @@ snapshots:
'@excalidraw/mermaid-to-excalidraw@1.1.2': '@excalidraw/mermaid-to-excalidraw@1.1.2':
dependencies: dependencies:
'@excalidraw/markdown-to-text': 0.1.2 '@excalidraw/markdown-to-text': 0.1.2
mermaid: 11.6.0 mermaid: 11.7.0
nanoid: 5.1.5 nanoid: 5.1.5
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -18059,13 +18060,13 @@ snapshots:
'@marijn/find-cluster-break@1.0.2': {} '@marijn/find-cluster-break@1.0.2': {}
'@mermaid-js/layout-elk@0.1.7(mermaid@11.6.0)': '@mermaid-js/layout-elk@0.1.8(mermaid@11.7.0)':
dependencies: dependencies:
d3: 7.9.0 d3: 7.9.0
elkjs: 0.9.3 elkjs: 0.9.3
mermaid: 11.6.0 mermaid: 11.7.0
'@mermaid-js/parser@0.4.0': '@mermaid-js/parser@0.5.0':
dependencies: dependencies:
langium: 3.3.1 langium: 3.3.1
@ -21428,7 +21429,7 @@ snapshots:
batch@0.6.1: {} batch@0.6.1: {}
better-sqlite3@11.10.0: better-sqlite3@12.0.0:
dependencies: dependencies:
bindings: 1.5.0 bindings: 1.5.0
prebuild-install: 7.1.3 prebuild-install: 7.1.3
@ -26099,11 +26100,11 @@ snapshots:
merge2@1.4.1: {} merge2@1.4.1: {}
mermaid@11.6.0: mermaid@11.7.0:
dependencies: dependencies:
'@braintree/sanitize-url': 7.1.1 '@braintree/sanitize-url': 7.1.1
'@iconify/utils': 2.3.0 '@iconify/utils': 2.3.0
'@mermaid-js/parser': 0.4.0 '@mermaid-js/parser': 0.5.0
'@types/d3': 7.4.3 '@types/d3': 7.4.3
cytoscape: 3.31.2 cytoscape: 3.31.2
cytoscape-cose-bilkent: 4.1.0(cytoscape@3.31.2) cytoscape-cose-bilkent: 4.1.0(cytoscape@3.31.2)
@ -26270,7 +26271,7 @@ snapshots:
mlly@1.7.4: mlly@1.7.4:
dependencies: dependencies:
acorn: 8.14.1 acorn: 8.15.0
pathe: 2.0.3 pathe: 2.0.3
pkg-types: 1.3.1 pkg-types: 1.3.1
ufo: 1.6.1 ufo: 1.6.1
@ -26705,7 +26706,7 @@ snapshots:
is-docker: 2.2.1 is-docker: 2.2.1
is-wsl: 2.2.0 is-wsl: 2.2.0
openai@5.5.1(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5))(zod@3.24.4): openai@5.6.0(ws@8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5))(zod@3.24.4):
optionalDependencies: optionalDependencies:
ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5) ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5)
zod: 3.24.4 zod: 3.24.4