CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-31 05:29:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #238 from vector-im/dbkr/electron13

Browse Source 
Update to electron 13
This commit is contained in:
David Baker 2021-07-21 15:36:28 +01:00 committed by GitHub
commit a76d7796a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hak/matrix-seshat/build.js
View File

@ -258,6 +258,9 @@ async function buildSqlCipherUnix(hakEnv, moduleInfo) {
} }
async function buildMatrixSeshat(hakEnv, moduleInfo) { async function buildMatrixSeshat(hakEnv, moduleInfo) {
// seshat now uses n-api so we shouldn't need to specify a node version to
// build against, but it does seems to still need something in here, so leaving
// it for now: we should confirm how much of this it still actually needs.
const env = hakEnv.makeGypEnv(); const env = hakEnv.makeGypEnv();
if (!hakEnv.isLinux()) { if (!hakEnv.isLinux()) {

6
package.json
View File

@ -56,7 +56,7 @@
"@typescript-eslint/parser": "^4.17.0", "@typescript-eslint/parser": "^4.17.0",
"asar": "^2.0.1", "asar": "^2.0.1",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"electron": "12.0.11", "electron": "^13.1.7",
"electron-builder": "22.11.4", "electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4", "electron-builder-squirrel-windows": "22.11.4",
"electron-devtools-installer": "^3.1.1", "electron-devtools-installer": "^3.1.1",
@ -77,12 +77,12 @@
"typescript": "^4.1.3" "typescript": "^4.1.3"
}, },
"hakDependencies": { "hakDependencies": {
"matrix-seshat": "^2.2.3", "matrix-seshat": "^2.3.0",
"keytar": "^5.6.0" "keytar": "^5.6.0"
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"electronVersion": "12.0.14", "electronVersion": "13.1.6",
"files": [ "files": [
"package.json", "package.json",
{ {

8
yarn.lock
View File

@ -1844,10 +1844,10 @@ electron-window-state@^5.0.3:
jsonfile "^4.0.0" jsonfile "^4.0.0"
mkdirp "^0.5.1" mkdirp "^0.5.1"
electron@12.0.11: electron@^13:
version "12.0.11" version "13.1.7"
resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.11.tgz#555dc1cf663e320f2f2cbdf89319352b08fc59f2" resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.7.tgz#7e17f5c93a8d182a2a486884fed3dc34ab101be9"
integrity sha512-6gPjcce3QCeAWZ8UVAqVy6os+86D5BcxgkIzlROxX89u+du/i7WpZXF5F1vgv419rspds9OHejP3JrJnoUGh6w== integrity sha512-sVfpP/0s6a82FK32LMuEe9L+aWZw15u3uYn9xUJArPjy4OZHteE6yM5871YCNXNiDnoCLQ5eqQWipiVgHsf8nQ==
dependencies: dependencies:
"@electron/get" "^1.0.1" "@electron/get" "^1.0.1"
"@types/node" "^14.6.2" "@types/node" "^14.6.2"