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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"type-fest": "4.24.0",
"bcrypto": "5.4.0",
"react": "18.2.0",
"electron": "32.2.6",
"electron": "34.1.0",
"@types/node": "22.10.1",
"@types/react": "18.2.55",
"bn.js": "5.2.1",
Expand Down Expand Up @@ -123,7 +123,7 @@
"@types/tar": "^6.1.11",
"babel-jest": "29.7.0",
"depcheck": "^1.4.7",
"eslint": "^9.17.0",
"eslint": "^9.19.0",
"globals": "^15.11.0",
"husky": "^9.1.7",
"jest": "29.7.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/blockchain-link/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"html-webpack-plugin": "^5.6.0",
"tiny-worker": "^2.3.0",
"tsx": "^4.16.3",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.4",
"worker-loader": "^3.0.8"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"devDependencies": {
"@trezor/eslint": "workspace:*",
"electron": "32.2.6",
"electron-builder": "25.1.8"
"electron": "34.1.0",
"electron-builder": "26.0.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
"babel-loader": "^9.1.3",
"concurrently": "^8.2.2",
"copy-webpack-plugin": "^12.0.2",
"electron": "32.2.6",
"electron-builder": "25.1.8",
"electron": "34.1.0",
"electron-builder": "26.0.3",
"html-webpack-plugin": "^5.6.0",
"terser-webpack-plugin": "^5.3.11",
"wait-on": "^7.0.1",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.4",
"webpack-plugin-serve": "^1.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
},
"devDependencies": {
"@trezor/eslint": "workspace:*",
"electron": "32.2.6",
"electron-builder": "25.1.8"
"electron": "34.1.0",
"electron-builder": "26.0.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"@trezor/eslint": "workspace:^",
"copy-webpack-plugin": "^12.0.2",
"html-webpack-plugin": "^5.6.0",
"webpack": "^5.96.1"
"webpack": "^5.97.1"
}
}
2 changes: 1 addition & 1 deletion packages/connect-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"html-webpack-plugin": "^5.6.0",
"rimraf": "^6.0.1",
"tsx": "^4.16.3",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4"
}
}
2 changes: 1 addition & 1 deletion packages/connect-iframe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"html-webpack-plugin": "^5.6.0",
"rimraf": "^6.0.1",
"terser-webpack-plugin": "^5.3.11",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-merge": "^6.0.1",
"worker-loader": "^3.0.8"
Expand Down
2 changes: 1 addition & 1 deletion packages/connect-popup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"html-webpack-plugin": "^5.6.0",
"rimraf": "^6.0.1",
"terser-webpack-plugin": "^5.3.11",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.4",
"webpack-merge": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/connect-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"selfsigned": "^2.4.1",
"terser-webpack-plugin": "^5.3.11",
"tsx": "^4.16.3",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-merge": "^6.0.1",
"webpack-plugin-serve": "^1.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/connect-webextension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"copy-webpack-plugin": "^12.0.2",
"rimraf": "^6.0.1",
"terser-webpack-plugin": "^5.3.11",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-merge": "^6.0.1",
"webpack-plugin-serve": "^1.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/connect/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"ts-node": "^10.9.1",
"tsx": "^4.16.3",
"web3-utils": "^4.3.2",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"ws": "^8.18.0"
},
"peerDependencies": {
Expand Down
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 @@
},
"dependencies": {
"express": "^4.21.2",
"uuid": "^11.0.4",
"uuid": "^11.0.5",
"ws": "^8.18.0"
}
}
10 changes: 5 additions & 5 deletions packages/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"type-check": "yarn g:tsc --build"
},
"devDependencies": {
"@eslint/js": "^9.17.0",
"eslint": "^9.17.0",
"@eslint/js": "^9.19.0",
"eslint": "^9.19.0",
"eslint-plugin-chai-friendly": "^1.0.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest": "^28.10.0",
"eslint-plugin-jest": "^28.11.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-local-rules": "^3.0.2",
"eslint-plugin-react": "^7.37.3",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^5.1.0",
"typescript-eslint": "^8.19.1"
"typescript-eslint": "^8.23.0"
}
}
4 changes: 3 additions & 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,9 @@ const baseDirUI = getPathForProject('desktop-ui');
const baseDir = getPathForProject('desktop');

const config: webpack.Configuration = {
target: 'browserslist:Chrome >= 128', // Electron 32 is running on chromium 128
// Electron 34 runs on Chromium 132 https://www.electronjs.org/blog/electron-34-0#stack-changes
// but we are limited to 130 (supported by latest browserslist, as included by latest webpack)
target: 'browserslist:Chrome >= 130',
entry: [path.join(baseDirUI, 'src', 'index.tsx')],
output: {
path: path.join(baseDir, 'build'),
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"stream-browserify": "^3.0.0",
"style-loader": "^3.3.4",
"terser-webpack-plugin": "^5.3.11",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-merge": "^6.0.1",
"webpack-nano": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"simple-git": "^3.26.0",
"style-loader": "^3.3.4",
"tsx": "^4.16.3",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4"
},
"nx": {
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 @@ -18,6 +18,6 @@
"type-check": "yarn g:tsc --build tsconfig.json"
},
"dependencies": {
"electron": "32.2.6"
"electron": "34.1.0"
}
}
8 changes: 4 additions & 4 deletions packages/suite-desktop-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"electron-localshortcut": "^3.2.1",
"electron-store": "8.2.0",
"electron-updater": "6.3.9",
"openpgp": "^6.0.1",
"systeminformation": "^5.25.4",
"openpgp": "^6.1.0",
"systeminformation": "^5.25.11",
"ws": "^8.18.0"
},
"devDependencies": {
Expand All @@ -58,13 +58,13 @@
"@types/electron-localshortcut": "^3.1.3",
"@types/lodash": "^4",
"@types/ws": "^8.5.13",
"electron": "32.2.6",
"electron": "34.1.0",
"fs-extra": "^11.2.0",
"glob": "^10.3.10",
"jest-diff": "^29.7.0",
"lodash": "^4.17.21",
"terser-webpack-plugin": "^5.3.11",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"xvfb-maybe": "^0.2.1"
}
}
7 changes: 4 additions & 3 deletions packages/suite-desktop/electron-builder-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ module.exports = {
target: ['dmg', 'zip'],
},
win: {
publisherName: ['SatoshiLabs, s.r.o.', 'Trezor Company s.r.o.'],
extraResources: [
{
from: 'build/static/bin/bridge/win-${arch}',
Expand All @@ -133,8 +132,10 @@ module.exports = {
icon: 'build/static/images/desktop/512x512.png',
artifactName: 'Trezor-Suite-${version}-win-${arch}.${ext}',
target: ['nsis'],
signDlls: true,
sign: '../suite-desktop-core/scripts/sign-windows.ts',
signtoolOptions: {
publisherName: ['SatoshiLabs, s.r.o.', 'Trezor Company s.r.o.'],
sign: '../suite-desktop-core/scripts/sign-windows.ts',
},
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

settings moved to signtoolOptions in electron-userland/electron-builder#8582
signDlls setting was removed -> now it behaves as always true (see the diff)

},
linux: {
extraResources: [
Expand Down
6 changes: 3 additions & 3 deletions packages/suite-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"electron-localshortcut": "^3.2.1",
"electron-store": "8.2.0",
"electron-updater": "6.3.9",
"openpgp": "^6.0.1",
"openpgp": "^6.1.0",
"usb": "^2.14.0"
},
"devDependencies": {
"@electron/notarize": "2.5.0",
"electron": "32.2.6",
"electron-builder": "25.1.8",
"electron": "34.1.0",
"electron-builder": "26.0.3",
"glob": "^10.3.10"
}
}
2 changes: 1 addition & 1 deletion packages/suite-storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"@trezor/eslint": "workspace:*",
"@trezor/utils": "workspace:*",
"broadcast-channel": "^7.0.0",
"idb": "^8.0.1"
"idb": "^8.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/suite-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"stylelint": "^16.2.1",
"stylelint-config-standard": "^36.0.0",
"tsx": "^4.16.3",
"webpack": "^5.96.1",
"webpack": "^5.97.1",
"ws": "^8.18.0",
"yargs": "17.7.2"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/suite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"file-saver": "^2.0.5",
"framer-motion": "^11.0.3",
"history": "^4.10.1",
"idb": "^8.0.1",
"idb": "^8.0.2",
"immer": "9.0.21",
"jws": "^4.0.0",
"pako": "^2.1.0",
Expand All @@ -115,7 +115,7 @@
"redux-thunk": "^2.4.2",
"semver": "^7.6.3",
"styled-components": "^6.1.8",
"uuid": "^11.0.4",
"uuid": "^11.0.5",
"web3-utils": "^4.3.1",
"zxcvbn": "^4.4.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/transport-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"esbuild": "^0.23.1",
"html-webpack-plugin": "^5.6.0",
"pkg": "^5.8.1",
"webpack": "^5.96.1"
"webpack": "^5.97.1"
},
"dependencies": {
"@trezor/components": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion suite-common/trading/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@suite-common/wallet-types": "workspace:*",
"@trezor/env-utils": "workspace:*",
"@trezor/utils": "workspace:*",
"uuid": "^11.0.4"
"uuid": "^11.0.5"
},
"devDependencies": {
"@types/invity-api": "^1.1.2"
Expand Down
Loading