v1.7.31

Upgrade to Electron 12.0.11

.eslintrc.js

@@ -1,6 +1,12 @@
 module.exports = {
+    plugins: [
+        "matrix-org",
+    ],
+    extends: [
+        "plugin:matrix-org/javascript",
+    ],
     parserOptions: {
-        ecmaVersion: 8,
+        ecmaVersion: 2021,
     },
     env: {
         es6: true,
@@ -8,12 +14,7 @@ module.exports = {
         // we also have some browser code (ie. the preload script)
         browser: true,
     },
-    extends: ["matrix-org"],
     rules: {
-        // js-sdk uses a babel rule which we can't use because we
-        // don't use babel, so remove it & put the original back
-        "babel/no-invalid-this": "off",
-        "no-invalid-this": "error",
         "quotes": "off",
         "indent": "off",
         "prefer-promise-reject-errors": "off",

CHANGELOG.md

@@ -1,3 +1,55 @@
+Changes in [1.7.31](https://github.com/vector-im/element-desktop/releases/tag/v1.7.31) (2021-06-21)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.31-rc.1...v1.7.31)
+
+ * No changes since rc.1
+
+Changes in [1.7.31-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.31-rc.1) (2021-06-15)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.30...v1.7.31-rc.1)
+
+ * Upgrade to Electron 12.0.11
+   [\#211](https://github.com/vector-im/element-desktop/pull/211)
+ * Translations update from Weblate
+   [\#214](https://github.com/vector-im/element-desktop/pull/214)
+ * Upgrade to Node 14
+   [\#212](https://github.com/vector-im/element-desktop/pull/212)
+ * Bump npm-registry-fetch from 4.0.2 to 4.0.7
+   [\#210](https://github.com/vector-im/element-desktop/pull/210)
+ * Update electron-builder for Node 16 compatibility
+   [\#204](https://github.com/vector-im/element-desktop/pull/204)
+ * Bump hosted-git-info from 2.8.5 to 2.8.9
+   [\#209](https://github.com/vector-im/element-desktop/pull/209)
+ * Bump glob-parent from 5.1.1 to 5.1.2
+   [\#206](https://github.com/vector-im/element-desktop/pull/206)
+ * Bump dot-prop from 4.2.0 to 4.2.1
+   [\#208](https://github.com/vector-im/element-desktop/pull/208)
+ * Bump y18n from 3.2.1 to 3.2.2
+   [\#207](https://github.com/vector-im/element-desktop/pull/207)
+ * Bump normalize-url from 4.5.0 to 4.5.1
+   [\#205](https://github.com/vector-im/element-desktop/pull/205)
+ * Put Preferences menu item in correct location on macOS
+   [\#200](https://github.com/vector-im/element-desktop/pull/200)
+ * Switch zoomIn accelerator to default
+   [\#202](https://github.com/vector-im/element-desktop/pull/202)
+
+Changes in [1.7.30](https://github.com/vector-im/element-desktop/releases/tag/v1.7.30) (2021-06-07)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.30-rc.1...v1.7.30)
+
+ * No changes since rc.1
+
+Changes in [1.7.30-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.30-rc.1) (2021-06-01)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.29...v1.7.30-rc.1)
+
+ * Translations update from Weblate
+   [\#199](https://github.com/vector-im/element-desktop/pull/199)
+ * Migrate to `eslint-plugin-matrix-org`
+   [\#197](https://github.com/vector-im/element-desktop/pull/197)
+ * Upgrade to Electron 12.0.9
+   [\#198](https://github.com/vector-im/element-desktop/pull/198)
+
 Changes in [1.7.29](https://github.com/vector-im/element-desktop/releases/tag/v1.7.29) (2021-05-24)
 ===================================================================================================
 [Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.29-rc.1...v1.7.29)

dockerbuild/Dockerfile

@@ -30,7 +30,7 @@ ENV LC_ALL C.UTF-8
 
 ENV DEBUG_COLORS true
 ENV FORCE_COLOR true
-ENV NODE_VERSION 12.16.1
+ENV NODE_VERSION 14.17.0
 
 # this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
 RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \

package.json

@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "src/electron-main.js",
-  "version": "1.7.29",
+  "version": "1.7.31",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
@@ -43,12 +43,13 @@
   },
   "devDependencies": {
     "asar": "^2.0.1",
-    "electron-builder": "22.10.5",
-    "electron-builder-squirrel-windows": "22.10.5",
+    "electron-builder": "22.11.4",
+    "electron-builder-squirrel-windows": "22.11.4",
     "electron-devtools-installer": "^3.1.1",
     "electron-notarize": "^1.0.0",
-    "eslint": "7.3.1",
-    "eslint-config-matrix-org": "^0.1.2",
+    "eslint": "7.18.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main",
     "find-npm-prefix": "^1.0.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
@@ -67,7 +68,7 @@
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "12.0.2",
+    "electronVersion": "12.0.11",
     "files": [
       "package.json",
       {

scripts/fetch-package.js

@@ -15,7 +15,7 @@ const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
 const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
 const ASAR_PATH = 'webapp.asar';
 
-const {setPackageVersion} = require('./set-version.js');
+const { setPackageVersion } = require('./set-version.js');
 
 async function getLatestDevelopUrl(bkToken) {
     const buildsResult = await needle('get',

scripts/hak/fetch.js

@@ -37,7 +37,7 @@ async function fetch(hakEnv, moduleInfo) {
     if (haveModuleBuildDir) return;
 
     await new Promise((resolve) => {
-        npm.load({'loglevel': 'silent'}, resolve);
+        npm.load({ 'loglevel': 'silent' }, resolve);
     });
 
     console.log("Fetching " + moduleInfo.name + " at version " + moduleInfo.version);

scripts/set-version.js

@@ -52,4 +52,4 @@ if (require.main === module) {
     main(process.argv.slice(2)).then((ret) => process.exit(ret));
 }
 
-module.exports = {versionFromAsar, setPackageVersion};
+module.exports = { versionFromAsar, setPackageVersion };

src/electron-main.js

@@ -24,7 +24,7 @@ const checkSquirrelHooks = require('./squirrelhooks');
 if (checkSquirrelHooks()) return;
 
 const argv = require('minimist')(process.argv, {
-    alias: {help: "h"},
+    alias: { help: "h" },
 });
 
 const {
@@ -37,7 +37,7 @@ const tray = require('./tray');
 const buildMenuTemplate = require('./vectormenu');
 const webContentsHandler = require('./webcontents-handler');
 const updater = require('./updater');
-const {getProfileFromDeeplink, protocolInit, recordSSOSession} = require('./protocol');
+const { getProfileFromDeeplink, protocolInit, recordSSOSession } = require('./protocol');
 
 const windowStateKeeper = require('electron-window-state');
 const Store = require('electron-store');
@@ -499,7 +499,6 @@ ipcMain.on('ipcCall', async function(ev, payload) {
     });
 });
 
-
 const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
 async function getOrCreatePassphrase(key) {
     if (keytar) {
@@ -551,8 +550,8 @@ ipcMain.on('seshat', async function(ev, payload) {
                 const passphrase = await getOrCreatePassphrase(passphraseKey);
 
                 try {
-                    await afs.mkdir(eventStorePath, {recursive: true});
-                    eventIndex = new Seshat(eventStorePath, {passphrase});
+                    await afs.mkdir(eventStorePath, { recursive: true });
+                    eventIndex = new Seshat(eventStorePath, { passphrase });
                 } catch (e) {
                     if (e instanceof ReindexError) {
                         // If this is a reindex error, the index schema
@@ -578,7 +577,7 @@ ipcMain.on('seshat', async function(ev, payload) {
                             await recoveryIndex.reindex();
                         }
 
-                        eventIndex = new Seshat(eventStorePath, {passphrase});
+                        eventIndex = new Seshat(eventStorePath, { passphrase });
                     } else {
                         sendError(payload.id, e);
                         return;
@@ -836,17 +835,17 @@ app.on('ready', async () => {
 
     protocol.registerFileProtocol('vector', (request, callback) => {
         if (request.method !== 'GET') {
-            callback({error: -322}); // METHOD_NOT_SUPPORTED from chromium/src/net/base/net_error_list.h
+            callback({ error: -322 }); // METHOD_NOT_SUPPORTED from chromium/src/net/base/net_error_list.h
             return null;
         }
 
         const parsedUrl = new URL(request.url);
         if (parsedUrl.protocol !== 'vector:') {
-            callback({error: -302}); // UNKNOWN_URL_SCHEME
+            callback({ error: -302 }); // UNKNOWN_URL_SCHEME
             return;
         }
         if (parsedUrl.host !== 'vector') {
-            callback({error: -105}); // NAME_NOT_RESOLVED
+            callback({ error: -105 }); // NAME_NOT_RESOLVED
             return;
         }
 
@@ -854,7 +853,7 @@ app.on('ready', async () => {
 
         // path starts with a '/'
         if (target[0] !== '') {
-            callback({error: -6}); // FILE_NOT_FOUND
+            callback({ error: -6 }); // FILE_NOT_FOUND
             return;
         }
 
@@ -866,7 +865,7 @@ app.on('ready', async () => {
         if (target[1] === 'webapp') {
             baseDir = asarPath;
         } else {
-            callback({error: -6}); // FILE_NOT_FOUND
+            callback({ error: -6 }); // FILE_NOT_FOUND
             return;
         }
 
@@ -876,7 +875,7 @@ app.on('ready', async () => {
 
         const relTarget = path.normalize(path.join(...target.slice(2)));
         if (relTarget.startsWith('..')) {
-            callback({error: -6}); // FILE_NOT_FOUND
+            callback({ error: -6 }); // FILE_NOT_FOUND
             return;
         }
         const absTarget = path.join(baseDir, relTarget);

src/i18n/strings/hr.json

@@ -0,0 +1,13 @@
+{
+    "Paste": "Zalijepiti",
+    "Copy": "Kopirati",
+    "Cut": "Izrezati",
+    "Redo": "Preurediti",
+    "Undo": "Poništi",
+    "Edit": "Uredi",
+    "Quit": "Prestati",
+    "Show/Hide": "Pokaži/sakrij",
+    "Are you sure you want to quit?": "Jesi li siguran da želiš odustati?",
+    "Close Element": "Zatvori Element",
+    "Cancel": "Otkazati"
+}

src/i18n/strings/pt_BR.json

@@ -26,8 +26,8 @@
     "Zoom Out": "Dar Zoom Out",
     "Zoom In": "Dar Zoom In",
     "Actual Size": "Tamanho de Verdade",
-    "View": "Ver",
-    "Select All": "Selecionar Tudo",
+    "View": "Visualizar",
+    "Select All": "Selecionar Todas",
     "Delete": "Deletar",
     "Paste and Match Style": "Colar e Adequar Estilo",
     "Paste": "Colar",
@@ -38,7 +38,9 @@
     "Edit": "Editar",
     "Quit": "Sair",
     "Show/Hide": "Mostrar/Esconder",
-    "Are you sure you want to quit?": "Você tem certeza que quer sair?",
+    "Are you sure you want to quit?": "Você tem certeza que você quer sair?",
     "Close Element": "Fechar Element",
-    "Cancel": "Cancelar"
+    "Cancel": "Cancelar",
+    "Bring All to Front": "Trazer Todas Para Frente",
+    "Hide Others": "Esconder Outras(os)"
 }

src/i18n/strings/ro.json

@@ -0,0 +1 @@
+{}

src/i18n/strings/sv.json

@@ -37,5 +37,10 @@
     "Unhide": "Göm inte",
     "Zoom Out": "Zooma ut",
     "Zoom In": "Zooma in",
-    "Close Element": "Stäng Element"
+    "Close Element": "Stäng Element",
+    "Show/Hide": "Visa/dölj",
+    "Add to dictionary": "Lägg till i ordlistan",
+    "The image failed to save": "Bilden sparades inte",
+    "Failed to save image": "Misslyckades med att spara bilden",
+    "Are you sure you want to quit?": "Är du säker att du vill avsluta?"
 }

src/i18n/strings/zh_Hans.json

@@ -0,0 +1,46 @@
+{
+    "Add to dictionary": "添加到字典",
+    "The image failed to save": "图片保存失败",
+    "Failed to save image": "图片保存失败",
+    "Save image as...": "保存图片为……",
+    "Copy link address": "复制链接地址",
+    "Copy email address": "复制邮箱地址",
+    "Copy image": "复制图片",
+    "File": "文件",
+    "Bring All to Front": "置前",
+    "Zoom": "放大",
+    "Stop Speaking": "停止讲话",
+    "Start Speaking": "开始讲话",
+    "Speech": "讲话",
+    "Unhide": "显示",
+    "Hide Others": "隐藏其他",
+    "Hide": "隐藏",
+    "Services": "服务",
+    "About": "关于",
+    "Element Help": "Element 帮助",
+    "Help": "帮助",
+    "Close": "关闭",
+    "Minimize": "最小化",
+    "Window": "窗口",
+    "Toggle Developer Tools": "切换开发工具",
+    "Toggle Full Screen": "切换全屏",
+    "Preferences": "外观",
+    "Zoom Out": "缩小",
+    "Zoom In": "放大",
+    "Actual Size": "实际大小",
+    "View": "查看",
+    "Select All": "选中全部",
+    "Delete": "删除",
+    "Paste and Match Style": "粘贴并匹配样式",
+    "Paste": "粘贴",
+    "Copy": "复制",
+    "Cut": "剪贴",
+    "Redo": "重做",
+    "Undo": "撤销",
+    "Edit": "编辑",
+    "Quit": "退出",
+    "Show/Hide": "显示/隐藏",
+    "Are you sure you want to quit?": "你确定要退出吗？",
+    "Close Element": "关闭 Element",
+    "Cancel": "取消"
+}

src/language-helper.js

@@ -48,7 +48,7 @@ function _t(text, variables = {}) {
     if (translated === undefined && count !== undefined) {
         // counterpart does not do fallback if no pluralisation exists
         // in the preferred language, so do it here
-        translated = counterpart.translate(text, Object.assign({}, args, {locale: DEFAULT_LOCALE}));
+        translated = counterpart.translate(text, Object.assign({}, args, { locale: DEFAULT_LOCALE }));
     }
 
     // The translation returns text so there's no XSS vector here (no unsafe HTML, no code execution)
@@ -56,10 +56,10 @@ function _t(text, variables = {}) {
 }
 
 class AppLocalization {
-    static STORE_KEY = "locale"
-    store = null
-
     constructor({ store, components = [] }) {
+        // TODO: Should be static field, but that doesn't parse without Babel
+        this.STORE_KEY = "locale";
+
         counterpart.registerTranslations("en", this.fetchTranslationJson("en_EN"));
         counterpart.setFallbackLocale('en');
         counterpart.setSeparator('|');
@@ -69,8 +69,8 @@ class AppLocalization {
         }
 
         this.store = store;
-        if (this.store.has(AppLocalization.STORE_KEY)) {
-            const locales = this.store.get(AppLocalization.STORE_KEY);
+        if (this.store.has(this.STORE_KEY)) {
+            const locales = this.store.get(this.STORE_KEY);
             this.setAppLocale(locales);
         }
 
@@ -106,7 +106,7 @@ class AppLocalization {
         });
 
         counterpart.setLocale(locales);
-        this.store.set(AppLocalization.STORE_KEY, locales);
+        this.store.set(this.STORE_KEY, locales);
 
         this.resetLocalizedUI();
     }
@@ -121,7 +121,6 @@ class AppLocalization {
     }
 }
 
-
 module.exports = {
     AppLocalization,
     _t,

src/protocol.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {app} = require("electron");
+const { app } = require("electron");
 const path = require("path");
 const fs = require("fs");
 

src/squirrelhooks.js

@@ -16,7 +16,7 @@ limitations under the License.
 
 const path = require('path');
 const spawn = require('child_process').spawn;
-const {app} = require('electron');
+const { app } = require('electron');
 const fsProm = require('fs').promises;
 
 function runUpdateExe(args) {

src/tray.js

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {app, Tray, Menu, nativeImage} = require('electron');
+const { app, Tray, Menu, nativeImage } = require('electron');
 const pngToIco = require('png-to-ico');
 const path = require('path');
 const fs = require('fs');

src/vectormenu.js

@@ -14,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const {app, shell, Menu} = require('electron');
+const { app, shell, Menu } = require('electron');
 const { _t } = require('./language-helper');
 
+const isMac = process.platform === 'darwin';
+
 function buildMenuTemplate() {
     // Menu template from http://electron.atom.io/docs/api/menu/, edited
     const template = [
@@ -70,7 +72,6 @@ function buildMenuTemplate() {
                 },
                 {
                     role: 'zoomin',
-                    accelerator: 'CommandOrControl+=',
                     label: _t('Zoom In'),
                 },
                 {
@@ -78,11 +79,11 @@ function buildMenuTemplate() {
                     label: _t('Zoom Out'),
                 },
                 { type: 'separator' },
-                {
+                // in macOS the Preferences menu item goes in the first menu
+                ...(!isMac ? [{
                     label: _t('Preferences'),
-                    accelerator: 'Command+,', // Mac-only accelerator
                     click() { global.mainWindow.webContents.send('preferences'); },
-                },
+                }] : []),
                 {
                     role: 'togglefullscreen',
                     label: _t('Toggle Full Screen'),
@@ -122,7 +123,7 @@ function buildMenuTemplate() {
     ];
 
     // macOS has specific menu conventions...
-    if (process.platform === 'darwin') {
+    if (isMac) {
         template.unshift({
             // first macOS menu is the name of the app
             role: 'appMenu',
@@ -130,7 +131,13 @@ function buildMenuTemplate() {
             submenu: [
                 {
                     role: 'about',
-                    label: _t('About'),
+                    label: _t('About') + ' ' + app.name,
+                },
+                { type: 'separator' },
+                {
+                    label: _t('Preferences') + '…',
+                    accelerator: 'Command+,', // Mac-only accelerator
+                    click() { global.mainWindow.webContents.send('preferences'); },
                 },
                 { type: 'separator' },
                 {

src/webcontents-handler.js

@@ -1,4 +1,4 @@
-const {clipboard, nativeImage, Menu, MenuItem, shell, dialog, ipcMain} = require('electron');
+const { clipboard, nativeImage, Menu, MenuItem, shell, dialog, ipcMain } = require('electron');
 const url = require('url');
 const fs = require('fs');
 const request = require('request');
@@ -50,7 +50,6 @@ function writeNativeImage(filePath, img) {
     }
 }
 
-
 function onLinkContextMenu(ev, params) {
     let url = params.linkURL || params.srcURL;
 
@@ -112,7 +111,7 @@ function onLinkContextMenu(ev, params) {
             accelerator: 'a',
             async click() {
                 const targetFileName = params.titleText || "image.png";
-                const {filePath} = await dialog.showSaveDialog({
+                const { filePath } = await dialog.showSaveDialog({
                     defaultPath: targetFileName,
                 });
 
@@ -215,7 +214,7 @@ function onEditableContextMenu(ev, params) {
     ev.preventDefault();
 }
 
-ipcMain.on('userDownloadOpen', function(ev, {path}) {
+ipcMain.on('userDownloadOpen', function(ev, { path }) {
     shell.openPath(path);
 });