Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-06 17:47:43 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'main' into renovate/redocly-cli-2.x

Browse Source
This commit is contained in:
Elian Doran
2026-03-25 08:23:39 +02:00
committed by GitHub
parent 6d000d7b7c c71d8a87b9
commit d1deccc23c
5 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
"keywords": [],
"author": "Elian Doran <contact@eliandoran.me>",
"license": "AGPL-3.0-only",
"packageManager": "pnpm@10.32.1",
"packageManager": "pnpm@10.33.0",
"devDependencies": {
"@redocly/cli": "2.25.1",
"archiver": "7.0.1",

2
apps/server/package.json
View File

@@ -101,7 +101,7 @@
"https-proxy-agent": "8.0.0",
"i18next": "25.10.5",
"i18next-fs-backend": "2.6.1",
"image-type": "6.0.0",
"image-type": "6.1.0",
"ini": "6.0.0",
"is-animated": "2.0.2",
"is-svg": "6.1.0",

2
apps/web-clipper/package.json
View File

@@ -13,7 +13,7 @@
"postinstall": "wxt prepare"
},
"keywords": [],
"packageManager": "pnpm@10.32.1",
"packageManager": "pnpm@10.33.0",
"devDependencies": {
"@wxt-dev/auto-icons": "1.1.1",
"wxt": "0.20.20"

2
package.json
View File

@@ -94,7 +94,7 @@
"url": "https://github.com/TriliumNext/Trilium/issues"
},
"homepage": "https://triliumnotes.org",
"packageManager": "pnpm@10.32.1",
"packageManager": "pnpm@10.33.0",
"pnpm": {
"patchedDependencies": {
"@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",

57
pnpm-lock.yaml generated
View File

@@ -761,8 +761,8 @@ importers:
specifier: 2.6.1
version: 2.6.1
image-type:
specifier: 6.0.0
version: 6.0.0
specifier: 6.1.0
version: 6.1.0
ini:
specifier: 6.0.0
version: 6.0.0
@@ -1864,6 +1864,9 @@ packages:
'@blazediff/core@1.9.1':
resolution: {integrity: sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==}
'@borewit/text-codec@0.2.2':
resolution: {integrity: sha512-DDaRehssg1aNrH4+2hnj1B7vnUGEjU6OIlyRdkMd0aUdIUvKXrJfXsy8LVtXAy7DRvYVluWbMspsRhz2lcW0mQ==}
'@braintree/sanitize-url@6.0.2':
resolution: {integrity: sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==}
@@ -5817,8 +5820,8 @@ packages:
resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
engines: {node: '>=10'}
'@tokenizer/inflate@0.2.7':
resolution: {integrity: sha512-MADQgmZT1eKjp06jpI2yozxaU9uVs4GzzgSL+uEq7bVcJ9V1ZXQkeGNql1fsSI0gMy1vhvNTNbUqrx+pZfJVmg==}
'@tokenizer/inflate@0.4.1':
resolution: {integrity: sha512-2mAv+8pkG6GIZiF1kNg1jAjh27IDxEPKwdGul3snfztFerfPGI1LjDezZp3i7BElXompqEtPmoPx6c2wgtWsOA==}
engines: {node: '>=18'}
'@tokenizer/token@0.3.0':
@@ -9639,9 +9642,9 @@ packages:
resolution: {integrity: sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==}
engines: {node: '>=10'}
file-type@20.5.0:
resolution: {integrity: sha512-BfHZtG/l9iMm4Ecianu7P8HRD2tBHLtjXinm4X62XBOYzi7CYA7jyqfJzOvXHqzVrVPYqBo2/GvbARMaaJkKVg==}
engines: {node: '>=18'}
file-type@21.3.4:
resolution: {integrity: sha512-Ievi/yy8DS3ygGvT47PjSfdFoX+2isQueoYP1cntFW1JLYAuS4GD7NUPGg4zv2iZfV52uDyk5w5Z0TdpRS6Q1g==}
engines: {node: '>=20'}
file-uri-to-path@1.0.0:
resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
@@ -10436,8 +10439,8 @@ packages:
engines: {node: '>=6.9.0'}
hasBin: true
image-type@6.0.0:
resolution: {integrity: sha512-efpcYd/E9A7a+oanft11ceIbO9Aw0iszfJ7Qfh4QLWl2Ulsth9nnllV/L1TmzKwlQ2O5FuT08vy5zxLnGxZe8w==}
image-type@6.1.0:
resolution: {integrity: sha512-SBKn3TelGQdOLAROwl99gN7HUWWozZCHQIH5PmvpJUA/u5+BJBCsVz7lSO+Q3Kl2K/uw9QU6GDcksA16RtuzSw==}
engines: {node: '>=20'}
immediate@3.0.6:
@@ -14457,6 +14460,10 @@ packages:
resolution: {integrity: sha512-Xt18+h4s7Z8xyZ0tmBoRmzxcop97R4BAh+dXouUDCYn+Em+1P3qpkUfI5ueWLT8ynC5hZ+q4iPEmGG1urvQGBg==}
engines: {node: '>=18'}
strtok3@10.3.5:
resolution: {integrity: sha512-ki4hZQfh5rX0QDLLkOCj+h+CVNkqmp/CMf8v8kZpkNVK6jGQooMytqzLZYUVYIZcFZ6yDB70EfD8POcFXiF5oA==}
engines: {node: '>=18'}
strtok3@6.3.0:
resolution: {integrity: sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==}
engines: {node: '>=10'}
@@ -14776,8 +14783,8 @@ packages:
resolution: {integrity: sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==}
engines: {node: '>=10'}
token-types@6.0.0:
resolution: {integrity: sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA==}
token-types@6.1.2:
resolution: {integrity: sha512-dRXchy+C0IgK8WPC6xvCHFRIWYUbqqdEIKPaKo/AcTUNzwLTK6AH7RjdLWsEZcAN/TBdtfUw3PYEgPr5VPr6ww==}
engines: {node: '>=14.16'}
totalist@3.0.1:
@@ -16702,6 +16709,8 @@ snapshots:
'@blazediff/core@1.9.1': {}
'@borewit/text-codec@0.2.2': {}
'@braintree/sanitize-url@6.0.2': {}
'@braintree/sanitize-url@7.1.2': {}
@@ -17145,8 +17154,6 @@ snapshots:
'@ckeditor/ckeditor5-utils': 47.6.1
ckeditor5: 47.6.1
es-toolkit: 1.39.5
transitivePeerDependencies:
- supports-color
'@ckeditor/ckeditor5-editor-multi-root@47.6.1':
dependencies:
@@ -21876,11 +21883,10 @@ snapshots:
dependencies:
defer-to-connect: 2.0.1
'@tokenizer/inflate@0.2.7':
'@tokenizer/inflate@0.4.1':
dependencies:
debug: 4.4.3(supports-color@8.1.1)
fflate: 0.8.2
token-types: 6.0.0
token-types: 6.1.2
transitivePeerDependencies:
- supports-color
@@ -27469,11 +27475,11 @@ snapshots:
strtok3: 6.3.0
token-types: 4.2.1
file-type@20.5.0:
file-type@21.3.4:
dependencies:
'@tokenizer/inflate': 0.2.7
strtok3: 10.2.2
token-types: 6.0.0
'@tokenizer/inflate': 0.4.1
strtok3: 10.3.5
token-types: 6.1.2
uint8array-extras: 1.4.0
transitivePeerDependencies:
- supports-color
@@ -28482,9 +28488,9 @@ snapshots:
image-size@0.7.5:
optional: true
image-type@6.0.0:
image-type@6.1.0:
dependencies:
file-type: 20.5.0
file-type: 21.3.4
transitivePeerDependencies:
- supports-color
@@ -33142,6 +33148,10 @@ snapshots:
'@tokenizer/token': 0.3.0
peek-readable: 7.0.0
strtok3@10.3.5:
dependencies:
'@tokenizer/token': 0.3.0
strtok3@6.3.0:
dependencies:
'@tokenizer/token': 0.3.0
@@ -33573,8 +33583,9 @@ snapshots:
'@tokenizer/token': 0.3.0
ieee754: 1.2.1
token-types@6.0.0:
token-types@6.1.2:
dependencies:
'@borewit/text-codec': 0.2.2
'@tokenizer/token': 0.3.0
ieee754: 1.2.1