Skip to content

Commit

Permalink
chore(suite): update mission dependencies: electron
Browse files Browse the repository at this point in the history
  • Loading branch information
Lemonexe committed Sep 26, 2024
1 parent 34e4cca commit e25f9c2
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 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": "30.3.1",
"electron": "31.6.0",
"@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": "30.3.1",
"electron": "31.6.0",
"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": "30.3.1",
"electron": "31.6.0",
"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": "30.3.1",
"electron": "31.6.0",
"electron-builder": "25.0.5"
}
}
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": "30.3.1"
"electron": "31.6.0"
}
}
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": "30.3.1",
"electron": "31.6.0",
"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.4.0",
"electron": "30.3.1",
"electron": "31.6.0",
"electron-builder": "25.0.5",
"glob": "^10.3.10"
}
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ with import

let
# unstable packages
electron = electron_30; # use the same version as defined in packages/suite-desktop/package.json
electron = electron_31; # use the same version as defined in packages/suite-desktop/package.json

This comment has been minimized.

Copy link
@Ondra-Zik-SL

Ondra-Zik-SL Sep 26, 2024

The Nix shell is still pinned to version 24.05, which does not have electron_31. Because of this, the shell cannot be started.

This comment has been minimized.

Copy link
@Lemonexe

Lemonexe Sep 27, 2024

Author Contributor

Oh no, I did not realize that! 🙈
Guess I'll revert, until either 31 is in stable channel, or 32 (if the maintainers skipped 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 @@ -11776,7 +11776,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@trezor/suite-desktop-api@workspace:packages/suite-desktop-api"
dependencies:
electron: "npm:30.3.1"
electron: "npm:31.6.0"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -11813,7 +11813,7 @@ __metadata:
"@trezor/utils": "workspace:*"
"@types/electron-localshortcut": "npm:^3.1.3"
chalk: "npm:^4.1.2"
electron: "npm:30.3.1"
electron: "npm:31.6.0"
electron-localshortcut: "npm:^3.2.1"
electron-store: "npm:8.2.0"
electron-updater: "npm:6.3.4"
Expand Down Expand Up @@ -11863,7 +11863,7 @@ __metadata:
dependencies:
"@electron/notarize": "npm:2.4.0"
blake-hash: "npm:^2.0.0"
electron: "npm:30.3.1"
electron: "npm:31.6.0"
electron-builder: "npm:25.0.5"
electron-localshortcut: "npm:^3.2.1"
electron-store: "npm:8.2.0"
Expand Down Expand Up @@ -17954,7 +17954,7 @@ __metadata:
resolution: "connect-example-electron-main@workspace:packages/connect-examples/electron-main-process"
dependencies:
"@trezor/connect": "workspace:*"
electron: "npm:30.3.1"
electron: "npm:31.6.0"
electron-builder: "npm:25.0.5"
languageName: unknown
linkType: soft
Expand All @@ -17963,7 +17963,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:30.3.1"
electron: "npm:31.6.0"
electron-builder: "npm:25.0.5"
languageName: unknown
linkType: soft
Expand All @@ -17976,7 +17976,7 @@ __metadata:
babel-loader: "npm:^9.1.3"
concurrently: "npm:^8.2.2"
copy-webpack-plugin: "npm:^12.0.2"
electron: "npm:30.3.1"
electron: "npm:31.6.0"
electron-builder: "npm:25.0.5"
html-webpack-plugin: "npm:^5.6.0"
terser-webpack-plugin: "npm:^5.3.9"
Expand Down Expand Up @@ -20452,16 +20452,16 @@ __metadata:
languageName: node
linkType: hard

"electron@npm:30.3.1":
version: 30.3.1
resolution: "electron@npm:30.3.1"
"electron@npm:31.6.0":
version: 31.6.0
resolution: "electron@npm:31.6.0"
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/e39ffe9f29f687c064df00fece892ca9d3bb20d54ee5ebe17fc050d0af9ef335b2bf961878f00f91ab65d4948d8ef348a528578e25bcba5094636f80675ef675
checksum: 10/ef304dd279a6f01143de000d3be420bde8f6feb5b72387c2b22e64fd97e1d5b80a0e82e4f2dee660b36a8a682e4f9cbcd2e6d2f73f5e7ba4e84d8bfb03c1d8e2
languageName: node
linkType: hard

Expand Down

0 comments on commit e25f9c2

Please sign in to comment.