v1.8.0

Prepare changelog for v1.8.0
Merge pull request #253 from vector-im/dbkr/update_allchange
2026-01-03 21:18:12 -05:00 · 2021-08-16 15:29:14 +01:00 · 2021-08-16 15:29:13 +01:00 · 2021-08-16 13:30:58 +01:00 · 2021-08-16 13:30:13 +01:00 · 2021-08-16 13:18:14 +01:00
53 changed files with 3576 additions and 4061 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,6 +1,10 @@
 module.exports = {
+    plugins: ["matrix-org"],
+    extends: [
+        "plugin:matrix-org/javascript",
+    ],
    parserOptions: {
-        ecmaVersion: 8,
+        ecmaVersion: 2021,
    },
    env: {
        es6: true,
@@ -8,15 +12,24 @@ 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",
        "no-async-promise-executor": "off",
-    }
-}
+    },
+    overrides: [{
+        files: ["src/**/*.{ts,tsx}"],
+        extends: [
+            "plugin:matrix-org/typescript",
+        ],
+        rules: {
+            // Things we do that break the ideal style
+            "prefer-promise-reject-errors": "off",
+            "quotes": "off",
+
+            // We disable this while we're transitioning
+            "@typescript-eslint/no-explicit-any": "off",
+        },
+    }],
+};
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @vector-im/element-web
--- a/.github/workflows/preview_changelog.yaml
+++ b/.github/workflows/preview_changelog.yaml
@@ -0,0 +1,12 @@
+name: Preview Changelog
+on:
+  pull_request_target:
+    types: [ opened, edited, labeled ]
+jobs:
+    changelog:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Preview Changelog
+              uses: matrix-org/allchange@main
+              with:
+                  ghToken: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /dist
+/lib
 /webapp
 /webapp.asar
 /packages
@@ -10,3 +11,5 @@
 /.yarnrc
 /docker
 /.npmrc
+.vscode
+.vscode/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,313 @@
+Changes in [1.8.0](https://github.com/vector-im/element-desktop/releases/tag/v1.8.0) (2021-08-16)
+=================================================================================================
+
+## ✨ Features
+ * Show how long a call was on call tiles ([\#6570](https://github.com/matrix-org/matrix-react-sdk/pull/6570)). Fixes vector-im/element-web#18405. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Add regional indicators to emoji picker ([\#6490](https://github.com/matrix-org/matrix-react-sdk/pull/6490)). Fixes vector-im/element-web#14963. Contributed by [robintown](https://github.com/robintown).
+ * Make call control buttons accessible to screen reader users ([\#6181](https://github.com/matrix-org/matrix-react-sdk/pull/6181)). Fixes vector-im/element-web#18358. Contributed by [pvagner](https://github.com/pvagner).
+ * Skip sending a thumbnail if it is not a sufficient saving over the original ([\#6559](https://github.com/matrix-org/matrix-react-sdk/pull/6559)). Fixes vector-im/element-web#17906.
+ * Increase PiP snapping speed ([\#6539](https://github.com/matrix-org/matrix-react-sdk/pull/6539)). Fixes vector-im/element-web#18371. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve and move the incoming call toast ([\#6470](https://github.com/matrix-org/matrix-react-sdk/pull/6470)). Fixes vector-im/element-web#17912. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Allow all of the URL schemes that Firefox allows ([\#6457](https://github.com/matrix-org/matrix-react-sdk/pull/6457)). Contributed by [aaronraimist](https://github.com/aaronraimist).
+ * Improve bubble layout colors ([\#6452](https://github.com/matrix-org/matrix-react-sdk/pull/6452)). Fixes vector-im/element-web#18081. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Spaces let users switch between Home and All Rooms behaviours ([\#6497](https://github.com/matrix-org/matrix-react-sdk/pull/6497)). Fixes vector-im/element-web#18093.
+ * Support for MSC2285 (hidden read receipts) ([\#6390](https://github.com/matrix-org/matrix-react-sdk/pull/6390)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Group pinned message events with MELS ([\#6349](https://github.com/matrix-org/matrix-react-sdk/pull/6349)). Fixes vector-im/element-web#17938. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Make version copiable ([\#6227](https://github.com/matrix-org/matrix-react-sdk/pull/6227)). Fixes vector-im/element-web#17603 and vector-im/element-web#18329. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve voice messages uploading state ([\#6530](https://github.com/matrix-org/matrix-react-sdk/pull/6530)). Fixes vector-im/element-web#18226 and vector-im/element-web#18224.
+ * Add surround with feature ([\#5510](https://github.com/matrix-org/matrix-react-sdk/pull/5510)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve call event tile wording ([\#6545](https://github.com/matrix-org/matrix-react-sdk/pull/6545)). Fixes vector-im/element-web#18376. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Show an avatar/a turned off microphone icon for muted users ([\#6486](https://github.com/matrix-org/matrix-react-sdk/pull/6486)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Prompt user to leave rooms/subspaces in a space when leaving space ([\#6424](https://github.com/matrix-org/matrix-react-sdk/pull/6424)). Fixes vector-im/element-web#18071.
+ * Add customisation point to override widget variables ([\#6455](https://github.com/matrix-org/matrix-react-sdk/pull/6455)). Fixes vector-im/element-web#18035.
+ * Add support for screen sharing in 1:1 calls ([\#5992](https://github.com/matrix-org/matrix-react-sdk/pull/5992)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+
+## 🐛 Bug Fixes
+ * Dismiss electron download toast when clicking Open ([\#18267](https://github.com/vector-im/element-web/pull/18267)). Fixes vector-im/element-web#18266.
+ * [Release] Fix glare related regressions ([\#6622](https://github.com/matrix-org/matrix-react-sdk/pull/6622)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * [Release] Fix PiP of held calls ([\#6612](https://github.com/matrix-org/matrix-react-sdk/pull/6612)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * [Release] Fix toast colors ([\#6607](https://github.com/matrix-org/matrix-react-sdk/pull/6607)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix [object Object] in Widget Permissions ([\#6560](https://github.com/matrix-org/matrix-react-sdk/pull/6560)). Fixes vector-im/element-web#18384. Contributed by [Palid](https://github.com/Palid).
+ * Fix right margin for events on IRC layout ([\#6542](https://github.com/matrix-org/matrix-react-sdk/pull/6542)). Fixes vector-im/element-web#18354.
+ * Mirror only usermedia feeds ([\#6512](https://github.com/matrix-org/matrix-react-sdk/pull/6512)). Fixes vector-im/element-web#5633. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix LogoutDialog warning + TypeScript migration ([\#6533](https://github.com/matrix-org/matrix-react-sdk/pull/6533)).
+ * Fix the wrong font being used in the room topic field ([\#6527](https://github.com/matrix-org/matrix-react-sdk/pull/6527)). Fixes vector-im/element-web#18339. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix inconsistent styling for links on hover ([\#6513](https://github.com/matrix-org/matrix-react-sdk/pull/6513)). Contributed by [janogarcia](https://github.com/janogarcia).
+ * Fix incorrect height for encoded placeholder images ([\#6514](https://github.com/matrix-org/matrix-react-sdk/pull/6514)). Contributed by [Palid](https://github.com/Palid).
+ * Fix call events layout for message bubble ([\#6465](https://github.com/matrix-org/matrix-react-sdk/pull/6465)). Fixes vector-im/element-web#18144.
+ * Improve subspaces and some utilities around room/space creation ([\#6458](https://github.com/matrix-org/matrix-react-sdk/pull/6458)). Fixes vector-im/element-web#18090 vector-im/element-web#18091 and vector-im/element-web#17256.
+ * Restore pointer cursor for SenderProfile in message bubbles ([\#6501](https://github.com/matrix-org/matrix-react-sdk/pull/6501)). Fixes vector-im/element-web#18249.
+ * Fix issues with the Call View ([\#6472](https://github.com/matrix-org/matrix-react-sdk/pull/6472)). Fixes vector-im/element-web#18221. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Align event list summary read receipts when using message bubbles ([\#6500](https://github.com/matrix-org/matrix-react-sdk/pull/6500)). Fixes vector-im/element-web#18143.
+ * Better positioning for unbubbled events in timeline ([\#6477](https://github.com/matrix-org/matrix-react-sdk/pull/6477)). Fixes vector-im/element-web#18132.
+ * Realign reactions row with messages in modern layout ([\#6491](https://github.com/matrix-org/matrix-react-sdk/pull/6491)). Fixes vector-im/element-web#18118. Contributed by [robintown](https://github.com/robintown).
+ * Fix CreateRoomDialog exploding when making public room outside of a space ([\#6492](https://github.com/matrix-org/matrix-react-sdk/pull/6492)). Fixes vector-im/element-web#18275.
+ * Fix call crashing because `element` was undefined ([\#6488](https://github.com/matrix-org/matrix-react-sdk/pull/6488)). Fixes vector-im/element-web#18270. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Upscale thumbnails to the container size ([\#6589](https://github.com/matrix-org/matrix-react-sdk/pull/6589)). Fixes vector-im/element-web#18307.
+ * Fix create room dialog in spaces no longer adding to the space ([\#6587](https://github.com/matrix-org/matrix-react-sdk/pull/6587)). Fixes vector-im/element-web#18465.
+ * Don't show a modal on call reject/user hangup ([\#6580](https://github.com/matrix-org/matrix-react-sdk/pull/6580)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fade Call View Buttons after `componentDidMount` ([\#6581](https://github.com/matrix-org/matrix-react-sdk/pull/6581)). Fixes vector-im/element-web#18439. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix missing expand button on codeblocks ([\#6565](https://github.com/matrix-org/matrix-react-sdk/pull/6565)). Fixes vector-im/element-web#18388. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * allow customizing the bubble layout colors ([\#6568](https://github.com/matrix-org/matrix-react-sdk/pull/6568)). Fixes vector-im/element-web#18408. Contributed by [benneti](https://github.com/benneti).
+ * Don't flash "Missed call" when accepting a call ([\#6567](https://github.com/matrix-org/matrix-react-sdk/pull/6567)). Fixes vector-im/element-web#18404. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix clicking whitespaces on replies ([\#6571](https://github.com/matrix-org/matrix-react-sdk/pull/6571)). Fixes vector-im/element-web#18327. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix disabled state for voice messages + send button tooltip ([\#6562](https://github.com/matrix-org/matrix-react-sdk/pull/6562)). Fixes vector-im/element-web#18413.
+ * Fix voice feed being cut-off ([\#6550](https://github.com/matrix-org/matrix-react-sdk/pull/6550)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix sizing issues of the screen picker ([\#6498](https://github.com/matrix-org/matrix-react-sdk/pull/6498)). Fixes vector-im/element-web#18281. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Stop voice messages that are playing when starting a recording ([\#6563](https://github.com/matrix-org/matrix-react-sdk/pull/6563)). Fixes vector-im/element-web#18410.
+ * Properly set style attribute on shared usercontent iframe ([\#6561](https://github.com/matrix-org/matrix-react-sdk/pull/6561)). Fixes vector-im/element-web#18414.
+ * Null guard space inviter to prevent the app exploding ([\#6558](https://github.com/matrix-org/matrix-react-sdk/pull/6558)).
+ * Make the ringing sound mutable/disablable ([\#6534](https://github.com/matrix-org/matrix-react-sdk/pull/6534)). Fixes vector-im/element-web#15591. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix wrong cursor being used in PiP ([\#6551](https://github.com/matrix-org/matrix-react-sdk/pull/6551)). Fixes vector-im/element-web#18383. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Re-pin Jitsi if the widget already exists ([\#6226](https://github.com/matrix-org/matrix-react-sdk/pull/6226)). Fixes vector-im/element-web#17679. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix broken call notification regression ([\#6526](https://github.com/matrix-org/matrix-react-sdk/pull/6526)). Fixes vector-im/element-web#18335. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * createRoom, only send join rule event if we have a join rule to put in it ([\#6516](https://github.com/matrix-org/matrix-react-sdk/pull/6516)). Fixes vector-im/element-web#18301.
+ * Fix clicking pills inside replies ([\#6508](https://github.com/matrix-org/matrix-react-sdk/pull/6508)). Fixes vector-im/element-web#18283. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix grecaptcha regression ([\#6503](https://github.com/matrix-org/matrix-react-sdk/pull/6503)). Fixes vector-im/element-web#18284. Contributed by [Palid](https://github.com/Palid).
+
+Changes in [1.7.34](https://github.com/vector-im/element-desktop/releases/tag/v1.7.34) (2021-08-02)
+===================================================================================================
+
+## 🔒 SECURITY FIXES
+ * Sanitize untrusted variables from message previews before translation
+   Fixes vector-im/element-web#18314
+
+## ✨ Features
+ * Fix editing of `<sub>` & `<sup`> & `<u>`
+   [\#6469](https://github.com/matrix-org/matrix-react-sdk/pull/6469)
+   Fixes vector-im/element-web#18211
+ * Zoom images in lightbox to where the cursor points
+   [\#6418](https://github.com/matrix-org/matrix-react-sdk/pull/6418)
+   Fixes vector-im/element-web#17870
+ * Avoid hitting the settings store from TextForEvent
+   [\#6205](https://github.com/matrix-org/matrix-react-sdk/pull/6205)
+   Fixes vector-im/element-web#17650
+ * Initial MSC3083 + MSC3244 support
+   [\#6212](https://github.com/matrix-org/matrix-react-sdk/pull/6212)
+   Fixes vector-im/element-web#17686 and vector-im/element-web#17661
+ * Navigate to the first room with notifications when clicked on space notification dot
+   [\#5974](https://github.com/matrix-org/matrix-react-sdk/pull/5974)
+ * Add matrix: to the list of permitted URL schemes
+   [\#6388](https://github.com/matrix-org/matrix-react-sdk/pull/6388)
+ * Add "Copy Link" to room context menu
+   [\#6374](https://github.com/matrix-org/matrix-react-sdk/pull/6374)
+ * 💭 Message bubble layout
+   [\#6291](https://github.com/matrix-org/matrix-react-sdk/pull/6291)
+   Fixes vector-im/element-web#4635, vector-im/element-web#17773 vector-im/element-web#16220 and vector-im/element-web#7687
+ * Play only one audio file at a time
+   [\#6417](https://github.com/matrix-org/matrix-react-sdk/pull/6417)
+   Fixes vector-im/element-web#17439
+ * Move download button for media to the action bar
+   [\#6386](https://github.com/matrix-org/matrix-react-sdk/pull/6386)
+   Fixes vector-im/element-web#17943
+ * Improved display of one-to-one call history with summary boxes for each call
+   [\#6121](https://github.com/matrix-org/matrix-react-sdk/pull/6121)
+   Fixes vector-im/element-web#16409
+ * Notification settings UI refresh
+   [\#6352](https://github.com/matrix-org/matrix-react-sdk/pull/6352)
+   Fixes vector-im/element-web#17782
+ * Fix EventIndex double handling events and erroring
+   [\#6385](https://github.com/matrix-org/matrix-react-sdk/pull/6385)
+   Fixes vector-im/element-web#18008
+ * Improve reply rendering
+   [\#3553](https://github.com/matrix-org/matrix-react-sdk/pull/3553)
+   Fixes vector-im/riot-web#9217, vector-im/riot-web#7633, vector-im/riot-web#7530, vector-im/riot-web#7169, vector-im/riot-web#7151, vector-im/riot-web#6692 vector-im/riot-web#6579 and vector-im/element-web#17440
+
+## 🐛 Bug Fixes
+ * Fix browser history getting stuck looping back to the same room
+   [\#18053](https://github.com/vector-im/element-web/pull/18053)
+ * Fix space shortcuts on layouts with non-English keys in the places of numbers
+   [\#17780](https://github.com/vector-im/element-web/pull/17780)
+   Fixes vector-im/element-web#17776
+ * Fix CreateRoomDialog exploding when making public room outside of a space
+   [\#6493](https://github.com/matrix-org/matrix-react-sdk/pull/6493)
+ * Fix regression where registration would soft-crash on captcha
+   [\#6505](https://github.com/matrix-org/matrix-react-sdk/pull/6505)
+   Fixes vector-im/element-web#18284
+ * only send join rule event if we have a join rule to put in it
+   [\#6517](https://github.com/matrix-org/matrix-react-sdk/pull/6517)
+ * Improve the new download button's discoverability and interactions.
+   [\#6510](https://github.com/matrix-org/matrix-react-sdk/pull/6510)
+ * Fix voice recording UI looking broken while microphone permissions are being requested.
+   [\#6479](https://github.com/matrix-org/matrix-react-sdk/pull/6479)
+   Fixes vector-im/element-web#18223
+ * Match colors of room and user avatars in DMs
+   [\#6393](https://github.com/matrix-org/matrix-react-sdk/pull/6393)
+   Fixes vector-im/element-web#2449
+ * Fix onPaste handler to work with copying files from Finder
+   [\#5389](https://github.com/matrix-org/matrix-react-sdk/pull/5389)
+   Fixes vector-im/element-web#15536 and vector-im/element-web#16255
+ * Fix infinite pagination loop when offline
+   [\#6478](https://github.com/matrix-org/matrix-react-sdk/pull/6478)
+   Fixes vector-im/element-web#18242
+ * Fix blurhash rounded corners missing regression
+   [\#6467](https://github.com/matrix-org/matrix-react-sdk/pull/6467)
+   Fixes vector-im/element-web#18110
+ * Fix position of the space hierarchy spinner
+   [\#6462](https://github.com/matrix-org/matrix-react-sdk/pull/6462)
+   Fixes vector-im/element-web#18182
+ * Fix display of image messages that lack thumbnails
+   [\#6456](https://github.com/matrix-org/matrix-react-sdk/pull/6456)
+   Fixes vector-im/element-web#18175
+ * Fix crash with large audio files.
+   [\#6436](https://github.com/matrix-org/matrix-react-sdk/pull/6436)
+   Fixes vector-im/element-web#18149
+ * Make diff colors in codeblocks more pleasant
+   [\#6355](https://github.com/matrix-org/matrix-react-sdk/pull/6355)
+   Fixes vector-im/element-web#17939
+ * Show the correct audio file duration while loading the file.
+   [\#6435](https://github.com/matrix-org/matrix-react-sdk/pull/6435)
+   Fixes vector-im/element-web#18160
+ * Fix various timeline settings not applying immediately.
+   [\#6261](https://github.com/matrix-org/matrix-react-sdk/pull/6261)
+   Fixes vector-im/element-web#17748
+ * Fix issues with room list duplication
+   [\#6391](https://github.com/matrix-org/matrix-react-sdk/pull/6391)
+   Fixes vector-im/element-web#14508
+ * Fix grecaptcha throwing useless error sometimes
+   [\#6401](https://github.com/matrix-org/matrix-react-sdk/pull/6401)
+   Fixes vector-im/element-web#15142
+ * Update Emojibase and Twemoji and switch to IamCal (Slack-style) shortcodes
+   [\#6347](https://github.com/matrix-org/matrix-react-sdk/pull/6347)
+   Fixes vector-im/element-web#13857 and vector-im/element-web#13334
+ * Respect compound emojis in default avatar initial generation
+   [\#6397](https://github.com/matrix-org/matrix-react-sdk/pull/6397)
+   Fixes vector-im/element-web#18040
+ * Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
+   [\#6394](https://github.com/matrix-org/matrix-react-sdk/pull/6394)
+   Fixes vector-im/element-web#18031
+ * Standardise spelling and casing of homeserver, identity server, and integration manager 
+   [\#6365](https://github.com/matrix-org/matrix-react-sdk/pull/6365)
+ * Fix widgets not receiving decrypted events when they have permission.
+   [\#6371](https://github.com/matrix-org/matrix-react-sdk/pull/6371)
+   Fixes vector-im/element-web#17615
+ * Prevent client hangs when calculating blurhashes
+   [\#6366](https://github.com/matrix-org/matrix-react-sdk/pull/6366)
+   Fixes vector-im/element-web#17945
+ * Exclude state events from widgets reading room events
+   [\#6378](https://github.com/matrix-org/matrix-react-sdk/pull/6378)
+ * Cache feature_spaces\* flags to improve performance
+   [\#6381](https://github.com/matrix-org/matrix-react-sdk/pull/6381)
+
+Changes in [1.7.33](https://github.com/vector-im/element-desktop/releases/tag/v1.7.33) (2021-07-19)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.32...v1.7.33)
+
+ * Translations update from Weblate
+   [\#232](https://github.com/vector-im/element-desktop/pull/232)
+ * Add VS Code to gitignore
+   [\#231](https://github.com/vector-im/element-desktop/pull/231)
+ * Use the target-specific build dir for sqlcipher / openssl
+   [\#230](https://github.com/vector-im/element-desktop/pull/230)
+ * Fix not specifying a target
+   [\#229](https://github.com/vector-im/element-desktop/pull/229)
+ * Do not generate a lockfile when running in CI
+   [\#227](https://github.com/vector-im/element-desktop/pull/227)
+ * Use double quotes in readme
+   [\#228](https://github.com/vector-im/element-desktop/pull/228)
+ * Support universal builds
+   [\#226](https://github.com/vector-im/element-desktop/pull/226)
+ * Check target with rustc directly
+   [\#225](https://github.com/vector-im/element-desktop/pull/225)
+
+Changes in [1.7.32](https://github.com/vector-im/element-desktop/releases/tag/v1.7.32) (2021-07-05)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.31...v1.7.32)
+
+ * Fix the build: make the rootDir correct
+   [\#224](https://github.com/vector-im/element-desktop/pull/224)
+ * Fix i18n in Element Desktop
+   [\#223](https://github.com/vector-im/element-desktop/pull/223)
+ * Convert preload.js to Typescript so that it gets copied to `lib`
+   [\#222](https://github.com/vector-im/element-desktop/pull/222)
+ * Bundle the `lib` dir now, not `src`
+   [\#221](https://github.com/vector-im/element-desktop/pull/221)
+ * Initial Typescripting for Element Desktop
+   [\#219](https://github.com/vector-im/element-desktop/pull/219)
+ * Translations update from Weblate
+   [\#220](https://github.com/vector-im/element-desktop/pull/220)
+ * Fix Windows target arch in native build
+   [\#218](https://github.com/vector-im/element-desktop/pull/218)
+ * Add libera.chat to default room directory
+   [\#217](https://github.com/vector-im/element-desktop/pull/217)
+ * Add update and native build support for Apple silicon
+   [\#216](https://github.com/vector-im/element-desktop/pull/216)
+ * Add numpad accelerators for zooming
+   [\#203](https://github.com/vector-im/element-desktop/pull/203)
+ * Add warning dialog when custom config.json is invalid
+   [\#201](https://github.com/vector-im/element-desktop/pull/201)
+ * Don't show Quit warning on keyUp residual event
+   [\#215](https://github.com/vector-im/element-desktop/pull/215)
+ * Fix accelerator for save-image-as clashing with copy-link-address
+   [\#213](https://github.com/vector-im/element-desktop/pull/213)
+
+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)
+
+ * No changes since rc.1
+
+Changes in [1.7.29-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.29-rc.1) (2021-05-19)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.28...v1.7.29-rc.1)
+
+ * Translations update from Weblate
+   [\#196](https://github.com/vector-im/element-desktop/pull/196)
+ * Translations update from Weblate
+   [\#195](https://github.com/vector-im/element-desktop/pull/195)
+
 Changes in [1.7.28](https://github.com/vector-im/element-desktop/releases/tag/v1.7.28) (2021-05-17)
 ===================================================================================================
 [Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.28-rc.1...v1.7.28)
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ so the first step is to get a working copy of Element Web. There are a few ways
 # Fetch the prebuilt release Element package from the element-web GitHub releases page. The version
 # fetched will be the same as the local element-desktop package.
 # We're explicitly asking for no config, so the packaged Element will have no config.json.
-yarn run fetch --noverify --cfgdir ''
+yarn run fetch --noverify --cfgdir ""
 ```

 ...or if you'd like to use GPG to verify the downloaded package:
@@ -30,14 +30,14 @@ yarn run fetch --noverify --cfgdir ''
 # once.
 yarn run fetch --importkey
 # Fetch the package and verify the signature
-yarn run fetch --cfgdir ''
+yarn run fetch --cfgdir ""
 ```

 ...or either of the above, but fetching a specific version of Element:
 ```
 # Fetch the prebuilt release Element package from the element-web GitHub releases page. The version
 # fetched will be the same as the local element-desktop package.
-yarn run fetch --noverify --cfgdir '' v1.5.6
+yarn run fetch --noverify --cfgdir "" v1.5.6
 ```

 If you only want to run the app locally and don't need to build packages, you can
@@ -58,15 +58,19 @@ run Element locally, skip to the next section.
 If you'd like to build the native modules (for searching in encrypted rooms and
 secure storage), do this first. This will take 10 minutes or so, and will
 require a number of native tools to be installed, depending on your OS (eg.
-rust, tcl, make/nmake). If you don't need these features, you can skip this
-step.
+rust, tcl, make/nmake).
+
+You'll also to need to make sure you've built the native modules for the same
+architecture as your package, so for anything more advanced than just building
+the modules and app for the host architecture see 'Other Architectures'.
+
+If you don't need these features, you can skip this step.
+
+To just build these for your native architecture:
 ```
 yarn run build:native
 ```

-On Windows, this will automatically determine the architecture to build for based
-on the environment. Make sure that you have all the [tools required to perform the native modules build](docs/windows-requirements.md)
-
 Now you can build the package:

 ```
@@ -78,15 +82,6 @@ This will do a couple of things:
 * Run electron-builder to build a package. The package built will match the operating system
   you're running the build process on.

-If you're on Windows, you can choose to build specifically for 32 or 64 bit:
-```
-yarn run build32
-```
-or
-```
-yarn run build64
-```
-
 This build step will not build any native modules.

 You can also build using docker, which will always produce the linux package:
@@ -112,6 +107,70 @@ yarn add electron
 yarn start
 ```

+Other Architectures
+===================
+Building the native modules will build for the host architecture (and only the
+host architecture) by default. On Windows, this will automatically determine
+the architecture to build for based on the environment. Make sure that you have
+all the [tools required to perform the native modules build](docs/windows-requirements.md)
+
+
+On macOS, you can build universal native modules too:
+```
+yarn run build:native:universal
+```
+
+...or you can build for a specific architecture:
+```
+yarn run build:native --target x86_64-apple-darwin
+```
+or
+```
+yarn run build:native --target aarch64-apple-darwin
+```
+
+You'll then need to create a built bundle with the same architecture.
+To bundle a universal build for macOS, run:
+
+```
+yarn run build:universal
+```
+
+If you're on Windows, you can choose to build specifically for 32 or 64 bit:
+```
+yarn run build:32
+```
+or
+```
+yarn run build:64
+```
+
+Note that the native module build system keeps the different architectures
+separate, so you can keep native modules for several architectures at the same
+time and switch which are active using a `yarn run hak copy` command, passing
+the appropriate architectures. This will error if you haven't yet built those
+architectures. eg:
+
+```
+yarn run build:native --target x86_64-apple-darwin
+# We've now built & linked into place native modules for Intel
+yarn run build:native --target aarch64-apple-darwin
+# We've now built Apple Silicon modules too, and linked them into place as the active ones
+
+yarn run hak copy --target x86_64-apple-darwin
+# We've now switched back to our Intel modules
+yarn run hak copy --target x86_64-apple-darwin --target aarch64-apple-darwin
+# Now our native modules are universal x86_64+aarch64 binaries
+```
+
+The current set of native modules are stored in `.hak/hakModules`,
+so you can use this to check what architecture is currently in place, eg:
+
+```
+$ lipo -info .hak/hakModules/keytar/build/Release/keytar.node 
+Architectures in the fat file: .hak/hakModules/keytar/build/Release/keytar.node are: x86_64 arm64 
+```
+
 Config
 ======
 If you'd like the packaged Element to have a configuration file, you can create a
--- a/dockerbuild/Dockerfile
+++ b/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 && \
--- a/element.io/nightly/config.json
+++ b/element.io/nightly/config.json
@@ -1,5 +1,5 @@
 {
-    "update_base_url": "https://packages.riot.im/nightly/update/",
+    "update_base_url": "https://packages.element.io/nightly/update/",
    "default_server_name": "matrix.org",
    "brand": "Element Nightly",
    "integrations_ui_url": "https://scalar.vector.im/",
@@ -22,7 +22,8 @@
    "roomDirectory": {
        "servers": [
            "matrix.org",
-            "gitter.im"
+            "gitter.im",
+            "libera.chat"
        ]
    },
    "enable_presence_by_hs_url": {
--- a/element.io/release/config.json
+++ b/element.io/release/config.json
@@ -16,7 +16,8 @@
    "roomDirectory": {
        "servers": [
            "matrix.org",
-            "gitter.im"
+            "gitter.im",
+            "libera.chat"
        ]
    },
    "showLabsSettings": false,
--- a/hak/matrix-seshat/build.js
+++ b/hak/matrix-seshat/build.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -32,9 +32,9 @@ module.exports = async function(hakEnv, moduleInfo) {

 async function buildOpenSslWin(hakEnv, moduleInfo) {
    const version = moduleInfo.cfg.dependencies.openssl;
-    const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`);
+    const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);

-    const openSslArch = hakEnv.arch === 'x64' ? 'VC-WIN64A' : 'VC-WIN32';
+    const openSslArch = hakEnv.getTargetArch() === 'x64' ? 'VC-WIN64A' : 'VC-WIN32';

    console.log("Building openssl in " + openSslDir);
    await new Promise((resolve, reject) => {
@@ -134,7 +134,7 @@ async function buildOpenSslWin(hakEnv, moduleInfo) {

 async function buildSqlCipherWin(hakEnv, moduleInfo) {
    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
+    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
    const buildDir = path.join(sqlCipherDir, 'bld');

    await mkdirp(buildDir);
@@ -171,7 +171,7 @@ async function buildSqlCipherWin(hakEnv, moduleInfo) {

 async function buildSqlCipherUnix(hakEnv, moduleInfo) {
    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
+    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);

    const args = [
        '--prefix=' + moduleInfo.depPrefix + '',
@@ -182,9 +182,36 @@ async function buildSqlCipherUnix(hakEnv, moduleInfo) {
    if (hakEnv.isMac()) {
        args.push('--with-crypto-lib=commoncrypto');
    }
-    args.push('CFLAGS=-DSQLITE_HAS_CODEC');
+
+    if (!hakEnv.isHost()) {
+        // In the nonsense world of `configure`, it is assumed you are building
+        // a compiler like `gcc`, so the `host` option actually means the target
+        // the build output runs on.
+        args.push(`--host=${hakEnv.getTargetId()}`);
+    }
+
+    const cflags = [
+        '-DSQLITE_HAS_CODEC',
+    ];
+
+    if (!hakEnv.isHost()) {
+        // `clang` uses more logical option naming.
+        cflags.push(`--target=${hakEnv.getTargetId()}`);
+    }
+
+    if (cflags.length) {
+        args.push(`CFLAGS=${cflags.join(' ')}`);
+    }
+
+    const ldflags = [];
+
    if (hakEnv.isMac()) {
-        args.push('LDFLAGS=-framework Security -framework Foundation');
+        ldflags.push('-framework Security');
+        ldflags.push('-framework Foundation');
+    }
+
+    if (ldflags.length) {
+        args.push(`LDFLAGS=${ldflags.join(' ')}`);
    }

    await new Promise((resolve, reject) => {
@@ -231,6 +258,9 @@ async function buildSqlCipherUnix(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();

    if (!hakEnv.isLinux()) {
@@ -248,7 +278,11 @@ async function buildMatrixSeshat(hakEnv, moduleInfo) {
        // the build scripts since they run on the host, but vcvarsall.bat sets the c
        // compiler in the path to be the one for the target, so we just use the matching
        // toolchain for the target architecture which makes everything happy.
-        env.RUSTUP_TOOLCHAIN = hakEnv.arch == 'x64' ? 'stable-x86_64-pc-windows-msvc' : 'stable-i686-pc-windows-msvc';
+        env.RUSTUP_TOOLCHAIN = `stable-${hakEnv.getTargetId()}`;
+    }
+
+    if (!hakEnv.isHost()) {
+        env.CARGO_BUILD_TARGET = hakEnv.getTargetId();
    }

    console.log("Running neon with env", env);
--- a/hak/matrix-seshat/check.js
+++ b/hak/matrix-seshat/check.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@ limitations under the License.
 */

 const childProcess = require('child_process');
+const fsProm = require('fs').promises;

 module.exports = async function(hakEnv, moduleInfo) {
    // of course tcl doesn't have a --version
@@ -34,7 +35,10 @@ module.exports = async function(hakEnv, moduleInfo) {
        });
    }

-    const tools = [['python', '--version']]; // node-gyp uses python for reasons beyond comprehension
+    const tools = [
+        ['rustc', '--version'],
+        ['python', '--version'], // node-gyp uses python for reasons beyond comprehension
+    ];
    if (hakEnv.isWin()) {
        tools.push(['perl', '--version']); // for openssl configure
        tools.push(['patch', '--version']); // to patch sqlcipher Makefile.msc
@@ -57,4 +61,22 @@ module.exports = async function(hakEnv, moduleInfo) {
            });
        });
    }
+
+    // Ensure Rust target exists (nb. we avoid depending on rustup)
+    await new Promise((resolve, reject) => {
+        const rustc = childProcess.execFile('rustc', [
+            '--target', hakEnv.getTargetId(), '-o', 'tmp', '-',
+        ], (err, out) => {
+            if (err) {
+                reject(
+                    "rustc can't build for target " + hakEnv.getTargetId() +
+                    ": ensure target is installed via `rustup target add " + hakEnv.getTargetId() + "` " +
+                    "or your package manager if not using `rustup`",
+                );
+            }
+            fsProm.unlink('tmp').then(resolve);
+        });
+        rustc.stdin.write('fn main() {}');
+        rustc.stdin.end();
+    });
 };
--- a/hak/matrix-seshat/fetchDeps.js
+++ b/hak/matrix-seshat/fetchDeps.js
@@ -34,7 +34,7 @@ module.exports = async function(hakEnv, moduleInfo) {

 async function getSqlCipher(hakEnv, moduleInfo) {
    const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
+    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);

    let haveSqlcipher;
    try {
@@ -62,9 +62,10 @@ async function getSqlCipher(hakEnv, moduleInfo) {
        await bob;
    }

+    // Extract the tarball to per-target directories, then we avoid cross-contaiminating archs
    await tar.x({
        file: sqlCipherTarball,
-        cwd: moduleInfo.moduleDotHakDir,
+        cwd: moduleInfo.moduleTargetDotHakDir,
    });

    if (hakEnv.isWin()) {
@@ -94,7 +95,7 @@ async function getSqlCipher(hakEnv, moduleInfo) {

 async function getOpenSsl(hakEnv, moduleInfo) {
    const version = moduleInfo.cfg.dependencies.openssl;
-    const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`);
+    const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);

    let haveOpenSsl;
    try {
@@ -121,9 +122,9 @@ async function getOpenSsl(hakEnv, moduleInfo) {
        });
    }

-    console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleDotHakDir);
+    console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleTargetDotHakDir);
    await tar.x({
        file: openSslTarball,
-        cwd: moduleInfo.moduleDotHakDir,
+        cwd: moduleInfo.moduleTargetDotHakDir,
    });
 }
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
  "name": "element-desktop",
  "productName": "Element",
-  "main": "src/electron-main.js",
-  "version": "1.7.28",
+  "main": "lib/electron-main.js",
+  "version": "1.8.0",
  "description": "A feature-rich client for Matrix.org",
  "author": "Element",
  "repository": {
@@ -18,18 +18,25 @@
    "mkdirs": "mkdirp packages deploys",
    "fetch": "yarn run mkdirs && node scripts/fetch-package.js",
    "asar-webapp": "asar p webapp webapp.asar",
-    "start": "electron .",
-    "lint": "eslint src/ scripts/ hak/",
+    "start": "yarn run build:ts && yarn run build:res && electron .",
+    "lint": "yarn lint:types && yarn lint:js",
+    "lint:js": "eslint --max-warnings 0 src scripts hak",
+    "lint:js-fix": "eslint --fix src scripts hak",
+    "lint:types": "tsc --noEmit",
    "build:native": "yarn run hak",
-    "build32": "electron-builder --ia32",
-    "build64": "electron-builder --x64",
-    "build": "electron-builder",
+    "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
+    "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
+    "build:64": "yarn run build:ts && yarn run build:res && electron-builder --x64",
+    "build:universal": "yarn run build:ts && yarn run build:res && electron-builder --universal",
+    "build": "yarn run build:ts && yarn run build:res && electron-builder",
+    "build:ts": "tsc",
+    "build:res": "node scripts/copy-res.js",
    "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
    "docker:build:native": "scripts/in-docker.sh yarn run hak",
    "docker:build": "scripts/in-docker.sh yarn run build",
    "docker:install": "scripts/in-docker.sh yarn install",
    "debrepo": "scripts/mkrepo.sh",
-    "clean": "rimraf webapp.asar dist packages deploys",
+    "clean": "rimraf webapp.asar dist packages deploys lib",
    "hak": "node scripts/hak/index.js"
  },
  "dependencies": {
@@ -42,13 +49,22 @@
    "request": "^2.88.2"
  },
  "devDependencies": {
+    "@types/auto-launch": "^5.0.1",
+    "@types/counterpart": "^0.18.1",
+    "@types/minimist": "^1.2.1",
+    "@typescript-eslint/eslint-plugin": "^4.17.0",
+    "@typescript-eslint/parser": "^4.17.0",
+    "allchange": "^1.0.0",
    "asar": "^2.0.1",
-    "electron-builder": "22.10.5",
-    "electron-builder-squirrel-windows": "22.10.5",
+    "chokidar": "^3.5.2",
+    "electron": "^13.1.7",
+    "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#2306b3d4da4eba908b256014b979f1d3d43d2945",
    "find-npm-prefix": "^1.0.2",
    "fs-extra": "^8.1.0",
    "glob": "^7.1.6",
@@ -56,25 +72,25 @@
    "mkdirp": "^1.0.3",
    "needle": "^2.5.0",
    "node-pre-gyp": "^0.15.0",
-    "npm": "^6.14.11",
+    "pacote": "^11.3.5",
    "rimraf": "^3.0.2",
-    "semver": "^7.3.4",
-    "tar": "^6.1.0"
+    "tar": "^6.1.2",
+    "typescript": "^4.1.3"
  },
  "hakDependencies": {
-    "matrix-seshat": "^2.2.3",
+    "matrix-seshat": "^2.3.0",
    "keytar": "^5.6.0"
  },
  "build": {
    "appId": "im.riot.app",
-    "electronVersion": "12.0.2",
+    "electronVersion": "13.1.6",
    "files": [
      "package.json",
      {
        "from": ".hak/hakModules",
        "to": "node_modules"
      },
-      "src/**"
+      "lib/**"
    ],
    "extraResources": [
      {
--- a/release_config.yaml
+++ b/release_config.yaml
@@ -1 +1,7 @@
 signing_id: releases@riot.im
+subprojects:
+    element-web:
+        includeByDefault: true
+        # Because element-web is not in our dependencies, but the versions
+        # follow those of this project (well, vice-versa really)
+        mirrorVersion: true
--- a/scripts/ci/install-deps.sh
+++ b/scripts/ci/install-deps.sh
@@ -2,4 +2,4 @@

 set -ex

-yarn install $@
+yarn install --pure-lockfile $@
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -0,0 +1,121 @@
+#!/usr/bin/env node
+
+// copies resources into the lib directory.
+
+const parseArgs = require('minimist');
+const chokidar = require('chokidar');
+const path = require('path');
+const fs = require('fs');
+
+const argv = parseArgs(process.argv.slice(2), {});
+
+const watch = argv.w;
+const verbose = argv.v;
+
+function errCheck(err) {
+    if (err) {
+        console.error(err.message);
+        process.exit(1);
+    }
+}
+
+const I18N_BASE_PATH = "src/i18n/strings/";
+const INCLUDE_LANGS = fs.readdirSync(I18N_BASE_PATH).filter(fn => fn.endsWith(".json"));
+
+// Ensure lib, lib/i18n and lib/i18n/strings all exist
+fs.mkdirSync('lib/i18n/strings', { recursive: true });
+
+function genLangFile(file, dest) {
+    let translations = {};
+    [file].forEach(function(f) {
+        if (fs.existsSync(f)) {
+            try {
+                Object.assign(
+                    translations,
+                    JSON.parse(fs.readFileSync(f).toString()),
+                );
+            } catch (e) {
+                console.error("Failed: " + f, e);
+                throw e;
+            }
+        }
+    });
+
+    translations = weblateToCounterpart(translations);
+
+    const json = JSON.stringify(translations, null, 4);
+    const filename = path.basename(file);
+
+    fs.writeFileSync(dest + filename, json);
+    if (verbose) {
+        console.log("Generated language file: " + filename);
+    }
+}
+
+/*
+ * Convert translation key from weblate format
+ * (which only supports a single level) to counterpart
+ * which requires object values for 'count' translations.
+ *
+ * eg.
+ *     "there are %(count)s badgers|one": "a badger",
+ *     "there are %(count)s badgers|other": "%(count)s badgers"
+ *   becomes
+ *     "there are %(count)s badgers": {
+ *         "one": "a badger",
+ *         "other": "%(count)s badgers"
+ *     }
+ */
+function weblateToCounterpart(inTrs) {
+    const outTrs = {};
+
+    for (const key of Object.keys(inTrs)) {
+        const keyParts = key.split('|', 2);
+        if (keyParts.length === 2) {
+            let obj = outTrs[keyParts[0]];
+            if (obj === undefined) {
+                obj = {};
+                outTrs[keyParts[0]] = obj;
+            }
+            obj[keyParts[1]] = inTrs[key];
+        } else {
+            outTrs[key] = inTrs[key];
+        }
+    }
+
+    return outTrs;
+}
+
+/*
+ watch the input files for a given language,
+ regenerate the file, and regenerating languages.json with the new filename
+ */
+function watchLanguage(file, dest) {
+    // XXX: Use a debounce because for some reason if we read the language
+    // file immediately after the FS event is received, the file contents
+    // appears empty. Possibly https://github.com/nodejs/node/issues/6112
+    let makeLangDebouncer;
+    const makeLang = () => {
+        if (makeLangDebouncer) {
+            clearTimeout(makeLangDebouncer);
+        }
+        makeLangDebouncer = setTimeout(() => {
+            genLangFile(file, dest);
+        }, 500);
+    };
+
+    chokidar.watch(file)
+        .on('add', makeLang)
+        .on('change', makeLang)
+        .on('error', errCheck);
+}
+
+// language resources
+const I18N_DEST = "lib/i18n/strings/";
+INCLUDE_LANGS.forEach((file) => {
+    genLangFile(I18N_BASE_PATH + file, I18N_DEST);
+}, {});
+
+if (watch) {
+    INCLUDE_LANGS.forEach(file => watchLanguage(I18N_BASE_PATH + file, I18N_DEST));
+}
--- a/scripts/fetch-package.js
+++ b/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',
--- a/scripts/hak/copy.js
+++ b/scripts/hak/copy.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@ limitations under the License.

 const path = require('path');
 const fsProm = require('fs').promises;
+const childProcess = require('child_process');

 const rimraf = require('rimraf');
 const glob = require('glob');
@@ -40,10 +41,9 @@ async function copy(hakEnv, moduleInfo) {
    }

    if (moduleInfo.cfg.copy) {
-        console.log(
-            "Copying " + moduleInfo.cfg.prune + " from " +
-            moduleInfo.moduleOutDir + " to " + moduleInfo.moduleOutDir,
-        );
+        // If there are multiple moduleBuildDirs, singular moduleBuildDir
+        // is the same as moduleBuildDirs[0], so we're just listing the contents
+        // of the first one.
        const files = await new Promise(async (resolve, reject) => {
            glob(moduleInfo.cfg.copy, {
                nosort: true,
@@ -53,13 +53,46 @@ async function copy(hakEnv, moduleInfo) {
                err ? reject(err) : resolve(files);
            });
        });
-        for (const f of files) {
-            console.log("\t" + f);
-            const src = path.join(moduleInfo.moduleBuildDir, f);
-            const dst = path.join(moduleInfo.moduleOutDir, f);

-            await mkdirp(path.dirname(dst));
-            await fsProm.copyFile(src, dst);
+        if (moduleInfo.moduleBuildDirs.length > 1) {
+            if (!hakEnv.isMac()) {
+                console.error(
+                    "You asked me to copy multiple targets but I've only been taught " +
+                    "how to do that on macOS.",
+                );
+                throw new Error("Can't copy multiple targets on this platform");
+            }
+
+            for (const f of files) {
+                const components = moduleInfo.moduleBuildDirs.map(dir => path.join(dir, f));
+                const dst = path.join(moduleInfo.moduleOutDir, f);
+
+                await mkdirp(path.dirname(dst));
+                await new Promise((resolve, reject) => {
+                    childProcess.execFile('lipo',
+                        ['-create', '-output', dst, ...components], (err) => {
+                            if (err) {
+                                reject(err);
+                            } else {
+                                resolve();
+                            }
+                        },
+                    );
+                });
+            }
+        } else {
+            console.log(
+                "Copying files from " +
+                moduleInfo.moduleBuildDir + " to " + moduleInfo.moduleOutDir,
+            );
+            for (const f of files) {
+                console.log("\t" + f);
+                const src = path.join(moduleInfo.moduleBuildDir, f);
+                const dst = path.join(moduleInfo.moduleOutDir, f);
+
+                await mkdirp(path.dirname(dst));
+                await fsProm.copyFile(src, dst);
+            }
        }
    }
 }
--- a/scripts/hak/fetch.js
+++ b/scripts/hak/fetch.js
@@ -14,16 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const path = require('path');
-const url = require('url');
 const fsProm = require('fs').promises;
 const childProcess = require('child_process');

-const npm = require('npm');
-const semver = require('semver');
-const needle = require('needle');
-const mkdirp = require('mkdirp');
-const tar = require('tar');
+const pacote = require('pacote');

 async function fetch(hakEnv, moduleInfo) {
    let haveModuleBuildDir;
@@ -36,57 +30,11 @@ async function fetch(hakEnv, moduleInfo) {

    if (haveModuleBuildDir) return;

-    await new Promise((resolve) => {
-        npm.load({'loglevel': 'silent'}, resolve);
-    });
+    console.log("Fetching " + moduleInfo.name + "@" + moduleInfo.version);

-    console.log("Fetching " + moduleInfo.name + " at version " + moduleInfo.version);
-    const versions = await new Promise((resolve, reject) => {
-        npm.view([
-            moduleInfo.name + '@' + moduleInfo.version,
-            'dist.tarball',
-            (err, versions) => {
-                if (err) {
-                    reject(err);
-                } else {
-                    resolve(versions);
-                }
-            },
-        ]);
-    });
-
-    const orderedVersions = Object.keys(versions);
-    semver.sort(orderedVersions);
-
-    console.log("Resolved version " + orderedVersions[0] + " for " + moduleInfo.name);
-
-    const tarballUrl = versions[orderedVersions[0]]['dist.tarball'];
-
-    await mkdirp(moduleInfo.moduleDotHakDir);
-
-    const parsedUrl = url.parse(tarballUrl);
-    const tarballFile = path.join(moduleInfo.moduleDotHakDir, path.basename(parsedUrl.path));
-
-    let haveTarball;
-    try {
-        await fsProm.stat(tarballFile);
-        haveTarball = true;
-    } catch (e) {
-        haveTarball = false;
-    }
-    if (!haveTarball) {
-        console.log("Downloading " + tarballUrl);
-        await needle('get', tarballUrl, { output: tarballFile });
-    } else {
-        console.log(tarballFile + " already exists.");
-    }
-
-    await mkdirp(moduleInfo.moduleBuildDir);
-
-    await tar.x({
-        file: tarballFile,
-        cwd: moduleInfo.moduleBuildDir,
-        strip: 1,
+    const packumentCache = new Map();
+    await pacote.extract(`${moduleInfo.name}@${moduleInfo.version}`, moduleInfo.moduleBuildDir, {
+        packumentCache,
    });

    console.log("Running yarn install in " + moduleInfo.moduleBuildDir);
@@ -114,11 +62,8 @@ async function fetch(hakEnv, moduleInfo) {
    // actual runtime dependencies will have to be added to the main app's
    // dependencies. We can't tell what dependencies are real runtime deps
    // and which are just used for native module building.
-    await mkdirp(moduleInfo.moduleOutDir);
-    await tar.x({
-        file: tarballFile,
-        cwd: moduleInfo.moduleOutDir,
-        strip: 1,
+    await pacote.extract(`${moduleInfo.name}@${moduleInfo.version}`, moduleInfo.moduleOutDir, {
+        packumentCache,
    });
 }

--- a/scripts/hak/hakEnv.js
+++ b/scripts/hak/hakEnv.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ const path = require('path');
 const os = require('os');

 const nodePreGypVersioning = require('node-pre-gyp/lib/util/versioning');
+const { TARGETS, getHost, isHostId } = require('./target');

 function getElectronVersion(packageJson) {
    // should we pick the version of an installed electron
@@ -33,7 +34,7 @@ function getRuntime(packageJson) {
    return electronVersion ? 'electron' : 'node-webkit';
 }

-function getTarget(packageJson) {
+function getRuntimeVersion(packageJson) {
    const electronVersion = getElectronVersion(packageJson);
    if (electronVersion) {
        return electronVersion;
@@ -42,30 +43,24 @@ function getTarget(packageJson) {
    }
 }

-function detectArch() {
-    if (process.platform === 'win32') {
-        // vcvarsall.bat (the script that sets up the environment for
-        // visual studio build tools) sets an env var to tell us what
-        // architecture the active build tools target, so we auto-detect
-        // this.
-        const targetArch = process.env.VSCMD_ARG_TGT_ARCH;
-        if (targetArch === 'x86') {
-            return 'ia32';
-        } else if (targetArch === 'x64') {
-            return 'x64';
-        }
-    }
-    return process.arch;
-}
-
 module.exports = class HakEnv {
-    constructor(prefix, packageJson) {
+    constructor(prefix, packageJson, targetId) {
+        let target;
+        if (targetId) {
+            target = TARGETS[targetId];
+        } else {
+            target = getHost();
+        }
+
+        if (!target) {
+            throw new Error(`Unknown target ${targetId}!`);
+        }
+
        Object.assign(this, {
            // what we're targeting
            runtime: getRuntime(packageJson),
-            target: getTarget(packageJson),
-            platform: process.platform,
-            arch: detectArch(),
+            runtimeVersion: getRuntimeVersion(packageJson),
+            target,

            // paths
            projectRoot: prefix,
@@ -76,34 +71,46 @@ module.exports = class HakEnv {
    getRuntimeAbi() {
        return nodePreGypVersioning.get_runtime_abi(
            this.runtime,
-            this.target,
+            this.runtimeVersion,
        );
    }

    // {node_abi}-{platform}-{arch}
    getNodeTriple() {
-        return this.getRuntimeAbi() + '-' + this.platform + '-' + this.arch;
+        return this.getRuntimeAbi() + '-' + this.target.platform + '-' + this.target.arch;
+    }
+
+    getTargetId() {
+        return this.target.id;
    }

    isWin() {
-        return this.platform === 'win32';
+        return this.target.platform === 'win32';
    }

    isMac() {
-        return this.platform === 'darwin';
+        return this.target.platform === 'darwin';
    }

    isLinux() {
-        return this.platform === 'linux';
+        return this.target.platform === 'linux';
+    }
+
+    getTargetArch() {
+        return this.target.arch;
+    }
+
+    isHost() {
+        return isHostId(this.target.id);
    }

    makeGypEnv() {
        return Object.assign({}, process.env, {
-            npm_config_target: this.target,
-            npm_config_arch: this.arch,
-            npm_config_target_arch: this.arch,
+            npm_config_arch: this.target.arch,
+            npm_config_target_arch: this.target.arch,
            npm_config_disturl: 'https://atom.io/download/electron',
            npm_config_runtime: this.runtime,
+            npm_config_target: this.runtimeVersion,
            npm_config_build_from_source: true,
            npm_config_devdir: path.join(os.homedir(), ".electron-gyp"),
        });
--- a/scripts/hak/index.js
+++ b/scripts/hak/index.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,6 +35,13 @@ const MODULECOMMANDS = [
    'clean',
 ];

+// Shortcuts for multiple commands at once (useful for building universal binaries
+// because you can run the fetch/fetchDeps/build for each arch and then copy/link once)
+const METACOMMANDS = {
+    'fetchandbuild': ['check', 'fetch', 'fetchDeps', 'build'],
+    'copyandlink': ['copy', 'link'],
+};
+
 // Scripts valid in a hak.json 'scripts' section
 const HAKSCRIPTS = [
    'check',
@@ -53,7 +60,25 @@ async function main() {
        process.exit(1);
    }

-    const hakEnv = new HakEnv(prefix, packageJson);
+    const targetIds = [];
+    // Apply `--target <target>` option if specified
+    // Can be specified multiple times for the copy command to bundle
+    // multiple archs into a single universal output module)
+    while (true) { // eslint-disable-line no-constant-condition
+        const targetIndex = process.argv.indexOf('--target');
+        if (targetIndex === -1) break;
+
+        if ((targetIndex + 1) >= process.argv.length) {
+            console.error("--target option specified without a target");
+            process.exit(1);
+        }
+        // Extract target ID and remove from args
+        targetIds.push(process.argv.splice(targetIndex, 2)[1]);
+    }
+
+    const hakEnvs = targetIds.map(tid => new HakEnv(prefix, packageJson, tid));
+    if (hakEnvs.length == 0) hakEnvs.push(new HakEnv(prefix, packageJson, null));
+    const hakEnv = hakEnvs[0];

    const deps = {};

@@ -75,10 +100,12 @@ async function main() {
            cfg: hakJson,
            moduleHakDir: path.join(prefix, 'hak', dep),
            moduleDotHakDir: path.join(hakEnv.dotHakDir, dep),
-            moduleBuildDir: path.join(hakEnv.dotHakDir, dep, 'build'),
+            moduleTargetDotHakDir: path.join(hakEnv.dotHakDir, dep, hakEnv.getTargetId()),
+            moduleBuildDir: path.join(hakEnv.dotHakDir, dep, hakEnv.getTargetId(), 'build'),
+            moduleBuildDirs: hakEnvs.map(h => path.join(h.dotHakDir, dep, h.getTargetId(), 'build')),
            moduleOutDir: path.join(hakEnv.dotHakDir, 'hakModules', dep),
-            nodeModuleBinDir: path.join(hakEnv.dotHakDir, dep, 'build', 'node_modules', '.bin'),
-            depPrefix: path.join(hakEnv.dotHakDir, dep, 'opt'),
+            nodeModuleBinDir: path.join(hakEnv.dotHakDir, dep, hakEnv.getTargetId(), 'build', 'node_modules', '.bin'),
+            depPrefix: path.join(hakEnv.dotHakDir, dep, hakEnv.getTargetId(), 'opt'),
            scripts: {},
        };

@@ -92,10 +119,18 @@ async function main() {
    let cmds;
    if (process.argv.length < 3) {
        cmds = ['check', 'fetch', 'fetchDeps', 'build', 'copy', 'link'];
+    } else if (METACOMMANDS[process.argv[2]]) {
+        cmds = METACOMMANDS[process.argv[2]];
    } else {
        cmds = [process.argv[2]];
    }

+    if (hakEnvs.length > 1 && cmds.some(c => !['copy', 'link'].includes(c))) {
+        // We allow link here too for convenience because it's completely arch independent
+        console.error("Multiple targets only supported with the copy command");
+        return;
+    }
+
    let modules = process.argv.slice(3);
    if (modules.length === 0) modules = Object.keys(deps);

@@ -133,4 +168,7 @@ async function main() {
    }
 }

-main().catch(() => process.exit(1));
+main().catch(err => {
+    console.error(err);
+    process.exit(1);
+});
--- a/scripts/hak/target.js
+++ b/scripts/hak/target.js
@@ -0,0 +1,82 @@
+"use strict";
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+ * THIS FILE IS GENERATED, NOT MEANT FOR EDITING DIRECTLY
+ * The original source is `target.ts` in the `element-builder` repo. You can
+ * edit it over there, run `yarn build`, and paste the changes here. It is
+ * currently assumed this file will rarely change, so a spearate package is not
+ * yet warranted.
+ */
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isHost = exports.isHostId = exports.getHost = exports.ENABLED_TARGETS = exports.TARGETS = void 0;
+const aarch64AppleDarwin = {
+    id: 'aarch64-apple-darwin',
+    platform: 'darwin',
+    arch: 'arm64',
+};
+const i686PcWindowsMsvc = {
+    id: 'i686-pc-windows-msvc',
+    platform: 'win32',
+    arch: 'ia32',
+    vcVarsArch: 'x86',
+};
+const x8664PcWindowsMsvc = {
+    id: 'x86_64-pc-windows-msvc',
+    platform: 'win32',
+    arch: 'x64',
+    vcVarsArch: 'amd64',
+};
+const x8664AppleDarwin = {
+    id: 'x86_64-apple-darwin',
+    platform: 'darwin',
+    arch: 'x64',
+};
+const x8664UnknownLinuxGnu = {
+    id: 'x86_64-unknown-linux-gnu',
+    platform: 'linux',
+    arch: 'x64',
+};
+exports.TARGETS = {
+    'aarch64-apple-darwin': aarch64AppleDarwin,
+    'i686-pc-windows-msvc': i686PcWindowsMsvc,
+    'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
+    'x86_64-apple-darwin': x8664AppleDarwin,
+    'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
+};
+// The set of targets we build by default, sorted by increasing complexity so
+// that we fail fast when the native host target fails.
+exports.ENABLED_TARGETS = [
+    exports.TARGETS['x86_64-apple-darwin'],
+    exports.TARGETS['aarch64-apple-darwin'],
+    exports.TARGETS['x86_64-unknown-linux-gnu'],
+    exports.TARGETS['i686-pc-windows-msvc'],
+];
+function getHost() {
+    return Object.values(exports.TARGETS).find(target => (target.platform === process.platform &&
+        target.arch === process.arch));
+}
+exports.getHost = getHost;
+function isHostId(id) {
+    return getHost()?.id === id;
+}
+exports.isHostId = isHostId;
+function isHost(target) {
+    return getHost()?.id === target.id;
+}
+exports.isHost = isHost;
--- a/scripts/in-docker.sh
+++ b/scripts/in-docker.sh
@@ -7,8 +7,9 @@ if [ $? != 0 ]; then
 fi

 # Taken from https://www.electron.build/multi-platform-build#docker
+# Pass through any vars prefixed with INDOCKER_, removing the prefix
 docker run --rm -ti \
- --env-file <(env | grep -iE '^BUILDKITE_API_KEY=') \
+ --env-file <(env | grep -E '^INDOCKER_' | sed -e 's/^INDOCKER_//') \
 --env ELECTRON_CACHE="/root/.cache/electron" \
 --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
 -v ${PWD}:/project \
--- a/scripts/set-version.js
+++ b/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 };
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -0,0 +1,26 @@
+/*
+Copyright 2021 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { BrowserWindow } from "electron";
+
+declare global {
+    namespace NodeJS {
+        interface Global {
+            mainWindow: BrowserWindow;
+            appQuitting: boolean;
+        }
+    }
+}
--- a/src/electron-main.ts
+++ b/src/electron-main.ts
@@ -17,37 +17,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Squirrel on windows starts the app with various flags
-// as hooks to tell us when we've been installed/uninstalled
-// etc.
-const checkSquirrelHooks = require('./squirrelhooks');
-if (checkSquirrelHooks()) return;
+// Squirrel on windows starts the app with various flags as hooks to tell us when we've been installed/uninstalled etc.
+import "./squirrelhooks";
+import { app, ipcMain, powerSaveBlocker, BrowserWindow, Menu, autoUpdater, protocol, dialog } from "electron";
+import AutoLaunch from "auto-launch";
+import path from "path";
+import windowStateKeeper from 'electron-window-state';
+import Store from 'electron-store';
+import fs, { promises as afs } from "fs";
+import crypto from "crypto";
+import { URL } from "url";
+import minimist from "minimist";

-const argv = require('minimist')(process.argv, {
-    alias: {help: "h"},
+import * as tray from "./tray";
+import { buildMenuTemplate } from './vectormenu';
+import webContentsHandler from './webcontents-handler';
+import * as updater from './updater';
+import { getProfileFromDeeplink, protocolInit, recordSSOSession } from './protocol';
+import { _t, AppLocalization } from './language-helper';
+
+const argv = minimist(process.argv, {
+    alias: { help: "h" },
 });

-const {
-    app, ipcMain, powerSaveBlocker, BrowserWindow, Menu, autoUpdater, protocol, dialog,
-} = require('electron');
-const AutoLaunch = require('auto-launch');
-const path = require('path');
-
-const tray = require('./tray');
-const buildMenuTemplate = require('./vectormenu');
-const webContentsHandler = require('./webcontents-handler');
-const updater = require('./updater');
-const {getProfileFromDeeplink, protocolInit, recordSSOSession} = require('./protocol');
-
-const windowStateKeeper = require('electron-window-state');
-const Store = require('electron-store');
-
-const fs = require('fs');
-const afs = fs.promises;
-
-const crypto = require('crypto');
 let keytar;
 try {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
    keytar = require('keytar');
 } catch (e) {
    if (e.code === "MODULE_NOT_FOUND") {
@@ -57,14 +52,13 @@ try {
    }
 }

-const { _t, AppLocalization } = require('./language-helper');
-
 let seshatSupported = false;
 let Seshat;
 let SeshatRecovery;
 let ReindexError;

 try {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
    const seshatModule = require('matrix-seshat');
    Seshat = seshatModule.Seshat;
    SeshatRecovery = seshatModule.SeshatRecovery;
@@ -181,6 +175,7 @@ async function setupGlobals() {
    ]);

    try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
        vectorConfig = require(asarPath + 'config.json');
    } catch (e) {
        // it would be nice to check the error code here and bail if the config
@@ -192,6 +187,7 @@ async function setupGlobals() {

    try {
        // Load local config and use it to override values from the one baked with the build
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
        const localConfig = require(path.join(app.getPath('userData'), 'config.json'));

        // If the local config has a homeserver defined, don't use the homeserver from the build
@@ -207,6 +203,16 @@ async function setupGlobals() {

        vectorConfig = Object.assign(vectorConfig, localConfig);
    } catch (e) {
+        if (e instanceof SyntaxError) {
+            dialog.showMessageBox({
+                type: "error",
+                title: `Your ${vectorConfig.brand || 'Element'} is misconfigured`,
+                message: `Your custom ${vectorConfig.brand || 'Element'} configuration contains invalid JSON. ` +
+                         `Please correct the problem and reopen ${vectorConfig.brand || 'Element'}.`,
+                detail: e.message || "",
+            });
+        }
+
        // Could not load local config, this is expected in most cases.
    }

@@ -249,7 +255,13 @@ async function moveAutoLauncher() {
 }

 const eventStorePath = path.join(app.getPath('userData'), 'EventStore');
-const store = new Store({ name: "electron-config" });
+const store = new Store<{
+    warnBeforeExit?: boolean;
+    minimizeToTray?: boolean;
+    spellCheckerEnabled?: boolean;
+    autoHideMenuBar?: boolean;
+    locale?: string | string[];
+}>({ name: "electron-config" });

 let eventIndex = null;

@@ -264,7 +276,8 @@ const exitShortcuts = [

 const warnBeforeExit = (event, input) => {
    const shouldWarnBeforeExit = store.get('warnBeforeExit', true);
-    const exitShortcutPressed = exitShortcuts.some(shortcutFn => shortcutFn(input, process.platform));
+    const exitShortcutPressed =
+        input.type === 'keyDown' && exitShortcuts.some(shortcutFn => shortcutFn(input, process.platform));

    if (shouldWarnBeforeExit && exitShortcutPressed) {
        const shouldCancelCloseRequest = dialog.showMessageBoxSync(mainWindow, {
@@ -499,7 +512,6 @@ ipcMain.on('ipcCall', async function(ev, payload) {
    });
 });

-
 const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
 async function getOrCreatePassphrase(key) {
    if (keytar) {
@@ -551,8 +563,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 +590,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;
@@ -822,6 +834,7 @@ app.on('ready', async () => {

    if (argv['devtools']) {
        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
            const { default: installExt, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer');
            installExt(REACT_DEVELOPER_TOOLS)
                .then((name) => console.log(`Added Extension: ${name}`))
@@ -836,17 +849,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 +867,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 +879,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 +889,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);
@@ -1006,7 +1019,7 @@ function beforeQuit() {
 }

 app.on('before-quit', beforeQuit);
-app.on('before-quit-for-update', beforeQuit);
+autoUpdater.on('before-quit-for-update', beforeQuit);

 app.on('second-instance', (ev, commandLine, workingDirectory) => {
    // If other instance launched with --hidden then skip showing window
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -0,0 +1,12 @@
+{
+    "File": "مَلَفّ",
+    "Close": "إغلاق",
+    "Actual Size": "الحَجمُ الفِعلي",
+    "View": "الاِطِّلاع",
+    "Select All": "تَحدِيدُ الكُل",
+    "Delete": "حَذف",
+    "Copy": "نَسخ",
+    "Edit": "تَحرير",
+    "Close Element": "إغلَاقُ Element",
+    "Cancel": "إلغَاء"
+}
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.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": "Адмена"
+}
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -0,0 +1,46 @@
+{
+    "Add to dictionary": "Afegeix al diccionari",
+    "The image failed to save": "S'ha fallat en desar la imatge",
+    "Failed to save image": "S'ha fallat en desar la imatge",
+    "Save image as...": "Anomena i desa la imatge...",
+    "Copy link address": "Copia l'adreça de l'enllaç",
+    "Copy email address": "Copia l'adreça de correu electrònic",
+    "Copy image": "Copia la imatge",
+    "File": "Fitxer",
+    "Bring All to Front": "Porta-ho tot al davant",
+    "Zoom": "Escala",
+    "Stop Speaking": "Para la veu",
+    "Start Speaking": "Comença la veu",
+    "Speech": "Veu",
+    "Unhide": "Deixa d'amagar",
+    "Hide Others": "Amaga les altres",
+    "Hide": "Amaga",
+    "Services": "Serveis",
+    "About": "Quant a",
+    "Element Help": "Ajuda sobre l'Element",
+    "Help": "Ajuda",
+    "Close": "Tanca",
+    "Minimize": "Minimitza",
+    "Window": "Finestra",
+    "Toggle Developer Tools": "Commuta les eines per a desenvolupadors",
+    "Toggle Full Screen": "Commuta la pantalla completa",
+    "Preferences": "Preferències",
+    "Zoom Out": "Allunya",
+    "Zoom In": "Apropia",
+    "Actual Size": "Mida real",
+    "View": "Visualitza",
+    "Select All": "Selecciona-ho tot",
+    "Delete": "Suprimeix",
+    "Paste and Match Style": "Enganxa i fes coincidir l'estil",
+    "Paste": "Enganxa",
+    "Copy": "Copia",
+    "Cut": "Retalla",
+    "Redo": "Refés",
+    "Undo": "Desfés",
+    "Edit": "Edita",
+    "Quit": "Surt",
+    "Show/Hide": "Mostra/Amaga",
+    "Are you sure you want to quit?": "Esteu segur que voleu sortir?",
+    "Close Element": "Tanca l'Element",
+    "Cancel": "Cancel·la"
+}
--- a/src/i18n/strings/fy.json
+++ b/src/i18n/strings/fy.json
@@ -0,0 +1,46 @@
+{
+    "Copy image": "Ôfbylding kopiearje",
+    "Speech": "Spraak",
+    "View": "Oersjoch",
+    "Paste and Match Style": "Plakke en lit Stylen oerienkomme",
+    "Add to dictionary": "Oan wurdlist tafoegje",
+    "The image failed to save": "It is net slagge de ôfbylding te bewarjen",
+    "Failed to save image": "Bewarjen fan ôfbylding mislearre",
+    "Save image as...": "Ôfbylding bewarje as...",
+    "Copy link address": "Keppelingsadres kopiearje",
+    "Copy email address": "E-mailadres kopiearje",
+    "File": "Bestân",
+    "Bring All to Front": "Alles nei Foaren Helje",
+    "Zoom": "Zoom",
+    "Stop Speaking": "Stopje mei Praten",
+    "Start Speaking": "Begjin mei Praten",
+    "Unhide": "Wer sjen litte",
+    "Hide Others": "Oaren Ferbergje",
+    "Hide": "Ferbergje",
+    "Services": "Tsjinsten",
+    "About": "Oer",
+    "Element Help": "Element Help",
+    "Help": "Help",
+    "Close": "Slute",
+    "Minimize": "Minimalisearje",
+    "Window": "Finster",
+    "Toggle Developer Tools": "Ûntwikkelders Ark yn/útskeakelje",
+    "Toggle Full Screen": "Foslein Skerm yn/útskeakelje",
+    "Preferences": "Foarkarren",
+    "Zoom Out": "Útzoome",
+    "Zoom In": "Ynzoome",
+    "Actual Size": "Werklike Grutte",
+    "Select All": "Alles Selektearje",
+    "Delete": "Fuortsmite",
+    "Paste": "Plakke",
+    "Copy": "Kopiearje",
+    "Cut": "Knippe",
+    "Redo": "Opnij dwaan",
+    "Undo": "Ûngedien meitsje",
+    "Edit": "Oanpasse",
+    "Quit": "Ôfslute",
+    "Show/Hide": "Sjen litte/Ferbergje",
+    "Are you sure you want to quit?": "Binne jo der wis fan dat jo ôfslute wolle?",
+    "Close Element": "Element Ôfslute",
+    "Cancel": "Ôfbrekke"
+}
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -0,0 +1,45 @@
+{
+    "Actual Size": "גודל ממשי",
+    "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": "עזרה של אלמנט",
+    "Help": "עזרה",
+    "Close": "סגור",
+    "Minimize": "מזער",
+    "Window": "חלון",
+    "Toggle Developer Tools": "הפעל כלי מפתחים",
+    "Toggle Full Screen": "הפעל מצב מסך מלא",
+    "Preferences": "העדפות",
+    "Zoom Out": "התרחק",
+    "Zoom In": "התקרב",
+    "View": "צפה",
+    "Select All": "בחר הכל",
+    "Delete": "מחק",
+    "Paste": "הדבק",
+    "Copy": "העתק",
+    "Cut": "גזור",
+    "Undo": "בטל ביצוע",
+    "Redo": "בצע שוב",
+    "Edit": "עריכה",
+    "Quit": "יציאה",
+    "Show/Hide": "הצג\\הסתר",
+    "Are you sure you want to quit?": "האם אתה בטוח שברצונך לצאת?",
+    "Close Element": "סגור את אלמנט",
+    "Cancel": "ביטול"
+}
--- a/src/i18n/strings/hr.json
+++ b/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"
+}
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -0,0 +1,46 @@
+{
+    "Add to dictionary": "Tambah ke kamus",
+    "The image failed to save": "Gambar gagal disimpan",
+    "Failed to save image": "Gagal menyimpan gambar",
+    "Save image as...": "Simpan gambar sebagai...",
+    "Copy link address": "Salin alamat tautan",
+    "Copy email address": "Salin surel",
+    "Copy image": "Salin gambar",
+    "File": "Berkas",
+    "Hide Others": "Sembunyikan yang Lain",
+    "Bring All to Front": "Bawa Semua ke Depan",
+    "Zoom": "Perbesar",
+    "Stop Speaking": "Berhenti Berbicara",
+    "Start Speaking": "Mulai Berbicara",
+    "Speech": "Dikte",
+    "Unhide": "Tunjukkan",
+    "Hide": "Sembunyikan",
+    "Services": "Layanan",
+    "About": "Tentang",
+    "Element Help": "Bantuan Element",
+    "Help": "Bantuan",
+    "Close": "Tutup",
+    "Minimize": "Minimalkan",
+    "Window": "Jendela",
+    "Toggle Developer Tools": "Beralih Alat Pengembang",
+    "Toggle Full Screen": "Beralih Layar Penuh",
+    "Preferences": "Preferensi",
+    "Zoom Out": "Perkecil",
+    "Zoom In": "Perbesar",
+    "Cut": "Potong",
+    "Redo": "Ulangi",
+    "Undo": "Urungkan",
+    "Actual Size": "Ukuran Sebenarnya",
+    "View": "Lihat",
+    "Select All": "Pilih Semua",
+    "Delete": "Hapus",
+    "Paste and Match Style": "Tempel dan Cocok-kan Gaya",
+    "Paste": "Tempel",
+    "Copy": "Salin",
+    "Edit": "Sunting",
+    "Quit": "Keluar",
+    "Show/Hide": "Tunjukkan/Sembunyikan",
+    "Are you sure you want to quit?": "Apakah Anda yakin ingin keluar?",
+    "Close Element": "Tutup Element",
+    "Cancel": "Batal"
+}
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -0,0 +1,46 @@
+{
+    "Add to dictionary": "Bæta við orðabók",
+    "The image failed to save": "Myndin mistóksts að vista",
+    "Failed to save image": "Mistókst að vista mynd",
+    "Save image as...": "Vista mynd sem...",
+    "Copy link address": "Afrita nethlekk",
+    "Copy email address": "Afrita tölvupóstfang",
+    "Copy image": "Afrita mynd",
+    "File": "Skrá",
+    "Bring All to Front": "Koma Öllum að Framan",
+    "Zoom": "Stærð",
+    "Stop Speaking": "Hætta Tal",
+    "Start Speaking": "Byrja Tal",
+    "Speech": "Tal",
+    "Unhide": "Birta",
+    "Hide Others": "Fela Aðra",
+    "Hide": "Fela",
+    "Services": "Þjónustur",
+    "About": "Um",
+    "Element Help": "Element Hjálp",
+    "Help": "Hjálp",
+    "Close": "Loka",
+    "Minimize": "Lágmarka",
+    "Window": "Gluggi",
+    "Toggle Developer Tools": "Skipta Framkvæmdaraðilaverkfæri",
+    "Toggle Full Screen": "Skipta um Fullskjá",
+    "Preferences": "Stillingar",
+    "Zoom Out": "Minnka",
+    "Zoom In": "Stækka",
+    "Actual Size": "Raunveruleg Stærð",
+    "View": "Skoða",
+    "Select All": "Velja Allt",
+    "Delete": "Eyða",
+    "Paste and Match Style": "Líma og Passa Stíl",
+    "Paste": "Líma",
+    "Copy": "Afrita",
+    "Cut": "Klippa",
+    "Redo": "Endurgera",
+    "Undo": "Afturkalla",
+    "Edit": "Breyta",
+    "Quit": "Hætta",
+    "Show/Hide": "Sýna/Fela",
+    "Are you sure you want to quit?": "Ertu viss um að þú viljir hætta?",
+    "Close Element": "Loka Element",
+    "Cancel": "Hætta við"
+}
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -40,5 +40,7 @@
    "Show/Hide": "Mostra/Nascondi",
    "Are you sure you want to quit?": "Vuoi veramente uscire?",
    "Close Element": "Chiudi Element",
-    "Cancel": "Annulla"
+    "Cancel": "Annulla",
+    "Stop Speaking": "Smetti di parlare",
+    "Speech": "Dettatura"
 }
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -0,0 +1,46 @@
+{
+    "Start Speaking": "Runājiet...",
+    "Add to dictionary": "Pievienot vārdnīcai",
+    "The image failed to save": "Attēlu saglabāt neizdevās",
+    "Failed to save image": "Neizdevās saglabāt attēlu",
+    "Save image as...": "Saglabāt attēlu kā...",
+    "Copy link address": "Kopēt saiti",
+    "Copy email address": "Kopēt e-pastu",
+    "Copy image": "Kopēt attēlu",
+    "File": "Fails",
+    "Bring All to Front": "Iznest visu priekšplānā",
+    "Zoom": "Mērogošana",
+    "Stop Speaking": "Beidziet runāt",
+    "Speech": "Runa",
+    "Unhide": "Rādīt",
+    "Hide Others": "Slēpt citus",
+    "Hide": "Slēpt",
+    "Services": "Servisi/pakalpojumi",
+    "About": "Par programmu",
+    "Element Help": "Element palīdzība",
+    "Help": "Palīdzība",
+    "Close": "Aizvērt",
+    "Minimize": "Minimizēt",
+    "Window": "Logs",
+    "Toggle Developer Tools": "Pārslēgt uz Izstrādātāja rīkiem",
+    "Toggle Full Screen": "Pārslēgt uz pilnekrānu",
+    "Preferences": "Parametri/iestatījumi",
+    "Zoom Out": "Samazināt",
+    "Zoom In": "Palielināt",
+    "Actual Size": "Faktiskais izmērs",
+    "View": "Skats",
+    "Select All": "Atzīmēt visus",
+    "Delete": "Dzēst",
+    "Paste and Match Style": "Ievietot, saglabājot stilu",
+    "Paste": "Ievietot",
+    "Copy": "Kopēt",
+    "Cut": "Izgriezt",
+    "Redo": "Atatdarīt/atatgriezt (redo)",
+    "Undo": "Atgreizt/atdarīt (undo)",
+    "Edit": "Rediģēt",
+    "Quit": "Iziet",
+    "Show/Hide": "Rādīt/nerādīt",
+    "Are you sure you want to quit?": "Tiešām vēlaties iziet?",
+    "Close Element": "Aizvērt Elementu",
+    "Cancel": "Atcelt"
+}
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -0,0 +1,46 @@
+{
+    "Add to dictionary": "Adicionar a dicionário",
+    "The image failed to save": "A imagem falhou para salvar",
+    "Failed to save image": "Falha para salvar imagem",
+    "Save image as...": "Salvar imagem como...",
+    "Copy link address": "Copiar endereço de link",
+    "Copy email address": "Copiar endereço de email",
+    "Copy image": "Copiar imagem",
+    "File": "Arquivo",
+    "Zoom": "Zoom",
+    "Stop Speaking": "Parar de Falar",
+    "Start Speaking": "Começar a Falar",
+    "Speech": "Fala",
+    "Unhide": "Desesconder",
+    "Hide": "Esconder",
+    "Services": "Serviços",
+    "About": "Sobre",
+    "Element Help": "Ajuda de Element",
+    "Help": "Ajuda",
+    "Close": "Fechar",
+    "Minimize": "Minimizar",
+    "Window": "Janela",
+    "Toggle Developer Tools": "Ativar/Desativar Ferramentas de Desenvolvimento",
+    "Toggle Full Screen": "Pôr em/Tirar de Tela Cheia",
+    "Preferences": "Preferências",
+    "Zoom Out": "Dar Zoom Out",
+    "Zoom In": "Dar Zoom In",
+    "Actual Size": "Tamanho de Verdade",
+    "View": "Visualizar",
+    "Select All": "Selecionar Todas",
+    "Delete": "Deletar",
+    "Paste and Match Style": "Colar e Adequar Estilo",
+    "Paste": "Colar",
+    "Copy": "Copiar",
+    "Cut": "Cortar",
+    "Redo": "Refazer",
+    "Undo": "Desfazer",
+    "Edit": "Editar",
+    "Quit": "Sair",
+    "Show/Hide": "Mostrar/Esconder",
+    "Are you sure you want to quit?": "Você tem certeza que você quer sair?",
+    "Close Element": "Fechar Element",
+    "Cancel": "Cancelar",
+    "Bring All to Front": "Trazer Todas Para Frente",
+    "Hide Others": "Esconder Outras(os)"
+}
--- a/src/i18n/strings/ro.json
+++ b/src/i18n/strings/ro.json
@@ -0,0 +1,43 @@
+{
+    "Add to dictionary": "Adăugați la dicționar",
+    "Failed to save image": "Eroare in salvarea imaginii",
+    "Save image as...": "Salvează imagine ca ...",
+    "Copy link address": "Copiază link",
+    "Copy email address": "Copiază adresă de email",
+    "Copy image": "Copiază imagine",
+    "File": "Fișier",
+    "Bring All to Front": "Aduce-ți totul in față",
+    "Zoom": "zoom",
+    "Stop Speaking": "Oprire Voce",
+    "Start Speaking": "Pornire Voce",
+    "Speech": "Voce",
+    "Hide Others": "Ascunde restul",
+    "Hide": "Ascunde",
+    "Services": "Servicii",
+    "About": "Despre",
+    "Element Help": "Ajutor Element",
+    "Help": "Ajutor",
+    "Close": "Inchide",
+    "Minimize": "Minimizare",
+    "Window": "Fereastră",
+    "Toggle Developer Tools": "Comutare unelte dezvoltator",
+    "Toggle Full Screen": "Comutare pe tot ecranul",
+    "Preferences": "Preferințe",
+    "Zoom Out": "Micșorează",
+    "Zoom In": "Mărește",
+    "Actual Size": "Mărime reală",
+    "View": "Vizualizează",
+    "Select All": "Selectează tot",
+    "Delete": "Șterge",
+    "Paste and Match Style": "Lipește si potrivește stilul",
+    "Paste": "Lipește",
+    "Copy": "Copiere",
+    "Redo": "Refă",
+    "Undo": "Anulare",
+    "Edit": "Editare",
+    "Quit": "Închide",
+    "Show/Hide": "Arată/Ascunde",
+    "Are you sure you want to quit?": "Sunte-ți sigur ca doriți sa inchideți aplicația ?",
+    "Close Element": "închide aplicația",
+    "Cancel": "Anulare"
+}
--- a/src/i18n/strings/si.json
+++ b/src/i18n/strings/si.json
@@ -0,0 +1,31 @@
+{
+    "Show/Hide": "පෙන්වන්න/සඟවන්න",
+    "Are you sure you want to quit?": "ඔබට ඉවත් වීමට අවශ්‍ය බව විශ්වාස ද?",
+    "Close Element": "ඉලමෙන්ට් වසන්න",
+    "Cancel": "අවලංගු කරන්න",
+    "Add to dictionary": "ශබ්ද කෝෂයට එකතු කරන්න",
+    "Copy link address": "සබැඳියේ ලිපිනය පිටපත් කරන්න",
+    "Copy email address": "වි-තැපෑල පිටපත් කරන්න",
+    "File": "ගොනුව",
+    "Zoom": "විශාල කරන්න",
+    "Hide Others": "වෙනත් දෑ සඟවන්න",
+    "Hide": "සඟවන්න",
+    "Services": "සේවා",
+    "About": "පිළිබඳව",
+    "Element Help": "ඉලමෙන්ට් උපකාර",
+    "Help": "උපකාර",
+    "Close": "වසන්න",
+    "Minimize": "හකුලන්න",
+    "Window": "කවුළුව",
+    "Zoom Out": "කුඩාලනය කරන්න",
+    "Zoom In": "විශාලනය කරන්න",
+    "Actual Size": "සැබෑ ප්‍රමාණය",
+    "Select All": "සියල්ල තෝරන්න",
+    "Paste": "අලවන්න",
+    "Copy": "පිටපත්",
+    "Cut": "කපන්න",
+    "Redo": "පසුසේ",
+    "Undo": "පෙරසේ",
+    "Edit": "සංස්කරණය",
+    "Quit": "ඉවත් වන්න"
+}
--- a/src/i18n/strings/sv.json
+++ b/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?"
 }
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -0,0 +1,46 @@
+{
+    "Zoom": "பெரிதாக்குதல்",
+    "Minimize": "சிறிதாக்கு",
+    "Toggle Developer Tools": "படைப்பாளர் கருவிகளை நிலைமாற்று",
+    "Toggle Full Screen": "முழு திரையை நிலைமாற்று",
+    "Paste and Match Style": "ஒட்டு மற்றும் நடையை பொறுத்து",
+    "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": "அனைத்தையும் முன்னால் கொண்டுவா",
+    "Stop Speaking": "பேசுவதை நிறுத்து",
+    "Start Speaking": "பேசத் துவங்கு",
+    "Speech": "பேச்சு",
+    "Unhide": "காட்டு",
+    "Hide Others": "மற்றதை மறை",
+    "Hide": "மறை",
+    "Services": "சேவைகள்",
+    "About": "இதனைப் பற்றி",
+    "Element Help": "எலிமெண்ட் உதவி",
+    "Help": "உதவி",
+    "Close": "மூடு",
+    "Window": "சாளரம்",
+    "Preferences": "விருப்பத்தேர்வுகள்",
+    "Zoom Out": "சிறிதாக்கு",
+    "Zoom In": "பெரிதாக்கு",
+    "Actual Size": "உண்மையான அளவு",
+    "View": "காட்சி",
+    "Select All": "அனைத்தையும் தெரிவுசெய்",
+    "Delete": "அழி",
+    "Paste": "ஒட்டு",
+    "Copy": "நகலெடு",
+    "Cut": "வெட்டு",
+    "Redo": "மீண்டும் செய்",
+    "Undo": "செயல்தவிர்",
+    "Edit": "திருத்து",
+    "Quit": "வெளியேறு",
+    "Show/Hide": "காட்டு/மறை",
+    "Are you sure you want to quit?": "நீங்கள் நிச்சயம் வெளியேற விரும்புகிறீர்களா?",
+    "Close Element": "எலிமெண்ட் ஐ மூடு",
+    "Cancel": "ரத்துசெய்"
+}
--- a/src/i18n/strings/zh_Hans.json
+++ b/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": "取消"
+}
--- a/src/language-helper.ts
+++ b/src/language-helper.ts
@@ -14,15 +14,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const counterpart = require('counterpart');
+import counterpart from "counterpart";
+import type Store from 'electron-store';

 const DEFAULT_LOCALE = "en";

-function _td(text) {
+export function _td(text: string): string {
    return text;
 }

-function _t(text, variables = {}) {
+type SubstitutionValue = number | string;
+
+interface IVariables {
+    [key: string]: SubstitutionValue;
+    count?: number;
+}
+
+export function _t(text: string, variables: IVariables = {}): string {
    const args = Object.assign({ interpolate: false }, variables);

    const { count } = args;
@@ -48,18 +56,24 @@ 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)
    return translated;
 }

-class AppLocalization {
-    static STORE_KEY = "locale"
-    store = null
+type Component = () => void;

-    constructor({ store, components = [] }) {
+type TypedStore = Store<{ locale?: string | string[] }>;
+
+export class AppLocalization {
+    private static readonly STORE_KEY = "locale";
+
+    private readonly store: TypedStore;
+    private readonly localizedComponents: Set<Component>;
+
+    constructor({ store, components = [] }: { store: TypedStore, components: Component[] }) {
        counterpart.registerTranslations("en", this.fetchTranslationJson("en_EN"));
        counterpart.setFallbackLocale('en');
        counterpart.setSeparator('|');
@@ -77,7 +91,7 @@ class AppLocalization {
        this.resetLocalizedUI();
    }

-    fetchTranslationJson(locale) {
+    public fetchTranslationJson(locale: string): Record<string, string> {
        try {
            console.log("Fetching translation json for locale: " + locale);
            return require(`./i18n/strings/${locale}.json`);
@@ -87,11 +101,7 @@ class AppLocalization {
        }
    }

-    get languageTranslationJson() {
-        return this.translationJsonMap.get(this.language);
-    }
-
-    setAppLocale(locales) {
+    public setAppLocale(locales: string | string[]): void {
        console.log(`Changing application language to ${locales}`);

        if (!Array.isArray(locales)) {
@@ -105,13 +115,15 @@ class AppLocalization {
            }
        });

+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore - this looks like a bug but is out of scope for this conversion
        counterpart.setLocale(locales);
        this.store.set(AppLocalization.STORE_KEY, locales);

        this.resetLocalizedUI();
    }

-    resetLocalizedUI() {
+    public resetLocalizedUI(): void {
        console.log("Resetting the UI components after locale change");
        this.localizedComponents.forEach(componentSetup => {
            if (typeof componentSetup === "function") {
@@ -120,10 +132,3 @@ class AppLocalization {
        });
    }
 }
-
-
-module.exports = {
-    AppLocalization,
-    _t,
-    _td,
-};
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const { ipcRenderer, desktopCapturer, contextBridge } = require('electron');
+import { ipcRenderer, desktopCapturer, contextBridge, IpcRendererEvent, SourcesOptions } from 'electron';

 // Expose only expected IPC wrapper APIs to the renderer process to avoid
 // handing out generalised messaging access.
@@ -36,26 +36,32 @@ const CHANNELS = [
    "userDownloadOpen",
 ];

+interface ISource {
+    id: string;
+    name: string;
+    thumbnailURL: string;
+}
+
 contextBridge.exposeInMainWorld(
    "electron",
    {
-        on(channel, listener) {
+        on(channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): void {
            if (!CHANNELS.includes(channel)) {
                console.error(`Unknown IPC channel ${channel} ignored`);
                return;
            }
            ipcRenderer.on(channel, listener);
        },
-        send(channel, ...args) {
+        send(channel: string, ...args: any[]): void {
            if (!CHANNELS.includes(channel)) {
                console.error(`Unknown IPC channel ${channel} ignored`);
                return;
            }
            ipcRenderer.send(channel, ...args);
        },
-        async getDesktopCapturerSources(options) {
+        async getDesktopCapturerSources(options: SourcesOptions): Promise<ISource[]> {
            const sources = await desktopCapturer.getSources(options);
-            const desktopCapturerSources = [];
+            const desktopCapturerSources: ISource[] = [];

            for (const source of sources) {
                desktopCapturerSources.push({
--- a/src/protocol.js
+++ b/src/protocol.js
@@ -1,102 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-const {app} = require("electron");
-const path = require("path");
-const fs = require("fs");
-
-const PROTOCOL = "element://";
-const SEARCH_PARAM = "element-desktop-ssoid";
-const STORE_FILE_NAME = "sso-sessions.json";
-
-// we getPath userData before electron-main changes it, so this is the default value
-const storePath = path.join(app.getPath("userData"), STORE_FILE_NAME);
-
-const processUrl = (url) => {
-    if (!global.mainWindow) return;
-    console.log("Handling link: ", url);
-    global.mainWindow.loadURL(url.replace(PROTOCOL, "vector://"));
-};
-
-const readStore = () => {
-    try {
-        const s = fs.readFileSync(storePath, { encoding: "utf8" });
-        const o = JSON.parse(s);
-        return typeof o === "object" ? o : {};
-    } catch (e) {
-        return {};
-    }
-};
-
-const writeStore = (data) => {
-    fs.writeFileSync(storePath, JSON.stringify(data));
-};
-
-module.exports = {
-    recordSSOSession: (sessionID) => {
-        const userDataPath = app.getPath('userData');
-        const store = readStore();
-        for (const key in store) {
-            // ensure each instance only has one (the latest) session ID to prevent the file growing unbounded
-            if (store[key] === userDataPath) {
-                delete store[key];
-                break;
-            }
-        }
-        store[sessionID] = userDataPath;
-        writeStore(store);
-    },
-    getProfileFromDeeplink: (args) => {
-        // check if we are passed a profile in the SSO callback url
-        const deeplinkUrl = args.find(arg => arg.startsWith('element://'));
-        if (deeplinkUrl && deeplinkUrl.includes(SEARCH_PARAM)) {
-            const parsedUrl = new URL(deeplinkUrl);
-            if (parsedUrl.protocol === 'element:') {
-                const ssoID = parsedUrl.searchParams.get(SEARCH_PARAM);
-                const store = readStore();
-                console.log("Forwarding to profile: ", store[ssoID]);
-                return store[ssoID];
-            }
-        }
-    },
-    protocolInit: () => {
-        // get all args except `hidden` as it'd mean the app would not get focused
-        // XXX: passing args to protocol handlers only works on Windows, so unpackaged deep-linking
-        // --profile/--profile-dir are passed via the SEARCH_PARAM var in the callback url
-        const args = process.argv.slice(1).filter(arg => arg !== "--hidden" && arg !== "-hidden");
-        if (app.isPackaged) {
-            app.setAsDefaultProtocolClient('element', process.execPath, args);
-        } else if (process.platform === 'win32') { // on Mac/Linux this would just cause the electron binary to open
-            // special handler for running without being packaged, e.g `electron .` by passing our app path to electron
-            app.setAsDefaultProtocolClient('element', process.execPath, [app.getAppPath(), ...args]);
-        }
-
-        if (process.platform === 'darwin') {
-            // Protocol handler for macos
-            app.on('open-url', function(ev, url) {
-                ev.preventDefault();
-                processUrl(url);
-            });
-        } else {
-            // Protocol handler for win32/Linux
-            app.on('second-instance', (ev, commandLine) => {
-                const url = commandLine[commandLine.length - 1];
-                if (!url.startsWith(PROTOCOL)) return;
-                processUrl(url);
-            });
-        }
-    },
-};
--- a/src/protocol.ts
+++ b/src/protocol.ts
@@ -0,0 +1,103 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { app } from "electron";
+import { URL } from "url";
+import path from "path";
+import fs from "fs";
+
+const PROTOCOL = "element://";
+const SEARCH_PARAM = "element-desktop-ssoid";
+const STORE_FILE_NAME = "sso-sessions.json";
+
+// we getPath userData before electron-main changes it, so this is the default value
+const storePath = path.join(app.getPath("userData"), STORE_FILE_NAME);
+
+function processUrl(url: string): void {
+    if (!global.mainWindow) return;
+    console.log("Handling link: ", url);
+    global.mainWindow.loadURL(url.replace(PROTOCOL, "vector://"));
+}
+
+function readStore(): object {
+    try {
+        const s = fs.readFileSync(storePath, { encoding: "utf8" });
+        const o = JSON.parse(s);
+        return typeof o === "object" ? o : {};
+    } catch (e) {
+        return {};
+    }
+}
+
+function writeStore(data: object): void {
+    fs.writeFileSync(storePath, JSON.stringify(data));
+}
+
+export function recordSSOSession(sessionID: string): void {
+    const userDataPath = app.getPath('userData');
+    const store = readStore();
+    for (const key in store) {
+        // ensure each instance only has one (the latest) session ID to prevent the file growing unbounded
+        if (store[key] === userDataPath) {
+            delete store[key];
+            break;
+        }
+    }
+    store[sessionID] = userDataPath;
+    writeStore(store);
+}
+
+export function getProfileFromDeeplink(args): string | undefined {
+    // check if we are passed a profile in the SSO callback url
+    const deeplinkUrl = args.find(arg => arg.startsWith('element://'));
+    if (deeplinkUrl && deeplinkUrl.includes(SEARCH_PARAM)) {
+        const parsedUrl = new URL(deeplinkUrl);
+        if (parsedUrl.protocol === 'element:') {
+            const ssoID = parsedUrl.searchParams.get(SEARCH_PARAM);
+            const store = readStore();
+            console.log("Forwarding to profile: ", store[ssoID]);
+            return store[ssoID];
+        }
+    }
+}
+
+export function protocolInit(): void {
+    // get all args except `hidden` as it'd mean the app would not get focused
+    // XXX: passing args to protocol handlers only works on Windows, so unpackaged deep-linking
+    // --profile/--profile-dir are passed via the SEARCH_PARAM var in the callback url
+    const args = process.argv.slice(1).filter(arg => arg !== "--hidden" && arg !== "-hidden");
+    if (app.isPackaged) {
+        app.setAsDefaultProtocolClient('element', process.execPath, args);
+    } else if (process.platform === 'win32') { // on Mac/Linux this would just cause the electron binary to open
+        // special handler for running without being packaged, e.g `electron .` by passing our app path to electron
+        app.setAsDefaultProtocolClient('element', process.execPath, [app.getAppPath(), ...args]);
+    }
+
+    if (process.platform === 'darwin') {
+        // Protocol handler for macos
+        app.on('open-url', function(ev, url) {
+            ev.preventDefault();
+            processUrl(url);
+        });
+    } else {
+        // Protocol handler for win32/Linux
+        app.on('second-instance', (ev, commandLine) => {
+            const url = commandLine[commandLine.length - 1];
+            if (!url.startsWith(PROTOCOL)) return;
+            processUrl(url);
+        });
+    }
+}
--- a/src/squirrelhooks.ts
+++ b/src/squirrelhooks.ts
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const path = require('path');
-const spawn = require('child_process').spawn;
-const {app} = require('electron');
-const fsProm = require('fs').promises;
+import path from "path";
+import { spawn } from "child_process";
+import { app } from "electron";
+import { promises as fsProm } from "fs";

-function runUpdateExe(args) {
+function runUpdateExe(args: string[]): Promise<void> {
    // Invokes Squirrel's Update.exe which will do things for us like create shortcuts
    // Note that there's an Update.exe in the app-x.x.x directory and one in the parent
    // directory: we need to run the one in the parent directory, because it discovers
@@ -28,20 +28,18 @@ function runUpdateExe(args) {
    console.log(`Spawning '${updateExe}' with args '${args}'`);
    return new Promise(resolve => {
        spawn(updateExe, args, {
-          detached: true,
+            detached: true,
        }).on('close', resolve);
    });
 }

-function checkSquirrelHooks() {
+function checkSquirrelHooks(): boolean {
    if (process.platform !== 'win32') return false;

    const cmd = process.argv[1];
    const target = path.basename(process.execPath);
    if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
-        Promise.resolve().then(() => {
-            return runUpdateExe(['--createShortcut=' + target]);
-        }).then(() => {
+        runUpdateExe(['--createShortcut=' + target]).then(() => {
            // remove the old 'Riot' shortcuts, if they exist (update.exe --removeShortcut doesn't work
            // because it always uses the name of the product as the name of the shortcut: the only variable
            // is what executable you're linking to)
@@ -83,4 +81,6 @@ function checkSquirrelHooks() {
    return false;
 }

-module.exports = checkSquirrelHooks;
+if (checkSquirrelHooks()) {
+    process.exit(1);
+}
--- a/src/tray.ts
+++ b/src/tray.ts
@@ -15,26 +15,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const {app, Tray, Menu, nativeImage} = require('electron');
-const pngToIco = require('png-to-ico');
-const path = require('path');
-const fs = require('fs');
-const { _t } = require('./language-helper');
+import { app, Tray, Menu, nativeImage } from "electron";
+import pngToIco from "png-to-ico";
+import path from "path";
+import fs from "fs";
+import { _t } from "./language-helper";

-let trayIcon = null;
+let trayIcon: Tray = null;

-exports.hasTray = function hasTray() {
+export function hasTray(): boolean {
    return (trayIcon !== null);
-};
+}

-exports.destroy = function() {
+export function destroy(): void {
    if (trayIcon) {
        trayIcon.destroy();
        trayIcon = null;
    }
-};
+}

-const toggleWin = function() {
+function toggleWin(): void {
    if (global.mainWindow.isVisible() && !global.mainWindow.isMinimized()) {
        global.mainWindow.hide();
    } else {
@@ -42,9 +42,14 @@ const toggleWin = function() {
        if (!global.mainWindow.isVisible()) global.mainWindow.show();
        global.mainWindow.focus();
    }
-};
+}

-exports.create = function(config) {
+interface IConfig {
+    icon_path: string; // eslint-disable-line camelcase
+    brand: string;
+}
+
+export function create(config: IConfig): void {
    // no trays on darwin
    if (process.platform === 'darwin' || trayIcon) return;
    const defaultIcon = nativeImage.createFromPath(config.icon_path);
@@ -89,9 +94,9 @@ exports.create = function(config) {
    global.mainWindow.webContents.on('page-title-updated', function(ev, title) {
        trayIcon.setToolTip(title);
    });
-};
+}

-function initApplicationMenu() {
+export function initApplicationMenu(): void {
    if (!trayIcon) {
        return;
    }
@@ -112,5 +117,3 @@ function initApplicationMenu() {

    trayIcon.setContextMenu(contextMenu);
 }
-
-exports.initApplicationMenu = initApplicationMenu;
--- a/src/updater.ts
+++ b/src/updater.ts
@@ -1,16 +1,32 @@
-const { app, autoUpdater, ipcMain } = require('electron');
+/*
+Copyright 2016-2021 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { app, autoUpdater, ipcMain } from "electron";

 const UPDATE_POLL_INTERVAL_MS = 60 * 60 * 1000;
 const INITIAL_UPDATE_DELAY_MS = 30 * 1000;

-function installUpdate() {
+function installUpdate(): void {
    // for some reason, quitAndInstall does not fire the
    // before-quit event, so we need to set the flag here.
    global.appQuitting = true;
    autoUpdater.quitAndInstall();
 }

-function pollForUpdates() {
+function pollForUpdates(): void {
    try {
        autoUpdater.checkForUpdates();
    } catch (e) {
@@ -18,8 +34,7 @@ function pollForUpdates() {
    }
 }

-module.exports = {};
-module.exports.start = function startAutoUpdate(updateBaseUrl) {
+export function start(updateBaseUrl: string): void {
    if (updateBaseUrl.slice(-1) !== '/') {
        updateBaseUrl = updateBaseUrl + '/';
    }
@@ -48,6 +63,7 @@ module.exports.start = function startAutoUpdate(updateBaseUrl) {
        }

        if (url) {
+            console.log(`Update URL: ${url}`);
            autoUpdater.setFeedURL(url);
            // We check for updates ourselves rather than using 'updater' because we need to
            // do it in the main process (and we don't really need to check every 10 minutes:
@@ -63,18 +79,25 @@ module.exports.start = function startAutoUpdate(updateBaseUrl) {
        // will fail if running in debug mode
        console.log('Couldn\'t enable update checking', err);
    }
-};
+}

 ipcMain.on('install_update', installUpdate);
 ipcMain.on('check_updates', pollForUpdates);

-function ipcChannelSendUpdateStatus(status) {
+function ipcChannelSendUpdateStatus(status: boolean | string): void {
    if (!global.mainWindow) return;
    global.mainWindow.webContents.send('check_updates', status);
 }

+interface ICachedUpdate {
+    releaseNotes: string;
+    releaseName: string;
+    releaseDate: Date;
+    updateURL: string;
+}
+
 // cache the latest update which has been downloaded as electron offers no api to read it
-let latestUpdateDownloaded;
+let latestUpdateDownloaded: ICachedUpdate;
 autoUpdater.on('update-available', function() {
    ipcChannelSendUpdateStatus(true);
 }).on('update-not-available', function() {
--- a/src/vectormenu.ts
+++ b/src/vectormenu.ts
@@ -14,12 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const {app, shell, Menu} = require('electron');
-const { _t } = require('./language-helper');
+import { app, shell, Menu, MenuItem, MenuItemConstructorOptions } from 'electron';
+import { _t } from './language-helper';

-function buildMenuTemplate() {
+const isMac = process.platform === 'darwin';
+
+export function buildMenuTemplate(): Menu {
    // Menu template from http://electron.atom.io/docs/api/menu/, edited
-    const template = [
+    const template: Array<(MenuItemConstructorOptions) | (MenuItem)> = [
        {
            label: _t('Edit'),
            accelerator: 'e',
@@ -46,7 +48,7 @@ function buildMenuTemplate() {
                    label: _t('Paste'),
                },
                {
-                    role: 'pasteandmatchstyle',
+                    role: 'pasteAndMatchStyle',
                    label: _t('Paste and Match Style'),
                },
                {
@@ -54,7 +56,7 @@ function buildMenuTemplate() {
                    label: _t('Delete'),
                },
                {
-                    role: 'selectall',
+                    role: 'selectAll',
                    label: _t('Select All'),
                },
            ],
@@ -65,30 +67,44 @@ function buildMenuTemplate() {
            submenu: [
                { type: 'separator' },
                {
-                    role: 'resetzoom',
+                    role: 'resetZoom',
+                    accelerator: 'CmdOrCtrl+Num0',
+                    visible: false,
+                },
+                {
+                    role: 'zoomIn',
+                    accelerator: 'CmdOrCtrl+NumAdd',
+                    visible: false,
+                },
+                {
+                    role: 'zoomOut',
+                    accelerator: 'CmdOrCtrl+NumSub',
+                    visible: false,
+                },
+                {
+                    role: 'resetZoom',
                    label: _t('Actual Size'),
                },
                {
-                    role: 'zoomin',
-                    accelerator: 'CommandOrControl+=',
+                    role: 'zoomIn',
                    label: _t('Zoom In'),
                },
                {
-                    role: 'zoomout',
+                    role: 'zoomOut',
                    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'),
                },
                {
-                    role: 'toggledevtools',
+                    role: 'toggleDevTools',
                    label: _t('Toggle Developer Tools'),
                },
            ],
@@ -122,7 +138,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 +146,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' },
                {
@@ -144,7 +166,7 @@ function buildMenuTemplate() {
                    label: _t('Hide'),
                },
                {
-                    role: 'hideothers',
+                    role: 'hideOthers',
                    label: _t('Hide Others'),
                },
                {
@@ -160,17 +182,17 @@ function buildMenuTemplate() {
        });
        // Edit menu.
        // This has a 'speech' section on macOS
-        template[1].submenu.push(
+        (template[1].submenu as MenuItemConstructorOptions[]).push(
            { type: 'separator' },
            {
                label: _t('Speech'),
                submenu: [
                    {
-                        role: 'startspeaking',
+                        role: 'startSpeaking',
                        label: _t('Start Speaking'),
                    },
                    {
-                        role: 'stopspeaking',
+                        role: 'stopSpeaking',
                        label: _t('Stop Speaking'),
                    },
                ],
@@ -221,6 +243,3 @@ function buildMenuTemplate() {

    return Menu.buildFromTemplate(template);
 }
-
-module.exports = buildMenuTemplate;
-
--- a/src/webcontents-handler.ts
+++ b/src/webcontents-handler.ts
@@ -1,19 +1,49 @@
-const {clipboard, nativeImage, Menu, MenuItem, shell, dialog, ipcMain} = require('electron');
-const url = require('url');
-const fs = require('fs');
-const request = require('request');
-const path = require('path');
-const { _t } = require('./language-helper');
+/*
+Copyright 2021 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+    clipboard,
+    nativeImage,
+    Menu,
+    MenuItem,
+    shell,
+    dialog,
+    ipcMain,
+    NativeImage,
+    WebContents,
+    ContextMenuParams,
+    DownloadItem,
+    MenuItemConstructorOptions,
+    IpcMainEvent,
+} from 'electron';
+import url from 'url';
+import fs from 'fs';
+import request from 'request';
+import path from 'path';
+import { _t } from './language-helper';

 const MAILTO_PREFIX = "mailto:";

-const PERMITTED_URL_SCHEMES = [
+const PERMITTED_URL_SCHEMES: string[] = [
    'http:',
    'https:',
    MAILTO_PREFIX,
 ];

-function safeOpenURL(target) {
+function safeOpenURL(target: string): void {
    // openExternal passes the target to open/start/xdg-open,
    // so put fairly stringent limits on what can be opened
    // (for instance, open /bin/sh does indeed open a terminal
@@ -28,7 +58,7 @@ function safeOpenURL(target) {
    }
 }

-function onWindowOrNavigate(ev, target) {
+function onWindowOrNavigate(ev: Event, target: string): void {
    // always prevent the default: if something goes wrong,
    // we don't want to end up opening it in the electron
    // app, as we could end up opening any sort of random
@@ -37,7 +67,7 @@ function onWindowOrNavigate(ev, target) {
    safeOpenURL(target);
 }

-function writeNativeImage(filePath, img) {
+function writeNativeImage(filePath: string, img: NativeImage): Promise<void> {
    switch (filePath.split('.').pop().toLowerCase()) {
        case "jpg":
        case "jpeg":
@@ -50,8 +80,7 @@ function writeNativeImage(filePath, img) {
    }
 }

-
-function onLinkContextMenu(ev, params) {
+function onLinkContextMenu(ev: Event, params: ContextMenuParams, webContents: WebContents): void {
    let url = params.linkURL || params.srcURL;

    if (url.startsWith('vector://vector/webapp')) {
@@ -77,7 +106,7 @@ function onLinkContextMenu(ev, params) {
            label: _t('Copy image'),
            accelerator: 'c',
            click() {
-                ev.sender.copyImageAt(params.x, params.y);
+                webContents.copyImageAt(params.x, params.y);
            },
        }));
    }
@@ -109,10 +138,10 @@ function onLinkContextMenu(ev, params) {
    if (params.hasImageContents && !url.startsWith('blob:')) {
        popupMenu.append(new MenuItem({
            label: _t('Save image as...'),
-            accelerator: 'a',
+            accelerator: 's',
            async click() {
                const targetFileName = params.titleText || "image.png";
-                const {filePath} = await dialog.showSaveDialog({
+                const { filePath } = await dialog.showSaveDialog({
                    defaultPath: targetFileName,
                });

@@ -141,8 +170,8 @@ function onLinkContextMenu(ev, params) {
    ev.preventDefault();
 }

-function _CutCopyPasteSelectContextMenus(params) {
-    const options = [];
+function cutCopyPasteSelectContextMenus(params: ContextMenuParams): MenuItemConstructorOptions[] {
+    const options: MenuItemConstructorOptions[] = [];

    if (params.misspelledWord) {
        params.dictionarySuggestions.forEach(word => {
@@ -181,10 +210,10 @@ function _CutCopyPasteSelectContextMenus(params) {
        accelerator: 'p',
        enabled: params.editFlags.canPaste,
    }, {
-        role: 'pasteandmatchstyle',
+        role: 'pasteAndMatchStyle',
        enabled: params.editFlags.canPaste,
    }, {
-        role: 'selectall',
+        role: 'selectAll',
        label: _t("Select All"),
        accelerator: 'a',
        enabled: params.editFlags.canSelectAll,
@@ -193,7 +222,7 @@ function _CutCopyPasteSelectContextMenus(params) {
 }

 function onSelectedContextMenu(ev, params) {
-    const items = _CutCopyPasteSelectContextMenus(params);
+    const items = cutCopyPasteSelectContextMenus(params);
    const popupMenu = Menu.buildFromTemplate(items);

    // popup() requires an options object even for no options
@@ -201,12 +230,13 @@ function onSelectedContextMenu(ev, params) {
    ev.preventDefault();
 }

-function onEditableContextMenu(ev, params) {
-    const items = [
+function onEditableContextMenu(ev: Event, params: ContextMenuParams) {
+    const items: MenuItemConstructorOptions[] = [
        { role: 'undo' },
        { role: 'redo', enabled: params.editFlags.canRedo },
        { type: 'separator' },
-    ].concat(_CutCopyPasteSelectContextMenus(params));
+        ...cutCopyPasteSelectContextMenus(params),
+    ];

    const popupMenu = Menu.buildFromTemplate(items);

@@ -215,20 +245,20 @@ function onEditableContextMenu(ev, params) {
    ev.preventDefault();
 }

-ipcMain.on('userDownloadOpen', function(ev, {path}) {
+ipcMain.on('userDownloadOpen', function(ev: IpcMainEvent, { path }) {
    shell.openPath(path);
 });

-module.exports = (webContents) => {
+export default (webContents: WebContents): void => {
    webContents.on('new-window', onWindowOrNavigate);
-    webContents.on('will-navigate', (ev, target) => {
+    webContents.on('will-navigate', (ev: Event, target: string): void => {
        if (target.startsWith("vector://")) return;
        return onWindowOrNavigate(ev, target);
    });

-    webContents.on('context-menu', function(ev, params) {
+    webContents.on('context-menu', function(ev: Event, params: ContextMenuParams): void {
        if (params.linkURL || params.srcURL) {
-            onLinkContextMenu(ev, params);
+            onLinkContextMenu(ev, params, webContents);
        } else if (params.selectionText) {
            onSelectedContextMenu(ev, params);
        } else if (params.isEditable) {
@@ -236,7 +266,7 @@ module.exports = (webContents) => {
        }
    });

-    webContents.session.on('will-download', (event, item) => {
+    webContents.session.on('will-download', (event: Event, item: DownloadItem): void => {
        item.once('done', (event, state) => {
            if (state === 'completed') {
                const savePath = item.getSavePath();
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "target": "es2016",
+    "noImplicitAny": false,
+    "sourceMap": false,
+    "outDir": "./lib",
+    "rootDir": "./src",
+    "declaration": true,
+    "lib": [
+      "es2019",
+      "dom"
+    ]
+  },
+  "include": [
+    "./src/**/*.ts"
+  ]
+}
--- a/yarn.lock
+++ b/yarn.lock