Skip to content

Commit 3ff2cd0

Browse files
authored
chore: Update electron to version 40 (stoatchat#193)
* chore: Update to electron 39 and include some fixes This commit was made without the use of generative AI. Signed-off-by: Jacob Schlecht <dadadah@echoha.us> * chore: Upgrade to electron 40 This commit was made without the use of generative AI. Signed-off-by: Jacob Schlecht <dadadah@echoha.us> --------- Signed-off-by: Jacob Schlecht <dadadah@echoha.us>
1 parent 74c941e commit 3ff2cd0

3 files changed

Lines changed: 74 additions & 61 deletions

File tree

forge.config.ts

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -85,37 +85,29 @@ if (!process.env.PLATFORM) {
8585
// default arguments found by running
8686
// DEBUG=electron-installer-flatpak* pnpm make
8787
"--socket=fallback-x11",
88+
"--socket=wayland",
8889
"--share=ipc",
90+
"--share=network",
8991
"--device=dri",
92+
"--device=all",
9093
"--socket=pulseaudio",
9194
"--filesystem=home",
92-
"--env=TMPDIR=/var/tmp",
93-
"--share=network",
95+
"--filesystem=xdg-run/pipewire-0",
96+
"--filesystem=xdg-videos:ro",
97+
"--filesystem=xdg-pictures:ro",
98+
"--filesystem=xdg-run/speech-dispatcher",
99+
"--talk-name=org.freedesktop.ScreenSaver",
94100
"--talk-name=org.freedesktop.Notifications",
95-
// add Unity talk name for badges
101+
"--talk-name=org.kde.StatusNotifierWatcher",
102+
"--talk-name=com.canonical.AppMenu.Registrar",
103+
"--talk-name=com.canonical.indicator.application",
96104
"--talk-name=com.canonical.Unity",
105+
"--env=XCURSOR_PATH=/run/host/user-share/icons:/run/host/share/icons",
106+
"--env=ELECTRON_TRASH=gio",
107+
"--env=TMPDIR=xdg-run/app/chat.stoat.stoat-desktop",
97108
],
98-
// files: [
99-
// // is this necessary?
100-
// // https://stackoverflow.com/q/79745700
101-
// ...[16, 32, 64, 128, 256, 512].map(
102-
// (size) =>
103-
// [
104-
// `assets/desktop/hicolor/${size}x${size}.png`,
105-
// `/app/share/icons/hicolor/${size}x${size}/apps/chat.stoat.stoat-desktop.png`,
106-
// ] as [string, string],
107-
// ),
108-
// [
109-
// `assets/desktop/icon.svg`,
110-
// `/app/share/icons/hicolor/scalable/apps/chat.stoat.stoat-desktop.svg`,
111-
// ] as [string, string],
112-
// ],
113109
files: [],
114110
} as MakerFlatpakOptionsConfig,
115-
/* as Omit<
116-
MakerFlatpakOptionsConfig,
117-
"files"
118-
> */
119111
}),
120112
// testing purposes
121113
new MakerDeb({

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": ".vite/build/main.js",
66
"repository": "stoatchat/desktop",
77
"scripts": {
8-
"start": "electron-forge start",
8+
"start": "electron-forge start -- --no-sandbox",
99
"package": "electron-forge package",
1010
"make": "electron-forge make",
1111
"publish": "electron-forge publish",
@@ -36,7 +36,7 @@
3636
"@types/electron-squirrel-startup": "^1.0.2",
3737
"@typescript-eslint/eslint-plugin": "^5.62.0",
3838
"@typescript-eslint/parser": "^5.62.0",
39-
"electron": "38.1.2",
39+
"electron": "^40.8.3",
4040
"eslint": "^8.57.1",
4141
"eslint-plugin-import": "^2.32.0",
4242
"json-schema-typed": "^8.0.1",

0 commit comments

Comments
 (0)