sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop

pull/1861/head^2
Elian Doran 2025-05-10 15:20:28 +07:00
parent dd0d45fbde 9e1c15067c
commit ba009ba66b
No known key found for this signature in database
6 changed files with 729 additions and 719 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/client/package.json
Unescape Escape View File

@ -45,8 +45,8 @@
"mermaid": "11.6.0", "mermaid": "11.6.0",
"mind-elixir": "4.5.2", "mind-elixir": "4.5.2",
"panzoom": "9.4.3", "panzoom": "9.4.3",
"react": "18.3.1", "react": "19.1.0",
"react-dom": "18.3.1", "react-dom": "19.1.0",
"split.js": "1.6.5", "split.js": "1.6.5",
"svg-pan-zoom": "3.6.2", "svg-pan-zoom": "3.6.2",
"vanilla-js-wheel-zoom": "9.0.4" "vanilla-js-wheel-zoom": "9.0.4"
@ -57,8 +57,8 @@
"@types/jquery": "3.5.32", "@types/jquery": "3.5.32",
"@types/leaflet": "1.9.17", "@types/leaflet": "1.9.17",
"@types/leaflet-gpx": "1.3.7", "@types/leaflet-gpx": "1.3.7",
"@types/react": "18.3.21", "@types/react": "19.1.3",
"@types/react-dom": "18.3.7", "@types/react-dom": "19.1.3",
"copy-webpack-plugin": "13.0.0", "copy-webpack-plugin": "13.0.0",
"happy-dom": "17.4.6", "happy-dom": "17.4.6",
"script-loader": "0.7.2" "script-loader": "0.7.2"

18
apps/desktop/package.json
Unescape Escape View File

@ -18,15 +18,15 @@
"@types/electron-squirrel-startup": "1.0.2", "@types/electron-squirrel-startup": "1.0.2",
"@triliumnext/server": "workspace:*", "@triliumnext/server": "workspace:*",
"copy-webpack-plugin": "13.0.0", "copy-webpack-plugin": "13.0.0",
"electron": "35.3.0", "electron": "36.2.0",
"@electron-forge/cli": "7.8.0", "@electron-forge/cli": "7.8.1",
"@electron-forge/maker-deb": "7.8.0", "@electron-forge/maker-deb": "7.8.1",
"@electron-forge/maker-dmg": "7.8.0", "@electron-forge/maker-dmg": "7.8.1",
"@electron-forge/maker-flatpak": "7.8.0", "@electron-forge/maker-flatpak": "7.8.1",
"@electron-forge/maker-rpm": "7.8.0", "@electron-forge/maker-rpm": "7.8.1",
"@electron-forge/maker-squirrel": "7.8.0", "@electron-forge/maker-squirrel": "7.8.1",
"@electron-forge/maker-zip": "7.8.0", "@electron-forge/maker-zip": "7.8.1",
"@electron-forge/plugin-auto-unpack-natives": "7.8.0", "@electron-forge/plugin-auto-unpack-natives": "7.8.1",
"prebuild-install": "^7.1.1" "prebuild-install": "^7.1.1"
}, },
"config": { "config": {

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

@ -8,7 +8,7 @@
"@triliumnext/desktop": "workspace:*", "@triliumnext/desktop": "workspace:*",
"@types/fs-extra": "11.0.4", "@types/fs-extra": "11.0.4",
"copy-webpack-plugin": "13.0.0", "copy-webpack-plugin": "13.0.0",
"electron": "35.3.0", "electron": "36.2.0",
"fs-extra": "11.3.0" "fs-extra": "11.3.0"
}, },
"nx": { "nx": {

2
apps/server/package.json
Unescape Escape View File

@ -69,7 +69,7 @@
"debounce": "2.2.0", "debounce": "2.2.0",
"debug": "4.4.0", "debug": "4.4.0",
"ejs": "3.1.10", "ejs": "3.1.10",
"electron": "35.3.0", "electron": "36.2.0",
"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",

1415
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

3
pnpm-workspace.yaml
Unescape Escape View File

@ -20,5 +20,8 @@ onlyBuiltDependencies:
- fs-xattr - fs-xattr
- macos-alias - macos-alias
overrides:
"node-abi": 4.8.0
shamefullyHoist: true shamefullyHoist: true
nodeLinker: isolated nodeLinker: isolated