Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 01:45:36 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'main' into revert-9307-renovate/minimatch3-brace-expansion-5.x

Browse Source
This commit is contained in:
Elian Doran
2026-04-12 11:35:27 +03:00
committed by GitHub
parent ba816fc132 fadbc906e2
commit ef5d9f980e
2 changed files with 75 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/package.json
View File

@@ -76,7 +76,7 @@
},
"devDependencies": {
"@ckeditor/ckeditor5-inspector": "5.0.0",
"@prefresh/vite": "2.4.12",
"@prefresh/vite": "3.0.0",
"@types/bootstrap": "5.2.10",
"@types/jquery": "4.0.0",
"@types/leaflet": "1.9.21",

77
pnpm-lock.yaml generated
View File

@@ -383,8 +383,8 @@ importers:
specifier: 5.0.0
version: 5.0.0
'@prefresh/vite':
specifier: 2.4.12
version: 2.4.12(preact@10.29.1)(vite@8.0.7(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(less@4.1.3)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.3))
specifier: 3.0.0
version: 3.0.0(preact@10.29.1)(vite@8.0.7(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(less@4.1.3)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.3))
'@types/bootstrap':
specifier: 5.2.10
version: 5.2.10
@@ -4107,6 +4107,15 @@ packages:
peerDependencies:
preact: 10.29.1
'@prefresh/rolldown@0.1.0':
resolution: {integrity: sha512-XFWqSNULnVvSQCy0x+9JQr1dw5Yks/cXSZPAaJiInECZGgfU+wY43Lf5erlCQGd1FT5otcbssu0SncXSlQ+uyA==}
peerDependencies:
rolldown: ^1.0.0-rc.12
vite: ^8.0.0
peerDependenciesMeta:
vite:
optional: true
'@prefresh/utils@1.2.1':
resolution: {integrity: sha512-vq/sIuN5nYfYzvyayXI4C2QkprfNaHUQ9ZX+3xLD8nL3rWyzpxOm1+K7RtMbhd+66QcaISViK7amjnheQ/4WZw==}
@@ -4116,6 +4125,12 @@ packages:
preact: 10.29.1
vite: '>=7.3.2'
'@prefresh/vite@3.0.0':
resolution: {integrity: sha512-KlicHeLzD2L9e/Oyr+q16PWC0SAn8ks/RUfbtdwI6WAOu3efdqjqgx34PPBh5rs9WoyTKeNAfOM/ZXLb83qjLw==}
peerDependencies:
preact: 10.29.1
vite: '>=7.3.2'
'@promptbook/utils@0.69.5':
resolution: {integrity: sha512-xm5Ti/Hp3o4xHrsK9Yy3MS6KbDxYbq485hDsFvxqaNA7equHLPdo8H8faTitTeb14QCDfLW4iwCxdVYu5sn6YQ==}
@@ -11135,6 +11150,18 @@ packages:
resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
engines: {node: '>= 0.4'}
oxc-unshadowed-visitor@0.0.1:
resolution: {integrity: sha512-IVQnhKE/MwXJHgydUYuutUwOG1kCmAOYARqpcOvATWJQZvkyDbJ+kGMAufwFosYluPp0otDb/yilsoVvF1Ar3g==}
engines: {node: '>=22.12.0 || ^24.0.0'}
peerDependencies:
oxc-parser: ^0.121.0
rolldown: ^1.0.0-rc.12
peerDependenciesMeta:
oxc-parser:
optional: true
rolldown:
optional: true
p-cancelable@2.1.1:
resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
engines: {node: '>=8'}
@@ -12039,6 +12066,15 @@ packages:
robust-predicates@3.0.2:
resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==}
rolldown-string@0.3.0:
resolution: {integrity: sha512-qGhBPNSv/27uzFBQdO+Cs4YAXC/1PKznD7Jz5Fl7NIAIlteuTPBTBWBhCpJ2AFTqLsoKvvUr7wSjqSUip0Fkpg==}
engines: {node: '>=20.19.0'}
peerDependencies:
rolldown: '*'
peerDependenciesMeta:
rolldown:
optional: true
rolldown@1.0.0-rc.13:
resolution: {integrity: sha512-bvVj8YJmf0rq4pSFmH7laLa6pYrhghv3PRzrCdRAr23g66zOKVJ4wkvFtgohtPLWmthgg8/rkaqRHrpUEh0Zbw==}
engines: {node: ^20.19.0 || >=22.12.0}
@@ -17666,11 +17702,21 @@ snapshots:
dependencies:
preact: 10.29.1
'@prefresh/rolldown@0.1.0(rolldown@1.0.0-rc.13)(vite@8.0.7(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(less@4.1.3)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.3))':
dependencies:
oxc-unshadowed-visitor: 0.0.1(rolldown@1.0.0-rc.13)
rolldown: 1.0.0-rc.13
rolldown-string: 0.3.0(rolldown@1.0.0-rc.13)
optionalDependencies:
vite: 8.0.7(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(less@4.1.3)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.3)
transitivePeerDependencies:
- oxc-parser
'@prefresh/utils@1.2.1': {}
'@prefresh/vite@2.4.12(preact@10.29.1)(vite@8.0.7(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(less@4.1.3)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.3))':
dependencies:
'@babel/core': 7.28.0
'@babel/core': 7.29.0
'@prefresh/babel-plugin': 0.5.2
'@prefresh/core': 1.5.5(preact@10.29.1)
'@prefresh/utils': 1.2.1
@@ -17680,6 +17726,21 @@ snapshots:
transitivePeerDependencies:
- supports-color
'@prefresh/vite@3.0.0(preact@10.29.1)(vite@8.0.7(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(less@4.1.3)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.3))':
dependencies:
'@babel/core': 7.29.0
'@prefresh/babel-plugin': 0.5.2
'@prefresh/core': 1.5.5(preact@10.29.1)
'@prefresh/rolldown': 0.1.0(rolldown@1.0.0-rc.13)(vite@8.0.7(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(less@4.1.3)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.3))
'@prefresh/utils': 1.2.1
'@rollup/pluginutils': 4.2.1
preact: 10.29.1
rolldown: 1.0.0-rc.13
vite: 8.0.7(@types/node@24.12.2)(esbuild@0.28.0)(jiti@2.6.1)(less@4.1.3)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.21.0)(yaml@2.8.3)
transitivePeerDependencies:
- oxc-parser
- supports-color
'@promptbook/utils@0.69.5':
dependencies:
spacetrim: 0.11.59
@@ -26797,6 +26858,10 @@ snapshots:
object-keys: 1.1.1
safe-push-apply: 1.0.0
oxc-unshadowed-visitor@0.0.1(rolldown@1.0.0-rc.13):
optionalDependencies:
rolldown: 1.0.0-rc.13
p-cancelable@2.1.1: {}
p-defer@1.0.0: {}
@@ -27797,6 +27862,12 @@ snapshots:
robust-predicates@3.0.2: {}
rolldown-string@0.3.0(rolldown@1.0.0-rc.13):
dependencies:
magic-string: 0.30.21
optionalDependencies:
rolldown: 1.0.0-rc.13
rolldown@1.0.0-rc.13:
dependencies:
'@oxc-project/types': 0.123.0