Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit ba009ba

Browse files
committed
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
2 parents dd0d45f + 9e1c150 commit ba009ba

File tree

6 files changed

+729
-719
lines changed

6 files changed

+729
-719
lines changed

apps/client/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"mermaid": "11.6.0",
4646
"mind-elixir": "4.5.2",
4747
"panzoom": "9.4.3",
48-
"react": "18.3.1",
49-
"react-dom": "18.3.1",
48+
"react": "19.1.0",
49+
"react-dom": "19.1.0",
5050
"split.js": "1.6.5",
5151
"svg-pan-zoom": "3.6.2",
5252
"vanilla-js-wheel-zoom": "9.0.4"
@@ -57,8 +57,8 @@
5757
"@types/jquery": "3.5.32",
5858
"@types/leaflet": "1.9.17",
5959
"@types/leaflet-gpx": "1.3.7",
60-
"@types/react": "18.3.21",
61-
"@types/react-dom": "18.3.7",
60+
"@types/react": "19.1.3",
61+
"@types/react-dom": "19.1.3",
6262
"copy-webpack-plugin": "13.0.0",
6363
"happy-dom": "17.4.6",
6464
"script-loader": "0.7.2"

apps/desktop/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"@types/electron-squirrel-startup": "1.0.2",
1919
"@triliumnext/server": "workspace:*",
2020
"copy-webpack-plugin": "13.0.0",
21-
"electron": "35.3.0",
22-
"@electron-forge/cli": "7.8.0",
23-
"@electron-forge/maker-deb": "7.8.0",
24-
"@electron-forge/maker-dmg": "7.8.0",
25-
"@electron-forge/maker-flatpak": "7.8.0",
26-
"@electron-forge/maker-rpm": "7.8.0",
27-
"@electron-forge/maker-squirrel": "7.8.0",
28-
"@electron-forge/maker-zip": "7.8.0",
29-
"@electron-forge/plugin-auto-unpack-natives": "7.8.0",
21+
"electron": "36.2.0",
22+
"@electron-forge/cli": "7.8.1",
23+
"@electron-forge/maker-deb": "7.8.1",
24+
"@electron-forge/maker-dmg": "7.8.1",
25+
"@electron-forge/maker-flatpak": "7.8.1",
26+
"@electron-forge/maker-rpm": "7.8.1",
27+
"@electron-forge/maker-squirrel": "7.8.1",
28+
"@electron-forge/maker-zip": "7.8.1",
29+
"@electron-forge/plugin-auto-unpack-natives": "7.8.1",
3030
"prebuild-install": "^7.1.1"
3131
},
3232
"config": {

apps/edit-docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@triliumnext/desktop": "workspace:*",
99
"@types/fs-extra": "11.0.4",
1010
"copy-webpack-plugin": "13.0.0",
11-
"electron": "35.3.0",
11+
"electron": "36.2.0",
1212
"fs-extra": "11.3.0"
1313
},
1414
"nx": {

apps/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"debounce": "2.2.0",
7070
"debug": "4.4.0",
7171
"ejs": "3.1.10",
72-
"electron": "35.3.0",
72+
"electron": "36.2.0",
7373
"electron-debug": "4.1.0",
7474
"electron-window-state": "5.0.3",
7575
"escape-html": "1.0.3",

0 commit comments

Comments
 (0)