Merge branch 'dev' into fix/bookmark-with-border-option

This commit is contained in:
Thomas authored and GitHub committed 2026-06-03 08:45:52 +02:00
commit 3429b6ff2d
2 files changed
+39 -32

No files matched your search

+35 -28
View File
@@ -205,7 +205,7 @@ catalogs:
specifier: ^11.17.0
version: 11.17.0
'@turbo/gen':
specifier: ^2.9.15
specifier: ^2.9.16
version: 2.9.16
'@types/adm-zip':
specifier: 0.5.8
@@ -370,8 +370,8 @@ catalogs:
specifier: 5.11.0
version: 5.11.0
isomorphic-dompurify:
specifier: ^3.14.0
version: 3.14.0
specifier: ^3.15.0
version: 3.15.0
jotai:
specifier: ^2.20.0
version: 2.20.0
@@ -403,8 +403,8 @@ catalogs:
specifier: 5.0.0-beta.31
version: 5.0.0-beta.31
next-intl:
specifier: 4.12.0
version: 4.12.0
specifier: 4.13.0
version: 4.13.0
node-loader:
specifier: ^2.1.0
version: 2.1.0
@@ -484,7 +484,7 @@ catalogs:
specifier: 4.20.4
version: 4.20.4
turbo:
specifier: ^2.9.15
specifier: ^2.9.16
version: 2.9.16
typescript:
specifier: ^5.9.3
@@ -813,7 +813,7 @@ importers:
version: 13.0.6
isomorphic-dompurify:
specifier: 'catalog:'
version: 3.14.0(@noble/hashes@2.0.1)
version: 3.15.0(@noble/hashes@2.0.1)
jotai:
specifier: 'catalog:'
version: 2.20.0(@babel/core@7.29.0)(@babel/template@7.28.6)(@types/react@19.2.15)(react@19.2.6)
@@ -2210,7 +2210,7 @@ importers:
version: 16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.100.0)
next-intl:
specifier: 'catalog:'
version: 4.12.0(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.100.0))(react@19.2.6)(typescript@5.9.3)
version: 4.13.0(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.100.0))(react@19.2.6)(typescript@5.9.3)
react:
specifier: 'catalog:'
version: 19.2.6
@@ -6327,6 +6327,9 @@ packages:
dompurify@3.4.5:
resolution: {integrity: sha512-OrwIBKsdNSVEeubdJ1HBv/wNENRM9ytAVCv7YXt//A3vPdVMNuACRqK9mXCGCBW2ln7BT/A4X0jXHo2Gu89miA==}
dompurify@3.4.7:
resolution: {integrity: sha512-2jBxDJY4RR06tQNy4w5FlFH7kfxsQZlufd0sbv+chfHCxeJwrFw2baUDsSwvBISD4K4RDbd0PTfy3uNXsR6siA==}
dot-prop@5.3.0:
resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
engines: {node: '>=8'}
@@ -7011,8 +7014,8 @@ packages:
resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
engines: {node: '>=0.10.0'}
icu-minify@4.12.0:
resolution: {integrity: sha512-zDmM05uav3t3+kxSfRrNlmyXOdj2b+uHA+p04CG32eJabtaHbugXujuL+YfRkwP9joAnf0Uh+RMGCKD5NLa5rQ==}
icu-minify@4.13.0:
resolution: {integrity: sha512-SIFMeUHZJjzS5RvIGvybKvWoHjDm9cGVEs2EpJ8PmywOdJLWyblPm7TdPLLoUtkJtwQD7iGhl2WMptZ+N0on+w==}
ieee754@1.2.1:
resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
@@ -7186,8 +7189,8 @@ packages:
resolution: {integrity: sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==}
engines: {node: '>=18'}
isomorphic-dompurify@3.14.0:
resolution: {integrity: sha512-64W8/lsfqgaDWfEkvrIVk8FdIk29Mya0Fp39excQEdlcLUPg1Cn7CtCYe6CtPbFW90JpEKTXG0QQtIUNENJ7sw==}
isomorphic-dompurify@3.15.0:
resolution: {integrity: sha512-9ZtkbQ8+SgNf6LuDAdu9bq23dVXMIGNM8ZYnyl2MufyZiSD5dqAUJcyjtYZz7B80HuPpEn/f0NCS6zKvavHtfA==}
engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
isomorphic-ws@5.0.0:
@@ -7727,11 +7730,11 @@ packages:
nodemailer:
optional: true
next-intl-swc-plugin-extractor@4.12.0:
resolution: {integrity: sha512-jUxVEu1Nryjt4YgaDktSys7ioOgQfcNPF/SF2dbPNxbVb6U+P1INRgHeCVN+EC59H2rnTFIQwbddmOCrUWFr3g==}
next-intl-swc-plugin-extractor@4.13.0:
resolution: {integrity: sha512-6S/fJI0KXvLCL8nhBo9P8eGaJPzmwJBTCzX0NaUIj0VyU8U89d//T+vjMLdNIXl5MlLaYH7B9MbAjb8Mvu+tqQ==}
next-intl@4.12.0:
resolution: {integrity: sha512-v8KpppWG0yLLlChJ3Of6uoPew9LeRDBAtY6vpJmF7YJmBZlHEzzoEL4w1g1dAU+VleEPNoXNm9hg1eEsKWV5hw==}
next-intl@4.13.0:
resolution: {integrity: sha512-OvNq2v5XLx4EkQOsAhVE9g+6zdb83XHusADCXXtIW4LILYnjEVaeINdr1lkVWKSjzwNUiMSlH5N4K0OQTRiv6A==}
peerDependencies:
next: ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0
@@ -9496,8 +9499,8 @@ packages:
peerDependencies:
react: '>=16.13'
use-intl@4.12.0:
resolution: {integrity: sha512-r+qVb7UI1+kiOhjYsmsNUCY+jrnjVopwGeFlmMyQj4YInlwZzgMeMSv9n8MqnWWy77HL5BVM8K2WgX50SbtcpA==}
use-intl@4.13.0:
resolution: {integrity: sha512-fAFDrWaASxlhXOipcOyb5VDD+YONqj6+8O8EcG/J7RBoOUF3A8YahRWLN+mBxYMrlMQB8N6Voqk5X+YC+HSL0A==}
peerDependencies:
react: ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 || ^19.0.0
@@ -13683,6 +13686,10 @@ snapshots:
optionalDependencies:
'@types/trusted-types': 2.0.7
dompurify@3.4.7:
optionalDependencies:
'@types/trusted-types': 2.0.7
dot-prop@5.3.0:
dependencies:
is-obj: 2.0.0
@@ -14393,7 +14400,7 @@ snapshots:
dependencies:
safer-buffer: 2.1.2
icu-minify@4.12.0:
icu-minify@4.13.0:
dependencies:
'@formatjs/icu-messageformat-parser': 3.5.0
@@ -14532,9 +14539,9 @@ snapshots:
isexe@3.1.5:
optional: true
isomorphic-dompurify@3.14.0(@noble/hashes@2.0.1):
isomorphic-dompurify@3.15.0(@noble/hashes@2.0.1):
dependencies:
dompurify: 3.4.5
dompurify: 3.4.7
jsdom: 29.1.1(@noble/hashes@2.0.1)
transitivePeerDependencies:
- '@noble/hashes'
@@ -15188,20 +15195,20 @@ snapshots:
next: 16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.100.0)
react: 19.2.6
next-intl-swc-plugin-extractor@4.12.0: {}
next-intl-swc-plugin-extractor@4.13.0: {}
next-intl@4.12.0(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.100.0))(react@19.2.6)(typescript@5.9.3):
next-intl@4.13.0(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.100.0))(react@19.2.6)(typescript@5.9.3):
dependencies:
'@formatjs/intl-localematcher': 0.8.1
'@parcel/watcher': 2.4.1
'@swc/core': 1.15.3
icu-minify: 4.12.0
icu-minify: 4.13.0
negotiator: 1.0.0
next: 16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sass@1.100.0)
next-intl-swc-plugin-extractor: 4.12.0
next-intl-swc-plugin-extractor: 4.13.0
po-parser: 2.1.1
react: 19.2.6
use-intl: 4.12.0(react@19.2.6)
use-intl: 4.13.0(react@19.2.6)
optionalDependencies:
typescript: 5.9.3
transitivePeerDependencies:
@@ -17083,11 +17090,11 @@ snapshots:
dequal: 2.0.3
react: 19.2.6
use-intl@4.12.0(react@19.2.6):
use-intl@4.13.0(react@19.2.6):
dependencies:
'@formatjs/fast-memoize': 3.1.0
'@schummar/icu-type-parser': 1.21.5
icu-minify: 4.12.0
icu-minify: 4.13.0
intl-messageformat: 11.1.1
react: 19.2.6
+4 -4
View File
@@ -70,7 +70,7 @@ catalog:
"@trpc/react-query": ^11.17.0
"@trpc/server": ^11.17.0
"@trpc/tanstack-react-query": ^11.17.0
"@turbo/gen": ^2.9.15
"@turbo/gen": ^2.9.16
"@types/adm-zip": 0.5.8
"@types/bcrypt": 6.0.0
"@types/better-sqlite3": 7.6.13
@@ -125,7 +125,7 @@ catalog:
glob: ^13.0.6
ical.js: ^2.2.1
ioredis: 5.11.0
isomorphic-dompurify: ^3.14.0
isomorphic-dompurify: ^3.15.0
jotai: ^2.20.0
jsdom: ^29.1.1
json5: ^2.2.3
@@ -136,7 +136,7 @@ catalog:
mysql2: 3.22.4
next: 16.2.6
next-auth: 5.0.0-beta.31
next-intl: 4.12.0
next-intl: 4.13.0
node-loader: ^2.1.0
octokit: ^5.0.5
oxfmt: ^0.52.0
@@ -163,7 +163,7 @@ catalog:
trpc-to-openapi: ^3.3.0
tsdav: ^2.2.2
tsx: 4.20.4
turbo: ^2.9.15
turbo: ^2.9.16
typescript: ^5.9.3
undici: 7.24.6
use-deep-compare-effect: ^1.8.1