Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
2 changes: 1 addition & 1 deletion packages/auth-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {
"cors": "^2.8.5",
"express": "^4.19.2"
"express": "^4.21.0"
},
"devDependencies": {
"@types/cors": "^2.8.17"
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/e2e-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"type-check": "yarn g:tsc --build"
},
"dependencies": {
"express": "^4.19.2",
"express": "^4.21.0",
"uuid": "^10.0.0",
"ws": "^8.18.0"
},
Expand Down
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"
}
}
4 changes: 2 additions & 2 deletions packages/suite-desktop-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"devDependencies": {
"@currents/playwright": "^1.3.1",
"@electron/notarize": "2.4.0",
"@electron/notarize": "2.5.0",
"@playwright/browser-chromium": "^1.46.1",
"@playwright/browser-firefox": "^1.46.1",
"@playwright/browser-webkit": "^1.46.1",
Expand All @@ -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
4 changes: 2 additions & 2 deletions packages/suite-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"usb": "^2.14.0"
},
"devDependencies": {
"@electron/notarize": "2.4.0",
"electron": "31.6.0",
"@electron/notarize": "2.5.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
Loading