mirror of
https://github.com/zadam/trilium.git
synced 2025-12-05 23:14:24 +01:00
Merge 0c3b552678470a60d0a2512149742efea304fcc9 into 2e431b11350698b6095037bb51aedb95f3466464
This commit is contained in:
commit
dc4f2ce9ad
@ -35,7 +35,7 @@
|
|||||||
"@triliumnext/commons": "workspace:*",
|
"@triliumnext/commons": "workspace:*",
|
||||||
"@triliumnext/server": "workspace:*",
|
"@triliumnext/server": "workspace:*",
|
||||||
"copy-webpack-plugin": "13.0.1",
|
"copy-webpack-plugin": "13.0.1",
|
||||||
"electron": "38.7.2",
|
"electron": "39.2.4",
|
||||||
"@electron-forge/cli": "7.10.2",
|
"@electron-forge/cli": "7.10.2",
|
||||||
"@electron-forge/maker-deb": "7.10.2",
|
"@electron-forge/maker-deb": "7.10.2",
|
||||||
"@electron-forge/maker-dmg": "7.10.2",
|
"@electron-forge/maker-dmg": "7.10.2",
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
"@triliumnext/desktop": "workspace:*",
|
"@triliumnext/desktop": "workspace:*",
|
||||||
"@types/fs-extra": "11.0.4",
|
"@types/fs-extra": "11.0.4",
|
||||||
"copy-webpack-plugin": "13.0.1",
|
"copy-webpack-plugin": "13.0.1",
|
||||||
"electron": "38.7.2",
|
"electron": "39.2.4",
|
||||||
"fs-extra": "11.3.2"
|
"fs-extra": "11.3.2"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@ -80,7 +80,7 @@
|
|||||||
"debounce": "3.0.0",
|
"debounce": "3.0.0",
|
||||||
"debug": "4.4.3",
|
"debug": "4.4.3",
|
||||||
"ejs": "3.1.10",
|
"ejs": "3.1.10",
|
||||||
"electron": "38.7.2",
|
"electron": "39.2.4",
|
||||||
"electron-debug": "4.1.0",
|
"electron-debug": "4.1.0",
|
||||||
"electron-window-state": "5.0.3",
|
"electron-window-state": "5.0.3",
|
||||||
"escape-html": "1.0.3",
|
"escape-html": "1.0.3",
|
||||||
|
|||||||
51
pnpm-lock.yaml
generated
51
pnpm-lock.yaml
generated
@ -367,7 +367,7 @@ importers:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@electron/remote':
|
'@electron/remote':
|
||||||
specifier: 2.1.3
|
specifier: 2.1.3
|
||||||
version: 2.1.3(electron@38.7.2)
|
version: 2.1.3(electron@39.2.4)
|
||||||
better-sqlite3:
|
better-sqlite3:
|
||||||
specifier: 12.4.6
|
specifier: 12.4.6
|
||||||
version: 12.4.6
|
version: 12.4.6
|
||||||
@ -424,8 +424,8 @@ importers:
|
|||||||
specifier: 13.0.1
|
specifier: 13.0.1
|
||||||
version: 13.0.1(webpack@5.101.3(esbuild@0.27.0))
|
version: 13.0.1(webpack@5.101.3(esbuild@0.27.0))
|
||||||
electron:
|
electron:
|
||||||
specifier: 38.7.2
|
specifier: 39.2.4
|
||||||
version: 38.7.2
|
version: 39.2.4
|
||||||
prebuild-install:
|
prebuild-install:
|
||||||
specifier: 7.1.3
|
specifier: 7.1.3
|
||||||
version: 7.1.3
|
version: 7.1.3
|
||||||
@ -480,8 +480,8 @@ importers:
|
|||||||
specifier: 13.0.1
|
specifier: 13.0.1
|
||||||
version: 13.0.1(webpack@5.101.3(esbuild@0.27.0))
|
version: 13.0.1(webpack@5.101.3(esbuild@0.27.0))
|
||||||
electron:
|
electron:
|
||||||
specifier: 38.7.2
|
specifier: 39.2.4
|
||||||
version: 38.7.2
|
version: 39.2.4
|
||||||
fs-extra:
|
fs-extra:
|
||||||
specifier: 11.3.2
|
specifier: 11.3.2
|
||||||
version: 11.3.2
|
version: 11.3.2
|
||||||
@ -506,7 +506,7 @@ importers:
|
|||||||
version: 7.1.1
|
version: 7.1.1
|
||||||
'@electron/remote':
|
'@electron/remote':
|
||||||
specifier: 2.1.3
|
specifier: 2.1.3
|
||||||
version: 2.1.3(electron@38.7.2)
|
version: 2.1.3(electron@39.2.4)
|
||||||
'@preact/preset-vite':
|
'@preact/preset-vite':
|
||||||
specifier: 2.10.2
|
specifier: 2.10.2
|
||||||
version: 2.10.2(@babel/core@7.28.0)(preact@10.27.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(less@4.1.3)(lightningcss@1.30.1)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
|
version: 2.10.2(@babel/core@7.28.0)(preact@10.27.2)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(less@4.1.3)(lightningcss@1.30.1)(sass-embedded@1.91.0)(sass@1.91.0)(terser@5.44.0)(tsx@4.20.6)(yaml@2.8.1))
|
||||||
@ -649,8 +649,8 @@ importers:
|
|||||||
specifier: 3.1.10
|
specifier: 3.1.10
|
||||||
version: 3.1.10
|
version: 3.1.10
|
||||||
electron:
|
electron:
|
||||||
specifier: 38.7.2
|
specifier: 39.2.4
|
||||||
version: 38.7.2
|
version: 39.2.4
|
||||||
electron-debug:
|
electron-debug:
|
||||||
specifier: 4.1.0
|
specifier: 4.1.0
|
||||||
version: 4.1.0
|
version: 4.1.0
|
||||||
@ -5460,9 +5460,6 @@ packages:
|
|||||||
'@types/node@22.18.12':
|
'@types/node@22.18.12':
|
||||||
resolution: {integrity: sha512-BICHQ67iqxQGFSzfCFTT7MRQ5XcBjG5aeKh5Ok38UBbPe5fxTyE+aHFxwVrGyr8GNlqFMLKD1D3P2K/1ks8tog==}
|
resolution: {integrity: sha512-BICHQ67iqxQGFSzfCFTT7MRQ5XcBjG5aeKh5Ok38UBbPe5fxTyE+aHFxwVrGyr8GNlqFMLKD1D3P2K/1ks8tog==}
|
||||||
|
|
||||||
'@types/node@22.18.13':
|
|
||||||
resolution: {integrity: sha512-Bo45YKIjnmFtv6I1TuC8AaHBbqXtIo+Om5fE4QiU1Tj8QR/qt+8O3BAtOimG5IFmwaWiPmB3Mv3jtYzBA4Us2A==}
|
|
||||||
|
|
||||||
'@types/node@22.18.8':
|
'@types/node@22.18.8':
|
||||||
resolution: {integrity: sha512-pAZSHMiagDR7cARo/cch1f3rXy0AEXwsVsVH09FcyeJVAzCnGgmYis7P3JidtTUjyadhTeSo8TgRPswstghDaw==}
|
resolution: {integrity: sha512-pAZSHMiagDR7cARo/cch1f3rXy0AEXwsVsVH09FcyeJVAzCnGgmYis7P3JidtTUjyadhTeSo8TgRPswstghDaw==}
|
||||||
|
|
||||||
@ -7836,8 +7833,8 @@ packages:
|
|||||||
resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
|
resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
|
||||||
engines: {node: '>=8.0.0'}
|
engines: {node: '>=8.0.0'}
|
||||||
|
|
||||||
electron@38.7.2:
|
electron@39.2.4:
|
||||||
resolution: {integrity: sha512-BcjR0IHqp3uv4ytVQwW2/9zAWo17Rjwrydn6RS+g+vqhpcPTzmBHDCHKaEcqheSl/7zzKPgFZdvT21BoSfrxRQ==}
|
resolution: {integrity: sha512-KxPtwpFceQKSxRtUY39piHLYhJMMyHfOhc70e6zRnKGrbRdK6hzEqssth8IGjlKOdkeT4KCvIEngnNraYk39+g==}
|
||||||
engines: {node: '>= 12.20.55'}
|
engines: {node: '>= 12.20.55'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
@ -15778,8 +15775,6 @@ snapshots:
|
|||||||
'@ckeditor/ckeditor5-core': 47.2.0
|
'@ckeditor/ckeditor5-core': 47.2.0
|
||||||
'@ckeditor/ckeditor5-utils': 47.2.0
|
'@ckeditor/ckeditor5-utils': 47.2.0
|
||||||
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
||||||
transitivePeerDependencies:
|
|
||||||
- supports-color
|
|
||||||
|
|
||||||
'@ckeditor/ckeditor5-code-block@47.2.0(patch_hash=2361d8caad7d6b5bddacc3a3b4aa37dbfba260b1c1b22a450413a79c1bb1ce95)':
|
'@ckeditor/ckeditor5-code-block@47.2.0(patch_hash=2361d8caad7d6b5bddacc3a3b4aa37dbfba260b1c1b22a450413a79c1bb1ce95)':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -16394,8 +16389,6 @@ snapshots:
|
|||||||
'@ckeditor/ckeditor5-utils': 47.2.0
|
'@ckeditor/ckeditor5-utils': 47.2.0
|
||||||
'@ckeditor/ckeditor5-widget': 47.2.0
|
'@ckeditor/ckeditor5-widget': 47.2.0
|
||||||
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
||||||
transitivePeerDependencies:
|
|
||||||
- supports-color
|
|
||||||
|
|
||||||
'@ckeditor/ckeditor5-mention@47.2.0(patch_hash=5981fb59ba35829e4dff1d39cf771000f8a8fdfa7a34b51d8af9549541f2d62d)':
|
'@ckeditor/ckeditor5-mention@47.2.0(patch_hash=5981fb59ba35829e4dff1d39cf771000f8a8fdfa7a34b51d8af9549541f2d62d)':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -16550,8 +16543,6 @@ snapshots:
|
|||||||
'@ckeditor/ckeditor5-ui': 47.2.0
|
'@ckeditor/ckeditor5-ui': 47.2.0
|
||||||
'@ckeditor/ckeditor5-utils': 47.2.0
|
'@ckeditor/ckeditor5-utils': 47.2.0
|
||||||
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
|
||||||
transitivePeerDependencies:
|
|
||||||
- supports-color
|
|
||||||
|
|
||||||
'@ckeditor/ckeditor5-restricted-editing@47.2.0':
|
'@ckeditor/ckeditor5-restricted-editing@47.2.0':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -17396,9 +17387,9 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
'@electron/remote@2.1.3(electron@38.7.2)':
|
'@electron/remote@2.1.3(electron@39.2.4)':
|
||||||
dependencies:
|
dependencies:
|
||||||
electron: 38.7.2
|
electron: 39.2.4
|
||||||
|
|
||||||
'@electron/universal@2.0.2':
|
'@electron/universal@2.0.2':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -20721,7 +20712,7 @@ snapshots:
|
|||||||
|
|
||||||
'@types/mute-stream@0.0.4':
|
'@types/mute-stream@0.0.4':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 22.19.1
|
'@types/node': 24.10.1
|
||||||
|
|
||||||
'@types/node-forge@1.3.14':
|
'@types/node-forge@1.3.14':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -20749,10 +20740,6 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
undici-types: 6.21.0
|
undici-types: 6.21.0
|
||||||
|
|
||||||
'@types/node@22.18.13':
|
|
||||||
dependencies:
|
|
||||||
undici-types: 6.21.0
|
|
||||||
|
|
||||||
'@types/node@22.18.8':
|
'@types/node@22.18.8':
|
||||||
dependencies:
|
dependencies:
|
||||||
undici-types: 6.21.0
|
undici-types: 6.21.0
|
||||||
@ -20910,7 +20897,7 @@ snapshots:
|
|||||||
|
|
||||||
'@types/yauzl@2.10.3':
|
'@types/yauzl@2.10.3':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 22.18.13
|
'@types/node': 24.10.1
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
'@typescript-eslint/eslint-plugin@8.46.4(@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
|
'@typescript-eslint/eslint-plugin@8.46.4(@typescript-eslint/parser@8.46.4(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
|
||||||
@ -21321,11 +21308,11 @@ snapshots:
|
|||||||
|
|
||||||
'@wdio/repl@9.16.2':
|
'@wdio/repl@9.16.2':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 20.19.24
|
'@types/node': 20.19.25
|
||||||
|
|
||||||
'@wdio/types@9.20.0':
|
'@wdio/types@9.20.0':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 20.19.24
|
'@types/node': 20.19.25
|
||||||
|
|
||||||
'@wdio/utils@9.20.1':
|
'@wdio/utils@9.20.1':
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -23773,10 +23760,10 @@ snapshots:
|
|||||||
- supports-color
|
- supports-color
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
electron@38.7.2:
|
electron@39.2.4:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@electron/get': 2.0.3
|
'@electron/get': 2.0.3
|
||||||
'@types/node': 22.18.13
|
'@types/node': 22.19.1
|
||||||
extract-zip: 2.0.1
|
extract-zip: 2.0.1
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
@ -31910,7 +31897,7 @@ snapshots:
|
|||||||
|
|
||||||
webdriver@9.20.1(bufferutil@4.0.9)(utf-8-validate@6.0.5):
|
webdriver@9.20.1(bufferutil@4.0.9)(utf-8-validate@6.0.5):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 20.19.24
|
'@types/node': 20.19.25
|
||||||
'@types/ws': 8.18.1
|
'@types/ws': 8.18.1
|
||||||
'@wdio/config': 9.20.1
|
'@wdio/config': 9.20.1
|
||||||
'@wdio/logger': 9.18.0
|
'@wdio/logger': 9.18.0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user