Merge branch 'develop' into feature-multi-language-spell-check

CHANGELOG.md

@@ -1,3 +1,140 @@
+Changes in [1.7.20](https://github.com/vector-im/element-web/releases/tag/v1.7.20) (2021-02-04)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.19...v1.7.20)
+
+ * Upgrade to React SDK 3.13.1
+
+Changes in [1.7.19](https://github.com/vector-im/element-web/releases/tag/v1.7.19) (2021-02-03)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.19-rc.1...v1.7.19)
+
+ * Upgrade to React SDK 3.13.0 and JS SDK 9.6.0
+ * [Release] Upgrade matrix-widget-api
+   [\#16348](https://github.com/vector-im/element-web/pull/16348)
+
+Changes in [1.7.19-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.19-rc.1) (2021-01-29)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.18...v1.7.19-rc.1)
+
+ * Upgrade to React SDK 3.13.0-rc.1 and JS SDK 9.6.0-rc.1
+ * Translations update from Weblate
+   [\#16314](https://github.com/vector-im/element-web/pull/16314)
+ * Use history replaceState instead of redirect for SSO flow
+   [\#16292](https://github.com/vector-im/element-web/pull/16292)
+ * Document the mobile guide toast option
+   [\#16301](https://github.com/vector-im/element-web/pull/16301)
+ * Update widget-api to beta.12
+   [\#16303](https://github.com/vector-im/element-web/pull/16303)
+ * Upgrade deps 2021-01
+   [\#16294](https://github.com/vector-im/element-web/pull/16294)
+ * Move to newer base image for Docker builds
+   [\#16275](https://github.com/vector-im/element-web/pull/16275)
+ * Docs for the VoIP translate pattern option
+   [\#16236](https://github.com/vector-im/element-web/pull/16236)
+ * Fix Riot->Element in permalinkPrefix docs
+   [\#16227](https://github.com/vector-im/element-web/pull/16227)
+ * Supply server_name for optional federation-capable Jitsi auth
+   [\#16215](https://github.com/vector-im/element-web/pull/16215)
+ * Fix Widget API version confusion
+   [\#16212](https://github.com/vector-im/element-web/pull/16212)
+ * Add Hebrew language
+   [\#16210](https://github.com/vector-im/element-web/pull/16210)
+ * Update widget-api to beta 11
+   [\#16177](https://github.com/vector-im/element-web/pull/16177)
+ * Fix develop Docker builds
+   [\#16192](https://github.com/vector-im/element-web/pull/16192)
+ * Skip the service worker for Electron
+   [\#16157](https://github.com/vector-im/element-web/pull/16157)
+ * Use isolated IPC API
+   [\#16137](https://github.com/vector-im/element-web/pull/16137)
+
+Changes in [1.7.18](https://github.com/vector-im/element-web/releases/tag/v1.7.18) (2021-01-26)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.17...v1.7.18)
+
+ * Upgrade to React SDK 3.12.1 and JS SDK 9.5.1
+
+Changes in [1.7.17](https://github.com/vector-im/element-web/releases/tag/v1.7.17) (2021-01-18)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.17-rc.1...v1.7.17)
+
+ * Upgrade to React SDK 3.12.0 and JS SDK 9.5.0
+
+Changes in [1.7.17-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.17-rc.1) (2021-01-13)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16...v1.7.17-rc.1)
+
+ * Upgrade to React SDK 3.12.0-rc.1 and JS SDK 9.5.0-rc.1
+ * Translations update from Weblate
+   [\#16131](https://github.com/vector-im/element-web/pull/16131)
+ * webplatform: Fix notification closing
+   [\#16028](https://github.com/vector-im/element-web/pull/16028)
+ * Stop building code and types for Element layer
+   [\#15999](https://github.com/vector-im/element-web/pull/15999)
+
+Changes in [1.7.16](https://github.com/vector-im/element-web/releases/tag/v1.7.16) (2020-12-21)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16-rc.1...v1.7.16)
+
+ * Upgrade to React SDK 3.11.1 and JS SDK 9.4.1
+
+Changes in [1.7.16-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.16-rc.1) (2020-12-16)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.15...v1.7.16-rc.1)
+
+ * Upgrade to React SDK 3.11.0-rc.2 and JS SDK 9.4.0-rc.2
+ * Translations update from Weblate
+   [\#15979](https://github.com/vector-im/element-web/pull/15979)
+ * Bump ini from 1.3.5 to 1.3.7
+   [\#15949](https://github.com/vector-im/element-web/pull/15949)
+ * Document pull request previews
+   [\#15937](https://github.com/vector-im/element-web/pull/15937)
+ * Improve asset path for KaTeX fonts
+   [\#15939](https://github.com/vector-im/element-web/pull/15939)
+ * Fix an important semicolon
+   [\#15912](https://github.com/vector-im/element-web/pull/15912)
+ * Bump highlight.js from 10.1.2 to 10.4.1
+   [\#15898](https://github.com/vector-im/element-web/pull/15898)
+ * Add gitter.im to room directory
+   [\#15894](https://github.com/vector-im/element-web/pull/15894)
+ * Extend Platform to support idpId for SSO flows
+   [\#15771](https://github.com/vector-im/element-web/pull/15771)
+ * Include KaTeX CSS as a dependency
+   [\#15843](https://github.com/vector-im/element-web/pull/15843)
+
+Changes in [1.7.15](https://github.com/vector-im/element-web/releases/tag/v1.7.15) (2020-12-07)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.15-rc.1...v1.7.15)
+
+ * Upgrade to React SDK 3.10.0 and JS SDK 9.3.0
+
+Changes in [1.7.15-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.15-rc.1) (2020-12-02)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14...v1.7.15-rc.1)
+
+ * Upgrade to React SDK 3.10.0-rc.1 and JS SDK 9.3.0-rc.1
+ * Include KaTeX CSS as a dependency
+   [\#15843](https://github.com/vector-im/element-web/pull/15843)
+ * Translations update from Weblate
+   [\#15884](https://github.com/vector-im/element-web/pull/15884)
+ * added katex.min.css to webpack for math support (main PR in matrix-react-
+   sdk)
+   [\#15277](https://github.com/vector-im/element-web/pull/15277)
+ * Rebrand package name and other details
+   [\#15828](https://github.com/vector-im/element-web/pull/15828)
+ * Bump highlight.js from 9.18.1 to 10.1.2
+   [\#15819](https://github.com/vector-im/element-web/pull/15819)
+ * Update branding of packaging artifacts
+   [\#15810](https://github.com/vector-im/element-web/pull/15810)
+ * Update the react-sdk reference in the lockfile
+   [\#15814](https://github.com/vector-im/element-web/pull/15814)
+ * Update widget API for good measure in Element Web
+   [\#15812](https://github.com/vector-im/element-web/pull/15812)
+ * Stop publishing Element to NPM
+   [\#15811](https://github.com/vector-im/element-web/pull/15811)
+ * Add inotify instance limit info to README
+   [\#15795](https://github.com/vector-im/element-web/pull/15795)
+
 Changes in [1.7.14](https://github.com/vector-im/element-web/releases/tag/v1.7.14) (2020-11-23)
 ===============================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14-rc.1...v1.7.14)

Dockerfile

@@ -1,5 +1,5 @@
 # Builder
-FROM node:12 as builder
+FROM node:14-buster as builder
 
 # Support custom branches of the react-sdk and js-sdk. This also helps us build
 # images of element-web develop.

README.md

@@ -31,7 +31,7 @@ Getting Started
 ===============
 
 The easiest way to test Element is to just use the hosted copy at https://app.element.io.
-The `develop` branch is continuously deployed by Jenkins at https://develop.element.io
+The `develop` branch is continuously deployed to https://develop.element.io
 for those who like living dangerously.
 
 To host your own copy of Element, the quickest bet is to use a pre-built
@@ -58,8 +58,11 @@ and thus allowed.
 To install Element as a desktop application, see [Running as a desktop
 app](#running-as-a-desktop-app) below.
 
-Important Security Note
+Important Security Notes
-=======================
+========================
+
+Separate domains
+----------------
 
 We do not recommend running Element from the same domain name as your Matrix
 homeserver.  The reason is the risk of XSS (cross-site-scripting)
@@ -71,6 +74,45 @@ We have put some coarse mitigations into place to try to protect against this
 situation, but it's still not good practice to do it in the first place.  See
 https://github.com/vector-im/element-web/issues/1977 for more details.
 
+Configuration best practices
+----------------------------
+
+Unless you have special requirements, you will want to add the following to
+your web server configuration when hosting Element Web:
+
+- The `X-Frame-Options: SAMEORIGIN` header, to prevent Element Web from being
+  framed and protect from [clickjacking][owasp-clickjacking].
+- The `frame-ancestors 'none'` directive to your `Content-Security-Policy`
+  header, as the modern replacement for `X-Frame-Options` (though both should be
+  included since not all browsers support it yet, see
+  [this][owasp-clickjacking-csp]).
+- The `X-Content-Type-Options: nosniff` header, to [disable MIME
+  sniffing][mime-sniffing].
+- The `X-XSS-Protection: 1; mode=block;` header, for basic XSS protection in
+  legacy browsers.
+
+[mime-sniffing]:
+<https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#mime_sniffing>
+
+[owasp-clickjacking-csp]:
+<https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html#content-security-policy-frame-ancestors-examples>
+
+[owasp-clickjacking]:
+<https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html>
+
+If you are using nginx, this would look something like the following:
+
+```
+add_header X-Frame-Options SAMEORIGIN;
+add_header X-Content-Type-Options nosniff;
+add_header X-XSS-Protection "1; mode=block";
+add_header Content-Security-Policy "frame-ancestors 'none'";
+```
+
+Note: In case you are already setting a `Content-Security-Policy` header
+elsewhere, you should modify it to include the `frame-ancestors` directive
+instead of adding that last line.
+
 Building From Source
 ====================
 
@@ -99,7 +141,8 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread
 Note that `yarn dist` is not supported on Windows, so Windows users can run `yarn build`,
 which will build all the necessary files into the `webapp` directory. The version of Element
 will not appear in Settings without using the dist script. You can then mount the
-`webapp` directory on your webserver to actually serve up the app, which is entirely static content.
+`webapp` directory on your web server to actually serve up the app, which is
+entirely static content.
 
 Running as a Desktop app
 ========================

babel.config.js

@@ -8,7 +8,7 @@ module.exports = {
         }],
         "@babel/preset-typescript",
         "@babel/preset-flow",
-        "@babel/preset-react"
+        "@babel/preset-react",
     ],
     "plugins": [
         ["@babel/plugin-proposal-decorators", {legacy: true}],
@@ -16,8 +16,10 @@ module.exports = {
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
         "@babel/plugin-proposal-object-rest-spread",
+        "@babel/plugin-proposal-optional-chaining",
+        "@babel/plugin-proposal-nullish-coalescing-operator",
         "@babel/plugin-transform-flow-comments",
         "@babel/plugin-syntax-dynamic-import",
-        "@babel/plugin-transform-runtime"
+        "@babel/plugin-transform-runtime",
-    ]
+    ],
 };

docs/config.md

@@ -82,8 +82,8 @@ For a good example, see https://develop.element.io/config.json.
    default homeserver when signing up or logging in.
 1. `permalinkPrefix`: Used to change the URL that Element generates permalinks with.
    By default, this is "https://matrix.to" to generate matrix.to (spec) permalinks.
-   Set this to your Riot instance URL if you run an unfederated server (eg:
+   Set this to your Element instance URL if you run an unfederated server (eg:
-   "https://riot.example.org").
+   "https://element.example.org").
 1. `jitsi`: Used to change the default conference options. Learn more about the
    Jitsi options at [jitsi.md](./jitsi.md).
     1. `preferredDomain`: The domain name of the preferred Jitsi instance. Defaults
@@ -110,6 +110,21 @@ For a good example, see https://develop.element.io/config.json.
    1. `logo`: An HTTP URL to the avatar for the desktop build. Should be 24x24, ideally
       an SVG.
    1. `url`: An HTTP URL for where to send the user to download the desktop build.
+1. `voip_mxid_translate_pattern`: Used to route VoIP calls to different Matrix IDs.
+   Any VoIP calls placed will instead be placed to the translated Matrix ID from the
+   pattern string but still appear to be with the original Matrix ID. Correspondingly,
+   incoming VoIP calls will be made to appear as if they came from a different Matrix ID.
+   The value is a template string with substitution `$(mxid)` which is the complete
+   URL-encoded native Matrix ID, using '=' instead of '%'. For example, a value of
+   `@_myappservice_$(mxid):example.org` would cause any VoIP call to `@bob:foo.example`
+   to be redirected to `@_myappservice_=40bob=3Afoo.example:example.org` and calls
+   from the latter to appear as if they were from the former.
+   This option is experimental and may be removed at any time without notice. It's
+   also strongly advised not to set this option unless you're absolutly certain you
+   know what you're doing.
+1. `mobileGuideToast`: Whether to show a toast a startup which nudges users on
+   iOS and Android towards the native mobile apps. The toast redirects to the
+   mobile guide if they accept. Defaults to false.
 
 Note that `index.html` also has an og:image meta tag that is set to an image
 hosted on riot.im. This is the image used if links to your copy of Element

docs/pr-previews.md

@@ -0,0 +1,33 @@
+# Pull Request Previews
+
+Pull requests to the React SDK layer (and in the future other layers as well)
+automatically set up a preview site with a full deployment of Element with the
+changes from the pull request added in so that anyone can easily test and review
+them. This is especially useful for checking visual and interactive changes.
+
+To access the preview site, scroll down to the bottom of the PR where the
+various CI results are displayed:
+
+![Pull request: checks section](./img/pr-checks.png)
+
+The checks section could be collapsed at first, so you may need to click "Show
+all checks" to reveal them. Look for an entry that mentions `deploy-preview`. It
+may be at the end of the list, so you may need scroll a bit to see it. To access
+the preview site, click the "Details" link in the deploy preview row.
+
+**Important:** Please always use test accounts when logging into preview sites,
+as they may contain unreviewed and potentially dangerous code that could damage
+your account, exfiltrate encryption keys, etc.
+
+## FAQs
+
+### Are preview sites created for pull requests from contributors?
+
+Yes, they are created for all PRs from any author.
+
+### Do preview sites expire after some time period?
+
+No, there is no expiry date, so they should remain accessible indefinitely, but
+of course they obviously aren't meant to live beyond the development workflow,
+so please don't rely on them for anything important. They may disappear at any
+time without notice.

docs/review.md

@@ -73,10 +73,9 @@ functionality is:
   required (though may still be useful) since we can continue tweaking
 
 As it can be difficult to review design work from looking at just the changed
-files in a PR, authors should be prepared for Design and / or Product teams to
+files in a PR, a [preview site](./pr-previews.md) that includes your changes
-request a link to an ad-hoc build of Element (hosted anywhere) that can be used for
+will be added automatically so that anyone who's interested can try them out
-the review. In the future, we [hope to automate
+easily.
-this](https://github.com/vector-im/element-web/issues/12624) for every PR.
 
 Before starting work on a feature, it's best to ensure your plan aligns well
 with our vision for Element. Please chat with the team in

element.io/app/config.json

@@ -20,7 +20,8 @@
     },
     "roomDirectory": {
         "servers": [
-            "matrix.org"
+            "matrix.org",
+            "gitter.im"
         ]
     },
     "enable_presence_by_hs_url": {

element.io/develop/config.json

@@ -24,7 +24,8 @@
     },
     "roomDirectory": {
         "servers": [
-            "matrix.org"
+            "matrix.org",
+            "gitter.im"
         ]
     },
     "enable_presence_by_hs_url": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.7.14",
+  "version": "1.7.20",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -34,16 +34,14 @@
     "reskindex:watch": "reskindex -h src/header -w",
     "reskindex:watch-react": "node scripts/yarn-sub.js matrix-react-sdk reskindex:watch",
     "clean": "rimraf lib webapp",
-    "build": "yarn clean && yarn build:genfiles && yarn build:compile && yarn build:types && yarn build:bundle",
+    "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
-    "build-stats": "yarn clean && yarn build:genfiles && yarn build:compile && yarn build:types && yarn build:bundle-stats",
+    "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
     "build:jitsi": "node scripts/build-jitsi.js",
     "build:res": "node scripts/copy-res.js",
     "build:genfiles": "yarn reskindex && yarn build:res && yarn build:jitsi",
     "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
-    "build:compile": "babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
     "build:bundle": "webpack --progress --bail --mode production",
     "build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
-    "build:types": "tsc --emitDeclarationOnly --jsx react",
     "dist": "scripts/package.sh",
     "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,element-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"",
     "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
@@ -57,95 +55,100 @@
   "dependencies": {
     "browser-request": "^0.3.3",
     "gfm.css": "^1.1.2",
-    "highlight.js": "^10.1.2",
+    "highlight.js": "^10.5.0",
-    "jsrsasign": "^9.1.5",
+    "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.10",
+    "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
-    "react": "^16.9.0",
+    "react": "^16.14.0",
-    "react-dom": "^16.9.0",
+    "react-dom": "^16.14.0",
     "sanitize-html": "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db",
-    "ua-parser-js": "^0.7.19",
+    "ua-parser-js": "^0.7.23",
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5",
+    "@babel/core": "^7.12.10",
-    "@babel/core": "^7.7.5",
+    "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
+    "@babel/plugin-proposal-decorators": "^7.12.12",
-    "@babel/plugin-proposal-decorators": "^7.7.4",
+    "@babel/plugin-proposal-export-default-from": "^7.12.1",
-    "@babel/plugin-proposal-export-default-from": "^7.7.4",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-    "@babel/plugin-proposal-numeric-separator": "^7.7.4",
+    "@babel/plugin-proposal-numeric-separator": "^7.12.7",
-    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-    "@babel/plugin-transform-flow-comments": "^7.7.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/plugin-transform-flow-comments": "^7.12.1",
-    "@babel/preset-env": "^7.7.6",
+    "@babel/plugin-transform-runtime": "^7.12.10",
-    "@babel/preset-flow": "^7.7.4",
+    "@babel/preset-env": "^7.12.11",
-    "@babel/preset-react": "^7.7.4",
+    "@babel/preset-flow": "^7.12.1",
-    "@babel/preset-typescript": "^7.7.4",
+    "@babel/preset-react": "^7.12.10",
-    "@babel/register": "^7.7.4",
+    "@babel/preset-typescript": "^7.12.7",
-    "@babel/runtime": "^7.7.6",
+    "@babel/register": "^7.12.10",
+    "@babel/runtime": "^7.12.5",
     "@types/flux": "^3.1.9",
     "@types/modernizr": "^3.5.3",
-    "@types/node": "^12.12.41",
+    "@types/node": "^14.14.22",
-    "@types/react": "16.9",
+    "@types/react": "^16.9",
-    "@types/react-dom": "^16.9.4",
+    "@types/react-dom": "^16.9.10",
-    "@types/sanitize-html": "^1.23.3",
+    "@types/sanitize-html": "^1.27.1",
-    "autoprefixer": "^9.7.3",
+    "autoprefixer": "^9.8.6",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
-    "babel-jest": "^24.9.0",
+    "babel-jest": "^26.6.3",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.2.2",
     "canvas": "^2.6.1",
-    "chokidar": "^3.3.1",
+    "chokidar": "^3.5.1",
-    "concurrently": "^4.0.1",
+    "concurrently": "^5.3.0",
-    "cpx": "^1.3.2",
+    "cpx": "^1.5.0",
-    "css-loader": "^3.3.2",
+    "css-loader": "^3.6.0",
-    "eslint": "7.3.1",
+    "eslint": "7.18.0",
-    "eslint-config-matrix-org": "^0.1.2",
+    "eslint-config-matrix-org": "^0.2.0",
-    "eslint-plugin-babel": "^4.1.2",
+    "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-flowtype": "^2.50.3",
+    "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-react": "^7.11.1",
+    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-react-hooks": "^2.2.0",
+    "eslint-plugin-react-hooks": "^4.2.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "fake-indexeddb": "^3.0.0",
+    "fake-indexeddb": "^3.1.2",
-    "file-loader": "^5.0.2",
+    "file-loader": "^5.1.0",
     "fs-extra": "^0.30.0",
     "html-webpack-plugin": "^3.2.0",
-    "jest": "^26.5.2",
+    "jest": "^26.6.3",
     "jest-environment-jsdom-sixteen": "^1.0.3",
-    "json-loader": "^0.5.3",
+    "json-loader": "^0.5.7",
-    "loader-utils": "^1.2.3",
+    "loader-utils": "^1.4.0",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
-    "mini-css-extract-plugin": "^0.8.0",
+    "mini-css-extract-plugin": "^0.12.0",
-    "minimist": "^1.2.0",
+    "minimist": "^1.2.5",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.4",
-    "modernizr": "^3.6.0",
+    "modernizr": "^3.11.4",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^2.6.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "optimize-css-assets-webpack-plugin": "^5.0.4",
+    "postcss-calc": "^7.0.5",
     "postcss-easings": "^2.0.0",
     "postcss-extend": "^1.0.5",
-    "postcss-hexrgba": "^2.0.0",
+    "postcss-hexrgba": "^2.0.1",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "postcss-mixins": "^6.2.3",
-    "postcss-nested": "^4.2.1",
+    "postcss-nested": "^4.2.3",
     "postcss-preset-env": "^6.7.0",
-    "postcss-scss": "^2.0.0",
+    "postcss-scss": "^2.1.1",
     "postcss-simple-vars": "^5.0.2",
     "postcss-strip-inline-comments": "^0.1.5",
-    "rimraf": "^2.4.3",
+    "rimraf": "^3.0.2",
     "shell-escape": "^0.2.0",
     "simple-proxy-agent": "^1.1.0",
-    "stylelint": "^12.0.1",
+    "stylelint": "^13.9.0",
-    "terser-webpack-plugin": "^2.3.0",
+    "terser-webpack-plugin": "^2.3.8",
-    "typescript": "^3.7.3",
+    "typescript": "^4.1.3",
-    "webpack": "^4.41.2",
+    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.10",
+    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.9.0"
+    "webpack-dev-server": "^3.11.2"
+  },
+  "resolutions": {
+    "**/@types/react": "^16.14"
   },
   "jest": {
     "testEnvironment": "jest-environment-jsdom-sixteen",

scripts/copy-res.js

@@ -26,6 +26,7 @@ const INCLUDE_LANGS = [
     {'value': 'fi', 'label': 'Suomi'},
     {'value': 'fr', 'label': 'Français'},
     {'value': 'gl', 'label': 'Galego'},
+    {'value': 'he', 'label': 'עברית'},
     {'value': 'hi', 'label': 'हिन्दी'},
     {'value': 'hu', 'label': 'Magyar'},
     {'value': 'is', 'label': 'íslenska'},

scripts/docker-link-repos.sh

@@ -32,6 +32,7 @@ cd react-sdk
 yarn link
 yarn link matrix-js-sdk
 yarn --network-timeout=100000 install
+yarn reskindex
 cd ../
 
 echo "Setting up element-web with react-sdk and js-sdk packages"

scripts/fetch-develop.deps.sh

@@ -77,7 +77,6 @@ dodep matrix-org matrix-js-sdk
 pushd matrix-js-sdk
 yarn link
 yarn install
-yarn build
 popd
 
 yarn link matrix-js-sdk
@@ -92,7 +91,7 @@ pushd matrix-react-sdk
 yarn link
 yarn link matrix-js-sdk
 yarn install
-yarn build
+yarn reskindex
 popd
 
 yarn link matrix-react-sdk

src/@types/global.d.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 New Vector Ltd
+Copyright 2020, 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.
@@ -17,21 +17,42 @@ limitations under the License.
 import "matrix-react-sdk/src/@types/global"; // load matrix-react-sdk's type extensions first
 import type {Renderer} from "react-dom";
 
+type ElectronChannel =
+    "app_onAction" |
+    "before-quit" |
+    "check_updates" |
+    "install_update" |
+    "ipcCall" |
+    "ipcReply" |
+    "loudNotification" |
+    "preferences" |
+    "seshat" |
+    "seshatReply" |
+    "setBadgeCount" |
+    "update-downloaded" |
+    "userDownloadCompleted" |
+    "userDownloadOpen";
+
 declare global {
     interface Window {
         mxSendRageshake: (text: string, withLogs?: boolean) => void;
         matrixChat: ReturnType<Renderer>;
 
         // electron-only
-        ipcRenderer: any;
+        electron?: Electron;
 
         // opera-only
-        opera: any;
+        opera?: any;
 
         // https://developer.mozilla.org/en-US/docs/Web/API/InstallTrigger
         InstallTrigger: any;
     }
 
+    interface Electron {
+        on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void;
+        send(channel: ElectronChannel, ...args: any[]): void;
+    }
+
     interface Navigator {
         // PWA badging extensions https://w3c.github.io/badging/
         setAppBadge?(count: number): Promise<void>;

src/i18n/strings/cs.json

@@ -28,5 +28,9 @@
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Pro nejlepší zážitek si prosím nainstalujte prohlížeč <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, nebo <safariLink>Safari</safariLink>.",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Můžete pokračovat v užívání vašeho současného prohlížeče, ale některé (nebo dokonce všechny) funkce nemusí fungovat a vzhled a chování aplikace nemusí být správné.",
     "I understand the risks and wish to continue": "Rozumím a přesto chci pokračovat",
-    "Go to element.io": "Přejít na element.io"
+    "Go to element.io": "Přejít na element.io",
+    "Failed to start": "Nepovedlo se nastartovat",
+    "Powered by Matrix": "Běží na Matrixu",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)",
+    "Missing indexeddb worker script!": "Nenačetl se skript spravující indexdb!"
 }

src/i18n/strings/da.json

@@ -9,20 +9,28 @@
     "Invalid JSON": "Ugyldig JSON",
     "Unexpected error preparing the app. See console for details.": "Uventet fejl ved forberedelse af appen. Se konsollen for detaljer.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfiguration: kan kun angive en af default_server_config, default_server_name eller default_hs_url.",
-    "Invalid configuration: no default server specified.": "Ugyldig konfiguration: ingen standardserver angivet.",
+    "Invalid configuration: no default server specified.": "Ugyldig konfiguration: Ingen standardserver er angivet.",
     "Sign In": "Log ind",
     "Create Account": "Opret brugerkonto",
     "Explore rooms": "Udforsk rum",
     "Missing indexeddb worker script!": "Manglende indexeddb worker script!",
-    "Unable to load config file: please refresh the page to try again.": "Ikke i stand til at loade config fil: genopfrisk venligst siden for at prøve igen.",
+    "Unable to load config file: please refresh the page to try again.": "Ikke i stand til at indlæse konfigurationsfil: Genopfrisk venligst siden for at prøve igen.",
     "Open user settings": "Åbn brugerindstillinger",
     "Previous/next recently visited room or community": "Forrige/næste besøgte rum eller fællesskab",
     "Go to your browser to complete Sign In": "Gå til din browser for at færdiggøre Log ind",
     "Go to element.io": "Gå til element.io",
     "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker at fortsætte",
-    "Unsupported browser": "Usupporteret browser",
+    "Unsupported browser": "Browser ikke understøttet",
     "Open": "Åbn",
     "Download Completed": "Hentning færdig",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Element konfiguration indeholder ugyldig JSON. Løs venligst problemet og genindlæs siden.",
-    "Your Element is misconfigured": "Din Element er konfigureret forkert"
+    "Your Element is misconfigured": "Din Element er konfigureret forkert",
+    "Your browser can't run %(brand)s": "Din browser kan ikke køre %(brand)s",
+    "Powered by Matrix": "Drevet af Matrix",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Failed to start": "Opstart mislykkedes",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop %(platformName)s",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kan fortsætte med at bruge din nuværende browser, men du kan opleve at visse eller alle funktioner ikke vil fungere korrekt.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Venligst installer <chromeLink>Chrome</chromeLink>,<firefoxLink>Firefox</firefoxLink> eller <safariLink>Safari</safariLink> for den bedste oplevelse.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s bruger avanceret browser funktioner som ikke er understøttet af din nuværende browser."
 }

src/i18n/strings/de_DE.json

@@ -4,7 +4,7 @@
     "Unknown device": "Unbekanntes Gerät",
     "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.",
     "Welcome to Element": "Willkommen bei Element",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung unterstützt von [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung mittels [matrix]",
     "Sign In": "Anmelden",
     "Create Account": "Account erstellen",
     "Explore rooms": "Erkunde Räume",
@@ -24,7 +24,7 @@
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kannst mit diesem Browser weitermachen, aber einiges könnte nicht funktionieren und die Darstellung könnte fehlerhaft sein.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kannst mit deinem aktuellen Browser weiterhin verwenden, aber es kann sein, dass einige oder alle Funktionen nicht funktionieren und das Aussehen und die Bedienung der Anwendung nicht korrekt ist.",
     "I understand the risks and wish to continue": "Ich verstehe die Risiken und möchte fortfahren",
     "Your Element is misconfigured": "Dein Element ist fehlkonfiguriert",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine Element Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",

src/i18n/strings/en_US.json

@@ -12,5 +12,25 @@
     "Invalid JSON": "Invalid JSON",
     "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
-    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified."
+    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
+    "Failed to start": "Failed to start",
+    "Go to element.io": "Go to element.io",
+    "I understand the risks and wish to continue": "I understand the risks and wish to continue",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uses advanced browser features which aren't supported by your current browser.",
+    "Your browser can't run %(brand)s": "Your browser can't run %(brand)s",
+    "Unsupported browser": "Unsupported browser",
+    "Powered by Matrix": "Powered by Matrix",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Go to your browser to complete Sign In": "Go to your browser to complete Sign In",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
+    "Previous/next recently visited room or community": "Previous/next recently visited room or community",
+    "Open user settings": "Open user settings",
+    "Open": "Open",
+    "Download Completed": "Download Completed",
+    "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.",
+    "Your Element is misconfigured": "Your Element is misconfigured",
+    "Missing indexeddb worker script!": "Missing indexeddb worker script!"
 }

src/i18n/strings/et.json

@@ -3,7 +3,7 @@
     "Invalid JSON": "Vigane JSON",
     "Unknown device": "Tundmatu seade",
     "Invalid configuration: no default server specified.": "Vigane seadistus: vaikimisi server on määramata.",
-    "Unable to load config file: please refresh the page to try again.": "Seadistuste faili laadimine ei õnnestunud: uuesti proovimiseks palun lae leht uuesti.",
+    "Unable to load config file: please refresh the page to try again.": "Seadistuste faili laadimine ei õnnestunud: uuesti proovimiseks palun laadi leht uuesti.",
     "Unexpected error preparing the app. See console for details.": "Rakenduse ettevalmistamisel tekkis ootamatu viga. Täpsema teabe leiad konsoolist.",
     "Open user settings": "Ava kasutaja seadistused",
     "Go to your browser to complete Sign In": "Sisselogimiseks ava oma brauser",
@@ -29,7 +29,7 @@
     "Download Completed": "Allalaadimine on lõpetatud",
     "Open": "Ava",
     "Your Element is misconfigured": "Sinu Element on valesti seadistatud",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sinu Element'i seadistustes on vigased JSON-vormingus andmed. Palun paranda see viga ja lae leht uuesti.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sinu Element'i seadistustes on vigased JSON-vormingus andmed. Palun paranda see viga ja laadi leht uuesti.",
     "Your browser can't run %(brand)s": "%(brand)s ei toimi sinu brauseris",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid, mis ei ole veel sinu veebibrauseris toetatud.",
     "Powered by Matrix": "Põhineb Matrix'il"

src/i18n/strings/fr.json

@@ -4,7 +4,7 @@
     "Unknown device": "Appareil inconnu",
     "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
     "Welcome to Element": "Bienvenue sur Element",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Discussion & collaboration décentralisées et chiffrées, propulsées par [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Messagerie et collaboration décentralisées et chiffrées, propulsées par [matrix]",
     "Sign In": "Se connecter",
     "Create Account": "Créer un compte",
     "Explore rooms": "Explorer les salons",

src/i18n/strings/gl.json

@@ -12,7 +12,7 @@
     "Invalid JSON": "JSON non válido",
     "Unexpected error preparing the app. See console for details.": "Fallo non agardado ao preparar a app. Detalles na consola.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración non válida: só se pode indicar un de default_server_config, default_server_name, ou default_hs_url.",
-    "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por omisión.",
+    "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por defecto.",
     "Missing indexeddb worker script!": "Falta o script indexeddb!",
     "Unable to load config file: please refresh the page to try again.": "Non se cargou o ficheiro de configuración: actualiza a páxina para reintentalo.",
     "Open user settings": "Abrir axustes da usuaria",

src/i18n/strings/he.json

@@ -9,5 +9,28 @@
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "תצורה שגויה: ניתן לציין רק אחד מהבאים, default_server_config, default_server_name, או default_hs_url.",
     "Invalid configuration: no default server specified.": "תצורה שגויה: לא צוין שרת ברירת מחדל.",
     "Open user settings": "פתיחת הגדרות משתמש",
-    "Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות"
+    "Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות",
+    "Explore rooms": "שיטוט בחדרים",
+    "Create Account": "יצירת חשבון",
+    "Sign In": "כניסה",
+    "Previous/next recently visited room or community": "הבא\\קודם חדרים וקהילות שביקרתם לאחרונה",
+    "Open": "פתיחה",
+    "Download Completed": "ההורדה הושלמה",
+    "Unexpected error preparing the app. See console for details.": "שגיאה לא צפויה במהלך הכנת האפליקציה. ראו קונסול לפרטים נוספים.",
+    "Unable to load config file: please refresh the page to try again.": "לא יכול לקרוא את קובץ ההגדרות: אנא אתחלו את הדף לנסות שנית.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "האלמנט מכיל הגדרת JSON שגויה, אנא תקנו את הבעיה ואתחלו את הדף.",
+    "Your Element is misconfigured": "האלמנט מוגדר באופן שגוי",
+    "Go to element.io": "חזור לאתר הראשי: element.io",
+    "I understand the risks and wish to continue": "הסיכונים מובנים לי ואני מעוניינ/ת להמשיך",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "ניתן להמשיך ולהשתמש בדפדפן זה, אך ייתכן שחלק מן התכונות והמאפיינים לא יעבדו כשורה או ייראו כשגויים.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "נא התקן את דפדפן <chromeLink>כרום</chromeLink>, <firefoxLink>פיירפוקס</firefoxLink> או <safariLink>סאפרי</safariLink> בשביל החוויה הטובה ביותר.",
+    "Failed to start": "כשל בהעלאת התוכנה",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s משתמש בתכונות דפדפן מתקדמות שאינן נתמכות בדפדפן הנוכחי שלך.",
+    "Your browser can't run %(brand)s": "הדפדפן שלך לא יכול להריץ %(brand)s",
+    "Unsupported browser": "דפדפן לא נתמך",
+    "Powered by Matrix": "מופעל על ידי מטריקס",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s שולחן עבודה %(platformName)s",
+    "The message from the parser is: %(message)s": "ההודעה מהניתוח היא: %(message)s",
+    "Missing indexeddb worker script!": "חסר סקריפט עובד indexeddb!"
 }

src/i18n/strings/lv.json

@@ -1,25 +1,34 @@
 {
-    "Dismiss": "Atteikt",
+    "Dismiss": "Aizvērt",
     "powered by Matrix": "Tiek darbināta ar Matrix",
     "Unknown device": "Nezināma ierīce",
-    "You need to be using HTTPS to place a screen-sharing call.": "Lai izmantotu ekrāna kopīgošanas zvanu, nepieciešams izmantot HTTPS savienojumu.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Lai veiktu ekrāna kopīgošanas zvanu, nepieciešams izmantot HTTPS savienojumu.",
-    "Welcome to Element": "Esiet gaidīti Element",
+    "Welcome to Element": "Esiet laipni gaidīti Element",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizēta, šifrēta čata & kopdarbošanās sistēma uz [matrix] bāzes",
-    "Sign In": "Ienākt",
+    "Sign In": "Pierakstīties",
     "Create Account": "Izveidot kontu",
-    "Explore rooms": "Atklāt istabas",
+    "Explore rooms": "Pārlūkot istabas",
     "Unexpected error preparing the app. See console for details.": "Negaidīta kļūda, sagatavojot lietotni. Sīkāku informāciju skatiet konsolē.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nederīga konfigurācija: var norādīt tikai vienu no default_server_config, default_server_name, vai default_hs_url.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Kļūdaina konfigurācija: var norādīt tikai vienu no parametriem default_server_config, default_server_name, vai default_hs_url.",
-    "Invalid configuration: no default server specified.": "Nekorekta konfigurācija: nav norādīts noklusējuma serveris.",
+    "Invalid configuration: no default server specified.": "Kļūdaina konfigurācija: nav norādīts noklusējuma serveris.",
     "The message from the parser is: %(message)s": "Ziņojums no parsētāja ir: %(message)s",
-    "Invalid JSON": "Nederīgs JSON",
+    "Invalid JSON": "Kļūdains JSON",
-    "Unable to load config file: please refresh the page to try again.": "Neizdevās ielādēt config datni: lūdzu pārlādē lapu lai mēģinātu vēlreiz.",
+    "Unable to load config file: please refresh the page to try again.": "Neizdevās ielādēt konfigurācijas datni. Lūdzu, pārlādējiet lapu, lai mēģinātu vēlreiz.",
-    "Open user settings": "Atver lietotāja iestatījumus",
+    "Open user settings": "Atvērt lietotāja iestatījumus",
-    "Go to your browser to complete Sign In": "Aizej uz savu pārlūku lai pabeigtu Piekļuvi",
+    "Go to your browser to complete Sign In": "Pārejiet uz pārlūku, lai pabeigtu pierakstīšanos",
     "Unsupported browser": "Neatbalstīts pārlūks",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Lūdzu instalē <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, vai <safariLink>Safari</safariLink> priekš labākās pieredzes.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Labākajai izmantošanas pieredzei, lūdzu, instalē <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> vai <safariLink>Safari</safariLink> pārlūku.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Tu vari turpināt izmantot savu pašreizējo pārlūku, bet dažas vai visas funkcijas nestrādās, un lietotnes izskats var būt nepareizs.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jūs varat turpināt lietot savu pašreizējo pārlūku, bet dažas vai visas funkcijas nestrādās, un lietotnes izskats var būt nepareizs.",
     "I understand the risks and wish to continue": "Es pieņemu riskus un vēlos turpināt",
     "Go to element.io": "Ej uz element.io",
-    "Failed to start": "Neizdevās palaist"
+    "Failed to start": "Neizdevās palaist",
+    "Powered by Matrix": "Darbojas uz Matrix",
+    "Previous/next recently visited room or community": "Iepriekšējā/nākošā nesen apmeklētā istaba vai kopiena",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s izmanto pārlūku papildus funkcijas, kas netiek atbalstītas šajā pārlūkā.",
+    "Your browser can't run %(brand)s": "Jūsu pārlūks nevar palaist %(brand)s",
+    "Missing indexeddb worker script!": "Trūkst indexeddb worker skripta!",
+    "Open": "Atvērt",
+    "Download Completed": "Lejupielāde pabeigta",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsu Element konfigurācija satur kļūdainu JSON. Lūdzu, salabojiet problēmu un pārlādējiet lapu.",
+    "Your Element is misconfigured": "Jūsu Element ir nokonfigurēts kļūdaini"
 }

src/i18n/strings/ml.json

@@ -3,5 +3,21 @@
     "powered by Matrix": "മാട്രിക്സില്‍ പ്രവര്‍ത്തിക്കുന്നു",
     "Unknown device": "അപരിചിത ഡിവൈസ്",
     "You need to be using HTTPS to place a screen-sharing call.": "സ്ക്രീന്‍ ഷെയറിങ്ങ് കോള്‍ നടത്തണമെങ്കില്‍ https ഉപയോഗിക്കണം.",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "വികേന്ദ്രീകൃത , എന്‍ക്രിപ്റ്റഡ് ചാറ്റ് & മാട്രിക്സ് നല്‍കുന്ന കൊളാബൊറേഷന്‍"
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "വികേന്ദ്രീകൃത , എന്‍ക്രിപ്റ്റഡ് ചാറ്റ് & മാട്രിക്സ് നല്‍കുന്ന കൊളാബൊറേഷന്‍",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s%(browserName)s%(osName)s",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "ദയവായി <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, അല്ലെങ്കിൽ <safariLink>Safari</safariLink> ഇൻസ്റ്റാൾ ചെയ്യുക",
+    "Your Element is misconfigured": "നിങ്ങളുടെ Element തെറ്റായിട്ടാണ് കോൺഫിഗർ ചെയ്തിരിക്കുന്നത്",
+    "Invalid configuration: no default server specified.": "അസാധുവായ കോൺഫിഗറേഷൻ: സ്ഥിര സെർവരൊന്നും വ്യക്തമാക്കിയില്ല.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "അസാധുവായ കോൺഫിഗറേഷൻ: can only specify one of default_server_config, default_server_name, or default_hs_url.",
+    "Missing indexeddb worker script!": "Missing indexeddb worker script!",
+    "Open user settings": "യൂസർ ക്രമീകരങ്ങൾ തുറക്കുക",
+    "Download Completed": "ഡൗൺലോഡ് പൂർത്തിയായി",
+    "Unsupported browser": "പിന്തുണയ്‌ക്കാത്ത ബ്രൗസർ",
+    "I understand the risks and wish to continue": "ഞാൻ അപകടസാധ്യതകൾ മനസിലാക്കുകയും തുടരാൻ ആഗ്രഹിക്കുകയും ചെയ്യുന്നു",
+    "Go to element.io": "element.io-ലേക്ക് പോവുക",
+    "Failed to start": "ആരംഭിക്കാൻ പരാജയപെട്ടു",
+    "Welcome to Element": "Element-ലേക്ക് സ്വാഗതം",
+    "Sign In": "പ്രവേശിക്കുക",
+    "Create Account": "അക്കൗണ്ട് സൃഷ്ടിക്കുക",
+    "Explore rooms": "മുറികൾ കണ്ടെത്തുക"
 }

src/i18n/strings/nb_NO.json

@@ -27,5 +27,10 @@
     "Unable to load config file: please refresh the page to try again.": "Kan ikke laste inn konfigurasjonsfil: oppdater siden for å prøve igjen.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Ditt Element konfigurasjonen inneholder ugyldig JSON. Løs problemet og last siden på nytt.",
     "Your Element is misconfigured": "Ditt Element er feilkonfigurert",
-    "Missing indexeddb worker script!": "Mangler indexeddb arbeiderskript!"
+    "Missing indexeddb worker script!": "Mangler indexeddb arbeiderskript!",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Vennligst installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> for den beste opplevelsen.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s bruker avanserte nettleserfunksjoner som ikke støttes av din nåværende nettleser.",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Skrivebord (%(platformName)s)",
+    "Open": "Åpne"
 }

src/i18n/strings/nl.json

@@ -30,5 +30,7 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.",
     "Download Completed": "Download voltooid",
     "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd",
-    "Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet draaien."
+    "Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet draaien",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.",
+    "Powered by Matrix": "Gebruikt Matrix technologie"
 }

src/i18n/strings/si.json

@@ -1,4 +1,6 @@
 {
-    "Unknown device": "නොදන්නා උපකරණය",
+    "Unknown device": "නොදන්නා උපාංගයකි",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)"
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Welcome to Element": "ඉලමන්ට් වෙත සාදරයෙන් පිළිගනිමු",
+    "Open": "විවෘත කරන්න"
 }

src/i18n/strings/sl.json

@@ -8,7 +8,7 @@
     "Sign In": "Prijava",
     "Create Account": "Registracija",
     "Explore rooms": "Raziščite sobe",
-    "Missing indexeddb worker script!": "Manjka skript za IndexDB!",
+    "Missing indexeddb worker script!": "Manjka skripta za IndexDB!",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neveljavna konfiguracija: lahko izberete samo eno izmed default_server_config, default_server_name ali default_hs_url.",
     "Invalid configuration: no default server specified.": "Neveljavna konfiguracija: privzeti strežnik ni nastavljen.",
     "Your Element is misconfigured": "Vaš Element je napačno nastavljen",

src/i18n/strings/sr.json

@@ -3,7 +3,7 @@
     "You need to be using HTTPS to place a screen-sharing call.": "Морате користити HTTPS да бисте започели позив са дељењем екрана.",
     "Dismiss": "Одбаци",
     "powered by Matrix": "покреће Матрикс",
-    "Welcome to Element": "Добродошли у Element",
+    "Welcome to Element": "Добродошли у Елемент",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентрализовано, шифровано ћаскање и сарадња коју покреће [matrix]",
     "Sign In": "Пријава",
     "Create Account": "Направи налог",
@@ -12,14 +12,14 @@
     "The message from the parser is: %(message)s": "Порука из парсера: %(message)s",
     "Invalid JSON": "Погрешан JSON",
     "Unexpected error preparing the app. See console for details.": "Неочекивана грешка приликом припреме апликације. Погледајте конзолу за више детаља.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Погрешно подешавање: можете навести само једну вредност од default_server_config, default_server_name, or default_hs_url.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Погрешно подешавање: можете навести само једну вредност од default_server_config, default_server_name, или default_hs_url.",
     "Missing indexeddb worker script!": "Недостаје скрипта indexeddb радника!",
     "Your Element is misconfigured": "Ваша Елемент апликација је лоше подешена",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Подешавање ваше Елемент апликације садржи неисправни JSON. Поправите проблем па поново учитајте ову страницу.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Подешавање ваше Елемент апликације садржи неисправни „JSON“. Поправите проблем па поново учитајте ову страницу.",
     "Unable to load config file: please refresh the page to try again.": "Не могу да учитам датотеку подешавања: освежите страницу и покушајте поново.",
     "Download Completed": "Преузимање завршено",
     "Open": "Отвори",
-    "Open user settings": "Отвори корисничка подешавања",
+    "Open user settings": "Отвори корисничке поставке",
     "Previous/next recently visited room or community": "Претходно/следеће недавно посећене собе или заједнице",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s радна површ (%(platformName)s)",
     "Go to your browser to complete Sign In": "Отворите ваш прегледач за довршавање пријаве",
@@ -29,7 +29,8 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s користи напредне могућности које нису подржане у вашем тренутном прегледачу.",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Инсталирајте <chromeLink>Хром</chromeLink>, <firefoxLink>Фајерфокс</firefoxLink>, или <safariLink>Сафари</safariLink> за најбољи доживљај.",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Можете наставити користећи тренутни прегледач али неке могућности можда неће радити и изглед и доживљај апликације може бити лош.",
-    "I understand the risks and wish to continue": "Разумем могуће последице и желим наставити",
+    "I understand the risks and wish to continue": "Разумем ризике и желим да наставим",
     "Go to element.io": "Иди на element.io",
-    "Failed to start": "Неуспех при покретању"
+    "Failed to start": "Неуспех при покретању",
+    "Powered by Matrix": "Оснажен од стране Матрикса"
 }

src/i18n/strings/szl.json

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

src/i18n/strings/tlh.json

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

src/i18n/strings/tr.json

@@ -20,11 +20,17 @@
     "Unable to load config file: please refresh the page to try again.": "Yapılandırma (config) dosyası yüklenemedi: lütfen yeniden denemek için sayfayı yenileyin.",
     "Download Completed": "İndirme Tamamlandı",
     "Unsupported browser": "Desteklenmeyen tarayıcı",
-    "Your browser can't run %(brand)s": "",
+    "Your browser can't run %(brand)s": "Tarayıcınız %(brand)s uygulamasını çalıştıramıyor",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s, kullandığınız tarayıcı tarafından desteklenmeyen, gelişmiş tarayıcı özellikleri kullanıyor.",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Daha iyi bir deneyim için lütfen <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ya da <safariLink>Safari</safariLink> tarayıcılarından birini yükleyin.",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Şu anda kullanmış olduğunuz tarayıcınızı kullanmaya devam edebilirsiniz ancak uygulamanın sunduğu bazı ya da bütün özellikler çalışmayabilir ve deneyiminizi kötü yönde etkileyebilir.",
     "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
     "Go to element.io": "element.io adresine git",
-    "Failed to start": "Başlatılamadı"
+    "Failed to start": "Başlatılamadı",
+    "Previous/next recently visited room or community": "Yakında ziyaret edilen önceki/sonraki oda veya topluluk",
+    "Powered by Matrix": "Matrix tarafından güçlendirildi",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)",
+    "Open": "Aç",
+    "Missing indexeddb worker script!": "Indexeddb worker kodu eksik!"
 }

src/i18n/strings/uk.json

@@ -7,7 +7,7 @@
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Децентралізований, зашифрований чат та засіб для співпраці, заснований на [matrix]",
     "Sign In": "Увійти",
     "Create Account": "Створити обліковий запис",
-    "Explore rooms": "Шукати кімнати",
+    "Explore rooms": "Каталог кімнат",
     "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при підготовці програми. Дивіться деталі у виводі консолі.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невірна конфігурація: можна вказати лише default_server_config, default_server_name або default_hs_url.",
     "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.",

src/i18n/strings/vi.json

@@ -12,5 +12,19 @@
     "Invalid configuration: no default server specified.": "Cấu hình không hợp lệ: máy chủ mặc định không được thiết lập.",
     "Sign In": "Đăng nhập",
     "Create Account": "Tạo tài khoản",
-    "Explore rooms": "Khám phá phòng chat"
+    "Explore rooms": "Khám phá phòng chat",
+    "Download Completed": "Đã hoàn thành tải xuống",
+    "Go to element.io": "Đi đến element.io",
+    "I understand the risks and wish to continue": "Tôi hiểu các rủi ro và muốn tiếp tục",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Bạn có thể tiếp tục sử dụng trình duyệt hiện tại của bạn, nhưng một số tính năng có thể không hoạt động và trải nghiệm ứng dụng sẽ không được chính xác.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Vui lòng cài đặt <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, hoặc <safariLink>Safari</safariLink> để có trải nghiệm tốt nhất.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s dùng tính năng cao cấp của trình duyệt không được hỗ trợ bởi trình duyệt của bạn.",
+    "Your browser can't run %(brand)s": "Trình duyệt của bạn không thể chạy %(brand)s",
+    "Unsupported browser": "Trình duyệt không được hỗ trợ",
+    "Go to your browser to complete Sign In": "Mở trình duyệt web để hoàn thành đăng nhập",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Máy tính để bàn (%(platformName)s)",
+    "Previous/next recently visited room or community": "Phòng chat hoặc cộng đồng gần đây trước/tiếp theo",
+    "Open user settings": "Mở cài đặt người dùng",
+    "Open": "Mở",
+    "Unable to load config file: please refresh the page to try again.": "Không thể tải tệp cấu hình: hãy làm mới trang để thử lại."
 }

src/vector/app.tsx

@@ -124,7 +124,7 @@ function onTokenLoginCompleted() {
     parsedUrl.search = "";
     const formatted = url.format(parsedUrl);
     console.log(`Redirecting to ${formatted} to drop loginToken from queryparams`);
-    window.location.href = formatted;
+    window.history.replaceState(null, "", formatted);
 }
 
 export async function loadApp(fragParams: {}) {
@@ -236,7 +236,7 @@ async function verifyServerConfig() {
 
         validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true);
     } catch (e) {
-        const {hsUrl, isUrl, userId} = Lifecycle.getLocalStorageSessionVars();
+        const {hsUrl, isUrl, userId} = await Lifecycle.getStoredSessionVars();
         if (hsUrl && userId) {
             console.error(e);
             console.warn("A session was found - suppressing config error and using the session's homeserver");

src/vector/index.ts

@@ -23,17 +23,12 @@ limitations under the License.
 // in webpack.config.js
 require('gfm.css/gfm.css');
 require('highlight.js/styles/github.css');
-require('katex/dist/katex.css')
+require('katex/dist/katex.css');
 
 // These are things that can run before the skin loads - be careful not to reference the react-sdk though.
 import {parseQsFromFragment} from "./url_utils";
 import './modernizr';
 
-// load service worker if available on this platform
-if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.register('sw.js');
-}
-
 async function settled(...promises: Array<Promise<any>>) {
     for (const prom of promises) {
         try {
@@ -157,7 +152,7 @@ async function start() {
         // error handling begins here
         // ##########################
         if (!acceptBrowser) {
-            await new Promise(resolve => {
+            await new Promise<void>(resolve => {
                 console.error("Browser is missing required features.");
                 // take to a different landing page to AWOOOOOGA at the user
                 showIncompatibleBrowser(() => {

src/vector/init.tsx

@@ -1,8 +1,8 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2018, 2019, 2020 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2018 - 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.
@@ -39,7 +39,7 @@ import { initRageshake } from "./rageshakesetup";
 export const rageshakePromise = initRageshake();
 
 export function preparePlatform() {
-    if (window.ipcRenderer) {
+    if (window.electron) {
         console.log("Using Electron platform");
         PlatformPeg.set(new ElectronPlatform());
     } else if (window.matchMedia('(display-mode: standalone)').matches) {

src/vector/jitsi/index.ts

@@ -164,6 +164,7 @@ function createJWTToken() {
             matrix: {
                 token: openIdToken.access_token,
                 room_id: roomId,
+                server_name: openIdToken.matrix_server_name,
             },
             user: {
                 avatar: avatarUrl,

src/vector/platform/ElectronPlatform.tsx

@@ -1,9 +1,8 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2018 - 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.
@@ -49,7 +48,7 @@ import {CheckUpdatesPayload} from "matrix-react-sdk/src/dispatcher/payloads/Chec
 import ToastStore from "matrix-react-sdk/src/stores/ToastStore";
 import GenericExpiringToast from "matrix-react-sdk/src/components/views/toasts/GenericExpiringToast";
 
-const ipcRenderer = window.ipcRenderer;
+const electron = window.electron;
 const isMac = navigator.platform.toUpperCase().includes('MAC');
 
 function platformFriendlyName(): string {
@@ -74,7 +73,7 @@ function platformFriendlyName(): string {
 function _onAction(payload: ActionPayload) {
     // Whitelist payload actions, no point sending most across
     if (['call_state'].includes(payload.action)) {
-        ipcRenderer.send('app_onAction', payload);
+        electron.send('app_onAction', payload);
     }
 }
 
@@ -104,7 +103,7 @@ class SeshatIndexManager extends BaseEventIndexManager {
     constructor() {
         super();
 
-        ipcRenderer.on('seshatReply', this._onIpcReply);
+        electron.on('seshatReply', this._onIpcReply);
     }
 
     async _ipcCall(name: string, ...args: any[]): Promise<any> {
@@ -112,7 +111,7 @@ class SeshatIndexManager extends BaseEventIndexManager {
         const ipcCallId = ++this.nextIpcCallId;
         return new Promise((resolve, reject) => {
             this.pendingIpcCalls[ipcCallId] = {resolve, reject};
-            window.ipcRenderer.send('seshat', {id: ipcCallId, name, args});
+            window.electron.send('seshat', {id: ipcCallId, name, args});
         });
     }
 
@@ -230,7 +229,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
             false if there is not
             or the error if one is encountered
          */
-        ipcRenderer.on('check_updates', (event, status) => {
+        electron.on('check_updates', (event, status) => {
             dis.dispatch<CheckUpdatesPayload>({
                 action: Action.CheckUpdates,
                 ...getUpdateCheckStatus(status),
@@ -238,21 +237,21 @@ export default class ElectronPlatform extends VectorBasePlatform {
         });
 
         // try to flush the rageshake logs to indexeddb before quit.
-        ipcRenderer.on('before-quit', function() {
+        electron.on('before-quit', function() {
             console.log('element-desktop closing');
             rageshake.flush();
         });
 
-        ipcRenderer.on('ipcReply', this._onIpcReply);
+        electron.on('ipcReply', this._onIpcReply);
-        ipcRenderer.on('update-downloaded', this.onUpdateDownloaded);
+        electron.on('update-downloaded', this.onUpdateDownloaded);
 
-        ipcRenderer.on('preferences', () => {
+        electron.on('preferences', () => {
             dis.fire(Action.ViewUserSettings);
         });
 
-        ipcRenderer.on('userDownloadCompleted', (ev, {path, name}) => {
+        electron.on('userDownloadCompleted', (ev, {path, name}) => {
             const onAccept = () => {
-                ipcRenderer.send('userDownloadOpen', {path});
+                electron.send('userDownloadOpen', {path});
             };
 
             ToastStore.sharedInstance().addOrReplaceToast({
@@ -336,7 +335,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
         if (this.notificationCount === count) return;
         super.setNotificationCount(count);
 
-        ipcRenderer.send('setBadgeCount', count);
+        electron.send('setBadgeCount', count);
     }
 
     supportsNotifications(): boolean {
@@ -379,7 +378,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
     }
 
     loudNotification(ev: Event, room: Object) {
-        ipcRenderer.send('loudNotification');
+        electron.send('loudNotification');
     }
 
     async getAppVersion(): Promise<string> {
@@ -431,14 +430,14 @@ export default class ElectronPlatform extends VectorBasePlatform {
 
     startUpdateCheck() {
         super.startUpdateCheck();
-        ipcRenderer.send('check_updates');
+        electron.send('check_updates');
     }
 
     installUpdate() {
         // IPC to the main process to install the update, since quitAndInstall
         // doesn't fire the before-quit event so the main process needs to know
         // it should exit.
-        ipcRenderer.send('install_update');
+        electron.send('install_update');
     }
 
     getDefaultDeviceDisplayName(): string {
@@ -468,7 +467,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
         const ipcCallId = ++this.nextIpcCallId;
         return new Promise((resolve, reject) => {
             this.pendingIpcCalls[ipcCallId] = {resolve, reject};
-            window.ipcRenderer.send('ipcCall', {id: ipcCallId, name, args});
+            window.electron.send('ipcCall', {id: ipcCallId, name, args});
             // Maybe add a timeout to these? Probably not necessary.
         });
     }

src/vector/platform/WebPlatform.ts

@@ -34,6 +34,14 @@ const POKE_RATE_MS = 10 * 60 * 1000; // 10 min
 export default class WebPlatform extends VectorBasePlatform {
     private runningVersion: string = null;
 
+    constructor() {
+        super();
+        // Register service worker if available on this platform
+        if ('serviceWorker' in navigator) {
+            navigator.serviceWorker.register('sw.js');
+        }
+    }
+
     getHumanReadableName(): string {
         return 'Web Platform'; // no translation required: only used for analytics
     }
@@ -97,6 +105,8 @@ export default class WebPlatform extends VectorBasePlatform {
             window.focus();
             notification.close();
         };
+
+        return notification;
     }
 
     _getVersion(): Promise<string> {

webpack.config.js

@@ -227,6 +227,7 @@ module.exports = (env, argv) => {
                                     require("postcss-easings")(),
                                     require("postcss-strip-inline-comments")(),
                                     require("postcss-hexrgba")(),
+                                    require("postcss-calc")({warnWhenCannotResolve: true}),
 
                                     // It's important that this plugin is last otherwise we end
                                     // up with broken CSS.
@@ -269,12 +270,12 @@ module.exports = (env, argv) => {
                             options: {
                                 esModule: false,
                                 name: '[name].[hash:7].[ext]',
-                                outputPath: getImgOutputPath,
+                                outputPath: getAssetOutputPath,
                                 publicPath: function(url, resourcePath) {
                                     // CSS image usages end up in the `bundles/[hash]` output
                                     // directory, so we adjust the final path to navigate up
                                     // twice.
-                                    const outputPath = getImgOutputPath(url, resourcePath);
+                                    const outputPath = getAssetOutputPath(url, resourcePath);
                                     return toPublicPath(path.join("../..", outputPath));
                                 },
                             },
@@ -285,9 +286,9 @@ module.exports = (env, argv) => {
                             options: {
                                 esModule: false,
                                 name: '[name].[hash:7].[ext]',
-                                outputPath: getImgOutputPath,
+                                outputPath: getAssetOutputPath,
                                 publicPath: function(url, resourcePath) {
-                                    const outputPath = getImgOutputPath(url, resourcePath);
+                                    const outputPath = getAssetOutputPath(url, resourcePath);
                                     return toPublicPath(outputPath);
                                 },
                             },
@@ -392,15 +393,25 @@ module.exports = (env, argv) => {
 
 /**
  * Merge assets found via CSS and imports into a single tree, while also preserving
- * directories under `res`.
+ * directories under e.g. `res` or similar.
  *
  * @param {string} url The adjusted name of the file, such as `warning.1234567.svg`.
  * @param {string} resourcePath The absolute path to the source file with unmodified name.
  * @return {string} The returned paths will look like `img/warning.1234567.svg`.
  */
-function getImgOutputPath(url, resourcePath) {
+function getAssetOutputPath(url, resourcePath) {
-    const prefix = /^.*[/\\]res[/\\]/;
+    // `res` is the parent dir for our own assets in various layers
-    const outputDir = path.dirname(resourcePath).replace(prefix, "");
+    // `dist` is the parent dir for KaTeX assets
+    const prefix = /^.*[/\\](dist|res)[/\\]/;
+    if (!resourcePath.match(prefix)) {
+        throw new Error(`Unexpected asset path: ${resourcePath}`);
+    }
+    let outputDir = path.dirname(resourcePath).replace(prefix, "");
+    if (resourcePath.includes("KaTeX")) {
+        // Add a clearly named directory segment, rather than leaving the KaTeX
+        // assets loose in each asset type directory.
+        outputDir = path.join(outputDir, "KaTeX");
+    }
     return path.join(outputDir, path.basename(url));
 }