Merge tag 'v1.6.8' into AMP.chat

[Full Changelog](element-hq/element-web@v1.6.8-rc.1...v1.6.8)
* Upgrade to JS SDK 7.1.0 and React SDK 2.9.0

Change-Id: If4d67f7d05d8024f3a44cf6b2b42424ffa09f4b7

Author: awesome-michael

.dockerignore

@@ -3,7 +3,6 @@ test/
 webapp/
 lib/
 node_modules/
-electron_app/
 karma-reports/
 .idea/
 .tmp/

.gitignore

@@ -4,9 +4,6 @@
 /key.pem
 /lib
 /node_modules
-/electron_app/node_modules
-/electron_app/dist
-/electron_app/pub
 /packages/
 /webapp
 /.npmrc

.modernizr.json

@@ -29,6 +29,7 @@
     "test/url/urlsearchparams",
 
     "test/cors",
+    "test/crypto",
     "test/iframe/sandbox",
     "test/json",
     "test/network/fetch",

CHANGELOG.md

@@ -78,7 +78,7 @@ Riot is a modular webapp built with modern ES6 and uses a Node.js build system.
 Ensure you have the latest LTS version of Node.js installed.
 
 Using `yarn` instead of `npm` is recommended. Please see the Yarn [install
-guide](https://yarnpkg.com/docs/install/) if you do not have it already.
+guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it already.
 
 1. Install or update `node.js` so that your `node` is at least v10.x.
 1. Install `yarn` if not present already.
@@ -108,40 +108,7 @@ Riot can also be run as a desktop app, wrapped in Electron. You can download a
 pre-built version from https://riot.im/download/desktop/ or, if you prefer,
 build it yourself.
 
-To build it yourself, follow the instructions below.
-
-1. Follow the instructions in 'Building From Source' above, but run
-   `yarn build` instead of `yarn dist` (since we don't need the tarball).
-2. Install Electron and run it:
-
-   ```bash
-   yarn electron
-   ```
-
-To build packages, use `electron-builder`. This is configured to output:
- * `dmg` + `zip` for macOS
- * `exe` + `nupkg` for Windows
- * `deb` for Linux
-But this can be customised by editing the `build` section of package.json
-as per https://github.com/electron-userland/electron-builder/wiki/Options
-
-See https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Build
-for dependencies required for building packages for various platforms.
-
-The only platform that can build packages for all three platforms is macOS:
-```bash
-brew install mono
-yarn install
-yarn build:electron
-```
-
-For other packages, use `electron-builder` manually. For example, to build a
-package for 64 bit Linux:
-
- 1. Follow the instructions in 'Building From Source' above
- 2. `node_modules/.bin/build -l --x64`
-
-All Electron packages go into `electron_app/dist/`
+To build it yourself, follow the instructions at https://github.com/vector-im/riot-desktop.
 
 Many thanks to @aviraldg for the initial work on the Electron integration.
 
@@ -220,7 +187,7 @@ Development
 ===========
 
 Before attempting to develop on Riot you **must** read the [developer guide
-for `matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk), which
+for `matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk#developer-guide), which
 also defines the design, architecture and style for Riot too.
 
 Before starting work on a feature, it's best to ensure your plan aligns well
@@ -288,6 +255,7 @@ yarn install
 yarn start
 ```
 
+
 Wait a few seconds for the initial build to finish; you should see something like:
 ```
 Hash: b0af76309dd56d7275c8
@@ -309,6 +277,23 @@ modifying it. See the [configuration docs](docs/config.md) for details.
 
 Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
 
+**Note**: The build script uses inotify by default on Linux to monitor directories
+for changes. If the inotify watch limit is too low your build will silently fail.
+To avoid this issue, we recommend a limit of at least 128M.
+
+To set a new inotify watch limit, execute:
+
+```
+$ sudo sysctl fs.inotify.max_user_watches=131072
+$ sudo sysctl -p
+```
+
+If you wish, you can make this new limit permanent, by executing:
+
+```
+$ echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf
+$ sudo sysctl -p
+```
 ___
 
 When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be

README.md

@@ -0,0 +1 @@
+module.exports = "css-file-stub";

__mocks__/cssMock.js

@@ -26,10 +26,13 @@
     "defaultCountryCode": "GB",
     "showLabsSettings": false,
     "features": {
+        "feature_new_spinner": "labs",
+        "feature_font_scaling": "labs",
         "feature_pinning": "labs",
         "feature_custom_status": "labs",
         "feature_custom_tags": "labs",
-        "feature_state_counters": "labs"
+        "feature_state_counters": "labs",
+        "feature_irc_ui": "labs"
     },
     "default_federate": true,
     "default_theme": "light",

config.sample.json

@@ -0,0 +1,81 @@
+# App load order
+
+Old slow flow:
+![image](https://user-images.githubusercontent.com/2403652/73848963-00a2a080-4821-11ea-97d4-1200fc2638f3.png)
+
+Current more parallel flow:
+![image](https://user-images.githubusercontent.com/2403652/83146440-303a2900-a0ee-11ea-806b-4f53f039b957.png)
+
+<details><summary>Code</summary>
+<p>
+<pre><code>
+digraph G {
+  node [shape=box];
+
+  subgraph cluster_0 {
+    color=orange;
+    node [style=filled];
+    label = "index.ts";
+
+    entrypoint, s0, ready [shape=point];
+    rageshake, config, i18n, theme, skin, olm [shape=parallelogram];
+    mobile [shape=diamond, label="mobile"];
+    modernizr [shape=diamond];
+    redirect, incompatible [shape=egg];
+
+    entrypoint -> rageshake;
+    rageshake -> mobile [color=blue];
+    mobile -> s0 [label="No"];
+    mobile -> redirect [label="Yes"];
+
+    s0 -> platform;
+    s0 -> olm;
+    platform -> config;
+
+    config -> i18n [color=blue];
+    config -> theme [color=blue];
+    config -> skin [color=blue];
+
+    i18n -> modernizr [color=blue];
+    theme -> modernizr [color=blue];
+    skin -> modernizr [color=blue];
+
+    modernizr -> ready [label="Yes"];
+    modernizr -> incompatible [label="No"];
+    incompatible -> ready [label="user ignore"];
+
+    olm -> ready [color=red];
+    config -> ready [color=red];
+    skin -> ready [color=red];
+    theme -> ready [color=red];
+    i18n -> ready [color=red];
+  }
+
+  subgraph cluster_1 {
+    color = green;
+    node [style=filled];
+    label = "init.tsx";
+
+    ready -> loadApp;
+    loadApp -> matrixchat;
+  }
+}
+</code></pre>
+</p>
+</details>
+
+Key:
++ Parallelogram: async/await task
++ Box: sync task
++ Diamond: conditional branch
++ Egg: user interaction
++ Blue arrow: async task is allowed to settle but allowed to fail
++ Red arrow: async task success is asserted
+
+Notes:
++ A task begins when all its dependencies (arrows going into it) are fulfilled.
++ The success of setting up rageshake is never asserted, riot-web has a fallback path for running without IDB (and thus rageshake).
++ Everything is awaited to be settled before the Modernizr check, to allow it to make use of things like i18n if they are successful.
+
+Underlying dependencies:
+![image](https://user-images.githubusercontent.com/2403652/73848977-08624500-4821-11ea-9830-bb0317c41086.png)

docs/app-load.md

@@ -32,7 +32,7 @@ For a good example, see https://riot.im/develop/config.json.
    homeserver know what email template to use when talking to you.
 1. `branding`: Configures various branding and logo details, such as:
     1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
-       during authentication flows
+       during authentication flows. If an array is passed, an image is chosen randomly for each visit.
     1. `authHeaderLogoUrl`: An logo image that is shown in the header during
        authentication flows
     1. `authFooterLinks`: a list of links to show in the authentication page footer:
@@ -84,10 +84,23 @@ For a good example, see https://riot.im/develop/config.json.
    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:
    "https://riot.example.org").
-1. `jitsi`: Used to change the default conference options.
+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
        to `jitsi.riot.im`. This is used whenever a user clicks on the voice/video
        call buttons - integration managers may use a different domain.
+1. `enable_presence_by_hs_url`: The property key should be the URL of the homeserver
+    and its value defines whether to enable/disable the presence status display
+    from that homeserver. If no options are configured, presence is shown for all
+    homeservers.
+1. `disable_guests`: Disables guest access tokens and auto-guest registrations.
+    Defaults to false (guests are allowed).
+1. `disable_login_language_selector`: Disables the login language selector. Defaults
+    to false (language selector is shown).
+1. `disable_3pid_login`: Disables 3rd party identity options on login and registration form
+    Defaults to false (3rd party identity options are shown).
+1. `default_federate`: Default option for room federation when creating a room
+    Defaults to true (room federation enabled).
 
 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 Riot
@@ -123,24 +136,11 @@ If none of these sources have an identity server set, then Riot will prompt the
 user to set an identity server first when attempting to use features that
 require one.
 
-Currently the only two public identity servers are https://vector.im and
+Currently, the only two public identity servers are https://vector.im and
 https://matrix.org, however in the future identity servers will be
 decentralised.
 
 Desktop app configuration
 =========================
 
-To run multiple instances of the desktop app for different accounts, you can
-launch the executable with the `--profile` argument followed by a unique
-identifier, e.g `riot-web --profile Work` for it to run a separate profile and
-not interfere with the default one.
-
-Alternatively, a custom location for the profile data can be specified using the
-`--profile-dir` flag followed by the desired path.
-
-+ `%APPDATA%\$NAME\config.json` on Windows
-+ `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux
-+ `~Library/Application Support/$NAME/config.json` on macOS
-
-In the paths above, `$NAME` is typically `Riot`, unless you use `--profile
-$PROFILE` in which case it becomes `Riot-$PROFILE`.
+See https://github.com/vector-im/riot-desktop#user-specified-configjson

docs/config.md

@@ -0,0 +1,16 @@
+# End to end encryption by default
+
+By default, Riot will create encrypted DM rooms if the user you are chatting with has keys uploaded on their account.
+For private room creation, Riot will default to encryption on but give you the choice to opt-out.
+
+## Disabling encryption by default
+
+Set the following on your homeserver's
+`/.well-known/matrix/client` config:
+```json
+{
+  "im.vector.riot.e2ee": {
+    "default": false
+  }
+}
+```