gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-02-23 06:04:25 +01:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/hulmgulm/Trilium

Browse Source
This commit is contained in:
hulmgulm 2026-02-08 10:42:00 +01:00
commit ae723f9557
9 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
apps/client/package.json
View File

@ -56,7 +56,7 @@
"mark.js": "8.11.1",
"marked": "17.0.1",
"mermaid": "11.12.2",
"mind-elixir": "5.7.1",
"mind-elixir": "5.8.0",
"normalize.css": "8.0.1",
"panzoom": "9.4.3",
"preact": "10.28.3",

2
apps/desktop/package.json
View File

@ -35,7 +35,7 @@
"@triliumnext/commons": "workspace:*",
"@triliumnext/server": "workspace:*",
"copy-webpack-plugin": "13.0.1",
"electron": "40.1.0",
"electron": "40.2.1",
"@electron-forge/cli": "7.11.1",
"@electron-forge/maker-deb": "7.11.1",
"@electron-forge/maker-dmg": "7.11.1",

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

@ -12,7 +12,7 @@
"@triliumnext/desktop": "workspace:*",
"@types/fs-extra": "11.0.4",
"copy-webpack-plugin": "13.0.1",
"electron": "40.1.0",
"electron": "40.2.1",
"fs-extra": "11.3.3"
},
"scripts": {

2
apps/server/package.json
View File

@ -83,7 +83,7 @@
"debounce": "3.0.0",
"debug": "4.4.3",
"ejs": "4.0.1",
"electron": "40.1.0",
"electron": "40.2.1",
"electron-debug": "4.1.0",
"electron-window-state": "5.0.3",
"escape-html": "1.0.3",

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

@ -13,7 +13,7 @@
"postinstall": "wxt prepare"
},
"keywords": [],
"packageManager": "pnpm@10.28.2",
"packageManager": "pnpm@10.29.1",
"devDependencies": {
"@wxt-dev/auto-icons": "1.1.0",
"wxt": "0.20.13"

2
package.json
View File

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

2
packages/codemirror/package.json
View File

@ -50,6 +50,6 @@
"codemirror-lang-elixir": "4.0.0",
"codemirror-lang-hcl": "0.1.0",
"codemirror-lang-mermaid": "0.5.0",
"eslint-linter-browserify": "9.39.2"
"eslint-linter-browserify": "10.0.0"
}
}

54
pnpm-lock.yaml generated
View File

@ -208,7 +208,7 @@ importers:
version: 0.2.0(mermaid@11.12.2)
'@mind-elixir/node-menu':
specifier: 5.0.1
version: 5.0.1(mind-elixir@5.7.1)
version: 5.0.1(mind-elixir@5.8.0)
'@popperjs/core':
specifier: 2.11.8
version: 2.11.8
@ -300,8 +300,8 @@ importers:
specifier: 11.12.2
version: 11.12.2
mind-elixir:
specifier: 5.7.1
version: 5.7.1
specifier: 5.8.0
version: 5.8.0
normalize.css:
specifier: 8.0.1
version: 8.0.1
@ -392,7 +392,7 @@ importers:
dependencies:
'@electron/remote':
specifier: 2.1.3
version: 2.1.3(electron@40.1.0)
version: 2.1.3(electron@40.2.1)
better-sqlite3:
specifier: 12.6.2
version: 12.6.2
@ -449,8 +449,8 @@ importers:
specifier: 13.0.1
version: 13.0.1(webpack@5.101.3(esbuild@0.27.2))
electron:
specifier: 40.1.0
version: 40.1.0
specifier: 40.2.1
version: 40.2.1
prebuild-install:
specifier: 7.1.3
version: 7.1.3
@ -505,8 +505,8 @@ importers:
specifier: 13.0.1
version: 13.0.1(webpack@5.101.3(esbuild@0.27.2))
electron:
specifier: 40.1.0
version: 40.1.0
specifier: 40.2.1
version: 40.2.1
fs-extra:
specifier: 11.3.3
version: 11.3.3
@ -543,7 +543,7 @@ importers:
version: 7.1.2
'@electron/remote':
specifier: 2.1.3
version: 2.1.3(electron@40.1.0)
version: 2.1.3(electron@40.2.1)
'@triliumnext/commons':
specifier: workspace:*
version: link:../../packages/commons
@ -680,8 +680,8 @@ importers:
specifier: 4.0.1
version: 4.0.1
electron:
specifier: 40.1.0
version: 40.1.0
specifier: 40.2.1
version: 40.2.1
electron-debug:
specifier: 4.1.0
version: 4.1.0
@ -1375,8 +1375,8 @@ importers:
specifier: 0.5.0
version: 0.5.0
eslint-linter-browserify:
specifier: 9.39.2
version: 9.39.2
specifier: 10.0.0
version: 10.0.0
packages/commons:
dependencies:
@ -8150,8 +8150,8 @@ packages:
resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
engines: {node: '>=8.0.0'}
electron@40.1.0:
resolution: {integrity: sha512-2j/kvw7uF0H1PnzYBzw2k2Q6q16J8ToKrtQzZfsAoXbbMY0l5gQi2DLOauIZLzwp4O01n8Wt/74JhSRwG0yj9A==}
electron@40.2.1:
resolution: {integrity: sha512-0zOeyN8LB1KHIjVV5jyMmQmkqx3J8OkkVlab3p7vOM28jI46blxW7M52Tcdi6X2m5o2jj8ejOlAh5+boL3w8aQ==}
engines: {node: '>= 12.20.55'}
hasBin: true
@ -8373,8 +8373,8 @@ packages:
peerDependencies:
eslint: '>=7.0.0'
eslint-linter-browserify@9.39.2:
resolution: {integrity: sha512-X4oD9ymZLMaNcSRZkNyDEcwObLPTg9QsQM/YHnfWJbnqUJpmmgicXtgi9UGgk+ntC9Aydnp3RW7+uWrkoUbWbg==}
eslint-linter-browserify@10.0.0:
resolution: {integrity: sha512-ZmJ1OcWj3DjsrapPTJagVUpZnsmCFKzyResEDQwSVq4YndeubocN6uVMIe7Fw6RUIUP2Fxn2WdciFqbvpQGsbQ==}
eslint-plugin-ckeditor5-rules@13.0.0:
resolution: {integrity: sha512-flXURsHYkTlPIHWlxt6BB40DRkdl8l1+qp9rFEi5ruF9ZW6hPRPN3Z4fvalrUAy/JuxmmwrcYKpiv+5keOHuPw==}
@ -10872,8 +10872,8 @@ packages:
resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
engines: {node: '>=10'}
mind-elixir@5.7.1:
resolution: {integrity: sha512-T9RRECITVzT0A64ZpUJiM/y5PrsiwCDSoJKUGL8iylREn2I9d+5cjrW6dcRwpVOs1kSiLjsFBubVECmO+tBaTw==}
mind-elixir@5.8.0:
resolution: {integrity: sha512-/UpfwZoiySbXoc6nUIK5DSo8HK5vKtW8tnQz63vuoCvuVU3xj1j2mfmMTnGgiV5NoAKxSyAD59RMBpJfD0kbPw==}
mini-css-extract-plugin@2.9.4:
resolution: {integrity: sha512-ZWYT7ln73Hptxqxk2DxPU9MmapXRhxkJD6tkSR04dnQxm8BGu2hzgKLugK5yySD97u/8yy7Ma7E76k9ZdvtjkQ==}
@ -17570,9 +17570,9 @@ snapshots:
transitivePeerDependencies:
- supports-color
'@electron/remote@2.1.3(electron@40.1.0)':
'@electron/remote@2.1.3(electron@40.2.1)':
dependencies:
electron: 40.1.0
electron: 40.2.1
'@electron/universal@2.0.2':
dependencies:
@ -18944,9 +18944,9 @@ snapshots:
'@microsoft/tsdoc@0.15.1': {}
'@mind-elixir/node-menu@5.0.1(mind-elixir@5.7.1)':
'@mind-elixir/node-menu@5.0.1(mind-elixir@5.8.0)':
dependencies:
mind-elixir: 5.7.1
mind-elixir: 5.8.0
'@mixmark-io/domino@2.2.0': {}
@ -24035,10 +24035,10 @@ snapshots:
- supports-color
optional: true
electron@40.1.0:
electron@40.2.1:
dependencies:
'@electron/get': 2.0.3
'@types/node': 24.10.9
'@types/node': 24.10.10
extract-zip: 2.0.1
transitivePeerDependencies:
- supports-color
@ -24462,7 +24462,7 @@ snapshots:
dependencies:
eslint: 10.0.0(jiti@2.6.1)
eslint-linter-browserify@9.39.2: {}
eslint-linter-browserify@10.0.0: {}
eslint-plugin-ckeditor5-rules@13.0.0:
dependencies:
@ -27565,7 +27565,7 @@ snapshots:
mimic-response@3.1.0: {}
mind-elixir@5.7.1: {}
mind-elixir@5.8.0: {}
mini-css-extract-plugin@2.9.4(webpack@5.101.3(@swc/core@1.11.29(@swc/helpers@0.5.17))(esbuild@0.27.2)):
dependencies: