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 @@ -102,7 +102,7 @@
"type-fest": "2.12.2",
"bcrypto": "5.4.0",
"react": "18.2.0",
"electron": "27.3.8",
"electron": "30.3.1",
"webpack": "^5.93.0",
"html-webpack-plugin": "^5.6.0",
"@types/node": "20.12.7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@trezor/connect": "workspace:*"
},
"devDependencies": {
"electron": "27.3.8",
"electron": "30.3.1",
"electron-builder": "24.13.3"
}
}
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": "27.3.8",
"electron": "30.3.1",
"electron-builder": "24.13.3",
"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": "27.3.8",
"electron": "30.3.1",
"electron-builder": "24.13.3"
}
}
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 >= 115', // Electron 26 is running on chromium 116 (browserlist doesn't know 116 yet)
target: 'browserslist:Chrome >= 124', // Electron 30 is running on chromium 124
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": "27.3.8"
"electron": "30.3.1"
}
}
14 changes: 7 additions & 7 deletions packages/suite-desktop-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test:e2e": "yarn xvfb-maybe -- playwright test --config=./e2e/playwright.config.ts"
},
"dependencies": {
"@sentry/electron": "^4.17.0",
"@sentry/electron": "^4.24.0",
"@suite-common/message-system": "workspace:*",
"@suite-common/sentry": "workspace:*",
"@suite-common/suite-constants": "workspace:^",
Expand All @@ -34,14 +34,14 @@
"@trezor/utils": "workspace:*",
"chalk": "^4.1.2",
"electron-localshortcut": "^3.2.1",
"electron-store": "^8.1.0",
"electron-updater": "6.1.8",
"openpgp": "^5.11.0",
"systeminformation": "^5.21.24"
"electron-store": "8.2.0",
"electron-updater": "6.3.3",
"openpgp": "^5.11.2",
"systeminformation": "^5.23.4"
},
"devDependencies": {
"@currents/playwright": "^1.3.1",
"@electron/notarize": "2.2.1",
"@electron/notarize": "2.4.0",
"@playwright/browser-chromium": "^1.45.3",
"@playwright/browser-firefox": "^1.45.3",
"@playwright/browser-webkit": "^1.45.3",
Expand All @@ -50,7 +50,7 @@
"@trezor/trezor-user-env-link": "workspace:*",
"@trezor/type-utils": "workspace:*",
"@types/electron-localshortcut": "^3.1.3",
"electron": "27.3.8",
"electron": "30.3.1",
"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-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc"
},
"dependencies": {
"@sentry/electron": "^4.17.0",
"@sentry/electron": "^4.24.0",
"@suite-common/formatters": "workspace:*",
"@suite-common/sentry": "workspace:*",
"@suite-common/suite-types": "workspace:*",
Expand Down
8 changes: 4 additions & 4 deletions packages/suite-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"dependencies": {
"blake-hash": "^2.0.0",
"electron-localshortcut": "^3.2.1",
"electron-store": "^8.1.0",
"electron-updater": "6.1.8",
"electron-store": "8.2.0",
"electron-updater": "6.3.3",
"usb": "^2.11.0"
},
"devDependencies": {
"@electron/notarize": "2.2.1",
"electron": "27.3.8",
"@electron/notarize": "2.4.0",
"electron": "30.3.1",
"electron-builder": "24.13.3",
"glob": "^10.3.10"
}
Expand Down
8 changes: 4 additions & 4 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# the last successful build of nixos-unstable as of 2023-10-30
# pinned to nixos-24.05 on commit https://github.com/NixOS/nixpkgs/commit/4a92571f9207810b559c9eac203d1f4d79830073
with import
(builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/08b9151ed40350725eb40b1fe96b0b86304a654b.tar.gz";
sha256 = "09k701xi2zlxdzvsa276b4vs8h4vjjshlaik25bfv1hkrwm30s56";
url = "https://github.com/NixOS/nixpkgs/archive/4a92571f9207810b559c9eac203d1f4d79830073.tar.gz";
sha256 = "0sp7qjbb7dvrh4zvd40i6y7jwsd1v1qj44f0c95q88g7fikda8gq";
})
{ };

let
# unstable packages
electron = electron_27; # use the same version as defined in packages/suite-desktop/package.json
electron = electron_30; # use the same version as defined in packages/suite-desktop/package.json
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