From bc730615ae4ee466dbf6c2c65c36f47a6e747aa5 Mon Sep 17 00:00:00 2001 From: squalou Date: Mon, 12 Apr 2021 13:47:15 +0200 Subject: [PATCH] update to electron 12 --- CHANGELOG.md | 13 +++++++++++++ README.md | 4 ++++ package-lock.json | 34 +++++++++++++++++----------------- package.json | 4 ++-- src/index.js | 2 +- src/window.js | 1 + 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cb155d..daf8952 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ An electron-base client for Google Hangouts Chat, since Google didn't see fit to ## CHANGELOG +### 5.12.10-1 + +Upgrade electron version to 12. + +With electron 12 : The default values of contextIsolation and worldSafeExecuteJavaScript are now true. #27949 #27502 +As a result in this app : contextIsolation is forced to `false` in order to have systray integration work as previously. + +### 5.11.10-2 and -3 + +Upgrade dependencies (vulnerability fix) + +Add "windows" packaging configuration : `npm run dist` produces a nice installer on windows platform now :-) + ### 5.11.10-1 Add a secondary "dark theme" accessible in "View" Menu. diff --git a/README.md b/README.md index d1c5278..70af200 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ See [Systray support](#systray-support) notes. See full [CHANGELOG](./CHANGELOG.md). +5.12.10-1: electron 12 + +- Windows support : `npm install && npm run dist` can now be run on Windows platform to build an installer. + 5.11.10-1: add experimental dark theme (activate on "View" menu) 5.11.9-1: electron 11 (*Apple M1* native support) diff --git a/package-lock.json b/package-lock.json index e0975a2..f10c7c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "google-chat-linux", - "version": "5.11.10-3", + "version": "5.12.10-1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "5.11.10-3", + "version": "5.12.10-1", "license": "WTFPL", "dependencies": { "electron-context-menu": "^2.0.0", @@ -14,7 +14,7 @@ "path": "0.12.7" }, "devDependencies": { - "electron": "=11.2.1", + "electron": "=12.0.2", "electron-builder": ">=22.6.0" } }, @@ -186,9 +186,9 @@ "optional": true }, "node_modules/@types/node": { - "version": "12.20.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.7.tgz", - "integrity": "sha512-gWL8VUkg8VRaCAUgG9WmhefMqHmMblxe2rVpMF86nZY/+ZysU+BkAp+3cz03AixWDSSz0ks5WX59yAhv/cDwFA==", + "version": "14.14.37", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz", + "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==", "dev": true }, "node_modules/@types/plist": { @@ -1356,14 +1356,14 @@ } }, "node_modules/electron": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-11.2.1.tgz", - "integrity": "sha512-Im1y29Bnil+Nzs+FCTq01J1OtLbs+2ZGLLllaqX/9n5GgpdtDmZhS/++JHBsYZ+4+0n7asO+JKQgJD+CqPClzg==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.2.tgz", + "integrity": "sha512-14luh9mGzfL4e0sncyy0+kW37IU7Y0Y1tvI97FDRSW0ZBQxi5cmAwSs5dmPmNBFBIGtzkaGaEB01j9RjZuCmow==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^1.0.1", - "@types/node": "^12.0.12", + "@types/node": "^14.6.2", "extract-zip": "^1.0.3" }, "bin": { @@ -3939,9 +3939,9 @@ "optional": true }, "@types/node": { - "version": "12.20.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.7.tgz", - "integrity": "sha512-gWL8VUkg8VRaCAUgG9WmhefMqHmMblxe2rVpMF86nZY/+ZysU+BkAp+3cz03AixWDSSz0ks5WX59yAhv/cDwFA==", + "version": "14.14.37", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz", + "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==", "dev": true }, "@types/plist": { @@ -4836,13 +4836,13 @@ } }, "electron": { - "version": "11.2.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-11.2.1.tgz", - "integrity": "sha512-Im1y29Bnil+Nzs+FCTq01J1OtLbs+2ZGLLllaqX/9n5GgpdtDmZhS/++JHBsYZ+4+0n7asO+JKQgJD+CqPClzg==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-12.0.2.tgz", + "integrity": "sha512-14luh9mGzfL4e0sncyy0+kW37IU7Y0Y1tvI97FDRSW0ZBQxi5cmAwSs5dmPmNBFBIGtzkaGaEB01j9RjZuCmow==", "dev": true, "requires": { "@electron/get": "^1.0.1", - "@types/node": "^12.0.12", + "@types/node": "^14.6.2", "extract-zip": "^1.0.3" } }, diff --git a/package.json b/package.json index 50aed08..fcd5f56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "google-chat-linux", - "version": "5.11.10-3", + "version": "5.12.10-1", "description": "Google Hangouts Chat unofficial linux app", "main": "src/index.js", "scripts": { @@ -40,7 +40,7 @@ "path": "0.12.7" }, "devDependencies": { - "electron": "=11.2.1", + "electron": "=12.0.2", "electron-builder": ">=22.6.0" } } diff --git a/src/index.js b/src/index.js index 24590de..aae6e26 100644 --- a/src/index.js +++ b/src/index.js @@ -10,7 +10,7 @@ let mainWindow, systemTrayIcon, config, contextMenu; process.env.NODE_OPTIONS="--no-force-async-hooks-checks"; process.env.ELECTRON_DISABLE_SANDBOX=true; -process.title = 'Google Chat Linux (Unofficial)'; +process.title = 'Google Chat Linux'; console.log(process.title + ' - v' + applicationVersion); console.log('Node.js runtime version:', process.version); diff --git a/src/window.js b/src/window.js index 523fa1e..a68c7a5 100644 --- a/src/window.js +++ b/src/window.js @@ -190,6 +190,7 @@ const getBrowserWindowOptions = (config) => { "autoHideMenuBar": true, "webPreferences": { "nodeIntegration": config.enableNodeIntegration, + "contextIsolation": false, "sandbox": false, "spellcheck": true },