Skip to content

Commit

Permalink
chore(suite): bump electron to 32
Browse files Browse the repository at this point in the history
  • Loading branch information
Lemonexe committed Oct 2, 2024
1 parent c1e7965 commit 622098d
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"type-fest": "4.24.0",
"bcrypto": "5.4.0",
"react": "18.2.0",
"electron": "31.6.0",
"electron": "32.1.2",
"@types/node": "20.12.7",
"@types/react": "18.2.55",
"bn.js": "5.2.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@trezor/connect": "workspace:*"
},
"devDependencies": {
"electron": "31.6.0",
"electron": "32.1.2",
"electron-builder": "25.0.5"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"babel-loader": "^9.1.3",
"concurrently": "^8.2.2",
"copy-webpack-plugin": "^12.0.2",
"electron": "31.6.0",
"electron": "32.1.2",
"electron-builder": "25.0.5",
"html-webpack-plugin": "^5.6.0",
"terser-webpack-plugin": "^5.3.9",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
}
},
"devDependencies": {
"electron": "31.6.0",
"electron": "32.1.2",
"electron-builder": "25.0.5"
}
}
2 changes: 1 addition & 1 deletion packages/suite-build/configs/desktop.webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const baseDirUI = getPathForProject('desktop-ui');
const baseDir = getPathForProject('desktop');

const config: webpack.Configuration = {
target: 'browserslist:Chrome >= 126', // Electron 31 is running on chromium 126
target: 'browserslist:Chrome >= 128', // Electron 32 is running on chromium 128
entry: [path.join(baseDirUI, 'src', 'index.tsx')],
output: {
path: path.join(baseDir, 'build'),
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-desktop-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"type-check": "yarn g:tsc --build tsconfig.json"
},
"dependencies": {
"electron": "31.6.0"
"electron": "32.1.2"
}
}
2 changes: 1 addition & 1 deletion packages/suite-desktop-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@trezor/trezor-user-env-link": "workspace:*",
"@trezor/type-utils": "workspace:*",
"@types/electron-localshortcut": "^3.1.3",
"electron": "31.6.0",
"electron": "32.1.2",
"fs-extra": "^11.2.0",
"glob": "^10.3.10",
"terser-webpack-plugin": "^5.3.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@electron/notarize": "2.5.0",
"electron": "31.6.0",
"electron": "32.1.2",
"electron-builder": "25.0.5",
"glob": "^10.3.10"
}
Expand Down
7 changes: 6 additions & 1 deletion shell.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# ATTENTION
# NixOS is not fully supported, some configuration may be necessary, see comments below

# pinned to nixos-24.05 on commit https://github.com/NixOS/nixpkgs/commit/759537f06e6999e141588ff1c9be7f3a5c060106
with import
(builtins.fetchTarball {
Expand All @@ -8,7 +11,9 @@ with import

let
# unstable packages
electron = electron_31; # use the same version as defined in packages/suite-desktop/package.json
# ATTENTION: this does not match the actual required version defined in packages/suite-desktop/package.json
# (the required version is not yet in NixOS repository)
electron = electron_31;
nodejs = nodejs_20;
# use older gcc. 10.2.0 with glibc 2.32 for node_modules bindings.
# electron-builder is packing the app with glibc 2.32, bindings should not be compiled with newer version.
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11848,7 +11848,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@trezor/suite-desktop-api@workspace:packages/suite-desktop-api"
dependencies:
electron: "npm:31.6.0"
electron: "npm:32.1.2"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -11885,7 +11885,7 @@ __metadata:
"@trezor/utils": "workspace:*"
"@types/electron-localshortcut": "npm:^3.1.3"
chalk: "npm:^4.1.2"
electron: "npm:31.6.0"
electron: "npm:32.1.2"
electron-localshortcut: "npm:^3.2.1"
electron-store: "npm:8.2.0"
electron-updater: "npm:6.3.4"
Expand Down Expand Up @@ -11935,7 +11935,7 @@ __metadata:
dependencies:
"@electron/notarize": "npm:2.5.0"
blake-hash: "npm:^2.0.0"
electron: "npm:31.6.0"
electron: "npm:32.1.2"
electron-builder: "npm:25.0.5"
electron-localshortcut: "npm:^3.2.1"
electron-store: "npm:8.2.0"
Expand Down Expand Up @@ -18044,7 +18044,7 @@ __metadata:
resolution: "connect-example-electron-main@workspace:packages/connect-examples/electron-main-process"
dependencies:
"@trezor/connect": "workspace:*"
electron: "npm:31.6.0"
electron: "npm:32.1.2"
electron-builder: "npm:25.0.5"
languageName: unknown
linkType: soft
Expand All @@ -18053,7 +18053,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "connect-example-electron-renderer-popup@workspace:packages/connect-examples/electron-renderer-with-popup"
dependencies:
electron: "npm:31.6.0"
electron: "npm:32.1.2"
electron-builder: "npm:25.0.5"
languageName: unknown
linkType: soft
Expand All @@ -18066,7 +18066,7 @@ __metadata:
babel-loader: "npm:^9.1.3"
concurrently: "npm:^8.2.2"
copy-webpack-plugin: "npm:^12.0.2"
electron: "npm:31.6.0"
electron: "npm:32.1.2"
electron-builder: "npm:25.0.5"
html-webpack-plugin: "npm:^5.6.0"
terser-webpack-plugin: "npm:^5.3.9"
Expand Down Expand Up @@ -20542,16 +20542,16 @@ __metadata:
languageName: node
linkType: hard

"electron@npm:31.6.0":
version: 31.6.0
resolution: "electron@npm:31.6.0"
"electron@npm:32.1.2":
version: 32.1.2
resolution: "electron@npm:32.1.2"
dependencies:
"@electron/get": "npm:^2.0.0"
"@types/node": "npm:^20.9.0"
extract-zip: "npm:^2.0.1"
bin:
electron: cli.js
checksum: 10/ef304dd279a6f01143de000d3be420bde8f6feb5b72387c2b22e64fd97e1d5b80a0e82e4f2dee660b36a8a682e4f9cbcd2e6d2f73f5e7ba4e84d8bfb03c1d8e2
checksum: 10/a4793dd12b2d1dffff53420092ac7612eee41d193f07e847783136ee296b5380abb169eb1a4c1929b01a99b1d93bf53f071f2c5128e8241e70ec930d303fba51
languageName: node
linkType: hard

Expand Down

0 comments on commit 622098d

Please sign in to comment.