Revert "Docker image: serve pre-compressed assets using gzip_static"

Translations update from Weblate

CHANGELOG.md

@@ -1,3 +1,27 @@
+Changes in [1.7.24](https://github.com/vector-im/element-web/releases/tag/v1.7.24) (2021-03-29)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.24-rc.1...v1.7.24)
+
+ * Upgrade to React SDK 3.17.0 and JS SDK 9.10.0
+
+Changes in [1.7.24-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.24-rc.1) (2021-03-25)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.23...v1.7.24-rc.1)
+
+ * Upgrade to React SDK 3.17.0-rc.2 and JS SDK 9.10.0-rc.1
+ * Translations update from Weblate
+   [\#16766](https://github.com/vector-im/element-web/pull/16766)
+ * Docker image: serve pre-compressed assets using gzip_static
+   [\#16698](https://github.com/vector-im/element-web/pull/16698)
+ * Fix style lint issues
+   [\#16732](https://github.com/vector-im/element-web/pull/16732)
+ * Updated expected webpack output in setup guide
+   [\#16740](https://github.com/vector-im/element-web/pull/16740)
+ * Docs for `loginForWelcome`
+   [\#16468](https://github.com/vector-im/element-web/pull/16468)
+ * Disable rageshake persistence if no logs would be submitted
+   [\#16697](https://github.com/vector-im/element-web/pull/16697)
+
 Changes in [1.7.23](https://github.com/vector-im/element-web/releases/tag/v1.7.23) (2021-03-15)
 ===============================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.23-rc.1...v1.7.23)

README.md

@@ -298,15 +298,10 @@ yarn start
 
 Wait a few seconds for the initial build to finish; you should see something like:
 ```
-Hash: b0af76309dd56d7275c8
+[element-js] <s> [webpack.Progress] 100% 
-Version: webpack 1.12.14
+[element-js] 
-Time: 14533ms
+[element-js] ℹ ｢wdm｣:    1840 modules
-         Asset     Size  Chunks             Chunk Names
+[element-js] ℹ ｢wdm｣: Compiled successfully.
-     bundle.js   4.2 MB       0  [emitted]  main
-    bundle.css  91.5 kB       0  [emitted]  main
- bundle.js.map  5.29 MB       0  [emitted]  main
-bundle.css.map   116 kB       0  [emitted]  main
-    + 1013 hidden modules
 ```
    Remember, the command will not terminate since it runs the web server
    and rebuilds source files when they change. This development server also

docs/config.md

@@ -72,6 +72,9 @@ For a good example, see https://develop.element.io/config.json.
     1. `homeUrl`: Content shown on the inside of the app when a specific room is
        not selected. By default, no home page is configured. If one is set, a
        button to access it will be shown in the top left menu.
+    1. `loginForWelcome`: Overrides `welcomeUrl` to make the welcome page be the
+       same page as the login page when `true`. This effectively disables the 
+       welcome page.
 1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
    country selectors, like the phone number input on the registration page.
    Defaults to `GB` if the given code is unknown or not provided.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.7.23",
+  "version": "1.7.24",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -58,8 +58,8 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "9.10.0",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.17.0",
     "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",

res/css/structures/ErrorView.scss

@@ -22,7 +22,7 @@ limitations under the License.
     background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
     background: -webkit-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
     background: linear-gradient(to bottom, #c5e0f7 0%, #ffffff 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c5e0f7', endColorstr='#ffffff',GradientType=0 );
+    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#c5e0f7', endColorstr='#ffffff', GradientType=0);
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
     width: 100%;
     min-height: 100%;
@@ -41,7 +41,7 @@ limitations under the License.
         margin-left: 4px;
         margin-right: 4px;
         min-width: 80px;
-        background-color: #03B381;
+        background-color: #03b381;
         color: #fff;
         cursor: pointer;
         padding: 12px 22px;
@@ -54,7 +54,7 @@ limitations under the License.
     }
 
     .mx_HomePage_header {
-        color: #2E2F32;
+        color: #2e2f32;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -95,7 +95,7 @@ limitations under the License.
     }
 
     .mx_FooterLink {
-        color: #368BD6;
+        color: #368bd6;
         text-decoration: none;
     }
 }

src/i18n/strings/cs.json

@@ -2,7 +2,7 @@
     "Welcome to Element": "Vítá vás Element",
     "Unknown device": "Neznámé zařízení",
     "You need to be using HTTPS to place a screen-sharing call.": "Pro uskutečnění hovoru se sdílením obrazovky musíte používat HTTPS.",
-    "Dismiss": "Zahodit",
+    "Dismiss": "Zavřít",
     "powered by Matrix": "používá protokol Matrix",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizovaný, šifrovaný chat a spolupráce na platformě [matrix]",
     "Sign In": "Přihlásit se",

src/i18n/strings/de_DE.json

@@ -6,15 +6,15 @@
     "Welcome to Element": "Willkommen bei Element",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung mittels [matrix]",
     "Sign In": "Anmelden",
-    "Create Account": "Account erstellen",
+    "Create Account": "Konto erstellen",
     "Explore rooms": "Räume erkunden",
     "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App. Siehe in die Konsole für mehr Details.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ungültige Konfiguration: Es kann nur eine der Optionen default_server_config, default_server_name oder default_hs_url angegeben werden.",
     "Invalid configuration: no default server specified.": "Ungültige Konfiguration: Es wurde kein Standardserver angegeben.",
     "The message from the parser is: %(message)s": "Die Nachricht des Parsers ist: %(message)s",
     "Invalid JSON": "Ungültiges JSON",
-    "Go to your browser to complete Sign In": "Gehe in deinen Browser, um die Anmeldung abzuschließen",
+    "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen",
-    "Open user settings": "Öffne Nutzer-Einstellungen",
+    "Open user settings": "Benutzereinstellungen öffnen",
     "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisiere die Seite, um es erneut zu versuchen.",
     "Missing indexeddb worker script!": "Fehlendes indexeddb Worker-Skript!",
     "Previous/next recently visited room or community": "Vorheriger/nächster kürzlich besuchter Raum oder Community",
@@ -23,14 +23,14 @@
     "Failed to start": "Start fehlgeschlagen",
     "%(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.",
+    "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 deinen aktuellen Browser weiterhin verwenden, es kann aber sein, dass einige oder alle Funktionen nicht verfügbar stehen oder dass das Aussehen und die Bedienung der Anwendung nicht korrekt ist.",
+    "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 deinen aktuellen Browser weiterhin verwenden, es kann aber sein, dass einige oder alle Funktionen nicht verfügbar sind oder dass Aussehen und 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 falsch konfiguriert",
-    "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.",
+    "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.",
     "Download Completed": "Download fertiggestellt",
     "Open": "Öffnen",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von Ihrem aktuellen Browser nicht unterstützt werden.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem Browser nicht unterstützt werden.",
     "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
     "Powered by Matrix": "Betrieben mit Matrix"
 }

src/i18n/strings/fr.json

@@ -7,7 +7,7 @@
     "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",
+    "Explore rooms": "Parcourir les salons",
     "Unexpected error preparing the app. See console for details.": "Une erreur inattendue est survenue pendant la préparation de l’application. Consultez la console pour avoir des détails.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs parmis default_server_config, default_server_name et default_hs_url.",
     "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut spécifié.",

src/i18n/strings/ga.json

@@ -7,5 +7,30 @@
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Meán comhrá agus comhoibriú, díláraithe agus criptithe, cumhachtaithe ag [matrix]",
     "Sign In": "Sínigh Isteach",
     "Create Account": "Déan cuntas a chruthú",
-    "Explore rooms": "Breathnaigh thart ar na seomraí"
+    "Explore rooms": "Breathnaigh thart ar na seomraí",
+    "Your browser can't run %(brand)s": "Níl do bhrabhsálaí comhoiriúnach do %(brand)s",
+    "Go to your browser to complete Sign In": "Oscail do bhrabhsálaí agus críochnaigh an clárú",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Coinníonn do chumraíocht JSON neamhbhailí. Ceartaigh an fadhb agus athlódáil an leathanach le do thoil.",
+    "Your Element is misconfigured": "Níl do fheidhmchlár Element cumraithe i gceart",
+    "Previous/next recently visited room or community": "roimhe/chéad eile, seomra nó pobal is déanaí",
+    "Failed to start": "Theip chun tosú",
+    "I understand the risks and wish to continue": "Tuigim na rioscaí agus ba mhaith liom lean ar aghaidh",
+    "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.": "An féidir leat úsáid do bhrabhsálaí reatha, ach nár oibrí roinnt nó gach gné agus nár thaispeántar an feidhmchlár i gceart.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Suiteáil <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> chun an taithí is fearr a fháil.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "Úsáideann %(brand)s gnéithe ardforbartha nach bhfuil ar fáil faoi do bhrabhsálaí reatha.",
+    "Unsupported browser": "Brabhsálaí gan tacaíocht",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s deisce (%(platformName)s)",
+    "Unexpected error preparing the app. See console for details.": "Earráid nuair an feidhmchlár a hullmhú. Feic sa consól le haghaidh eolas.",
+    "Unable to load config file: please refresh the page to try again.": "Ní féidir an comhad cumraíochta a lódáil. Athnuaigh an leathanach chun déanamh iarracht arís le do thoil.",
+    "Download Completed": "Íoslódáil críochnaithe",
+    "Invalid JSON": "JSON neamhbhailí",
+    "The message from the parser is: %(message)s": "Is í an teachtaireacht as an parsálaí: %(message)s",
+    "Invalid configuration: no default server specified.": "Cumraíocht neamhbhailí: Níl aon freastalaí réamhshocraithe a sonrú.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Cumraíocht neamhbhailí: ní féidir ach ceann de default_server_config, default_server_name, nó default_hs_url a shonrú.",
+    "Missing indexeddb worker script!": "An script oibrí \"indexeddb\" ag iarraidh!",
+    "Powered by Matrix": "Cumhachtaithe ag Matrix",
+    "Go to element.io": "Téigh go element.io",
+    "Open user settings": "Oscail socruithe úsáideora",
+    "Open": "Oscail"
 }

src/i18n/strings/lt.json

@@ -6,7 +6,7 @@
     "Dismiss": "Atmesti",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizuoti, šifruoti pokalbiai ir bendradarbiavimas, veikiantis su [matrix]",
     "Sign In": "Prisijungti",
-    "Create Account": "Sukurti paskyrą",
+    "Create Account": "Sukurti Paskyrą",
     "Explore rooms": "Žvalgyti kambarius",
     "The message from the parser is: %(message)s": "Analizatoriaus žinutė yra: %(message)s",
     "Invalid JSON": "Klaidingas JSON",

src/i18n/strings/zh_Hans.json

@@ -4,8 +4,8 @@
     "Unknown device": "未知设备",
     "You need to be using HTTPS to place a screen-sharing call.": "您需要使用 HTTPS 以进行共享屏幕通话。",
     "Welcome to Element": "欢迎来到 Element",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "去中心化、加密聊天&与协作，由 [matrix] 驱动",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "去中心化、加密聊天与协作，由 [matrix] 驱动",
-    "Sign In": "登入",
+    "Sign In": "登录",
     "Create Account": "创建账户",
     "Explore rooms": "探索聊天室",
     "The message from the parser is: %(message)s": "语法分析器的信息：%(message)s",
@@ -17,20 +17,20 @@
     "Unable to load config file: please refresh the page to try again.": "无法加载配置文件：请再次刷新页面。",
     "Open user settings": "打开用户设置",
     "Previous/next recently visited room or community": "上一个 / 下一个最近访问的聊天室或社区",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s 桌面版 (%(platformName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s 桌面版（%(platformName)s）",
-    "Go to your browser to complete Sign In": "去您的浏览器完成登录",
+    "Go to your browser to complete Sign In": "转到您的浏览器以完成登录",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "不支持的浏览器",
     "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> 以获得最佳体验。",
     "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": "我了解风险并希望继续",
-    "Go to element.io": "去 element.io",
+    "Go to element.io": "前往 element.io",
     "Failed to start": "启动失败",
     "Your Element is misconfigured": "Element 配置错误",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element 配置文件中包含无效的JSON，请改正错误并重新加载页面。",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element 配置文件中包含无效的 JSON，请改正错误并重新加载页面。",
     "Download Completed": "下载成功",
     "Open": "打开",
-    "Your browser can't run %(brand)s": "浏览器无法运行%(brand)s",
+    "Your browser can't run %(brand)s": "浏览器无法运行 %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "当前浏览器不支持%(brand)s调用的高级浏览器特性。",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "当前浏览器不支持 %(brand)s 所需的高级浏览器特性。",
     "Powered by Matrix": "由 Matrix 驱动"
 }

src/vector/index.ts

@@ -92,6 +92,7 @@ async function start() {
     // load init.ts async so that its code is not executed immediately and we can catch any exceptions
     const {
         rageshakePromise,
+        setupLogStorage,
         preparePlatform,
         loadOlm,
         loadConfig,
@@ -138,6 +139,9 @@ async function start() {
         await settled(loadConfigPromise); // wait for it to settle
         // keep initialising so that we can show any possible error with as many features (theme, i18n) as possible
 
+        // now that the config is ready, try to persist logs
+        const persistLogsPromise = setupLogStorage();
+
         // Load language after loading config.json so that settingsDefaults.language can be applied
         const loadLanguagePromise = loadLanguage();
         // as quickly as we possibly can, set a default theme...
@@ -197,6 +201,11 @@ async function start() {
         await loadThemePromise;
         await loadLanguagePromise;
 
+        // We don't care if the log persistence made it through successfully, but we do want to
+        // make sure it had a chance to load before we move on. It's prepared much higher up in
+        // the process, making this the first time we check that it did something.
+        await settled(persistLogsPromise);
+
         // Finally, load the app. All of the other react-sdk imports are in this file which causes the skinner to
         // run on the components.
         await loadApp(fragparts.params);

src/vector/init.tsx

@@ -33,7 +33,7 @@ import PlatformPeg from "matrix-react-sdk/src/PlatformPeg";
 import SdkConfig from "matrix-react-sdk/src/SdkConfig";
 import {setTheme} from "matrix-react-sdk/src/theme";
 
-import { initRageshake } from "./rageshakesetup";
+import {initRageshake, initRageshakeStore} from "./rageshakesetup";
 
 
 export const rageshakePromise = initRageshake();
@@ -51,6 +51,14 @@ export function preparePlatform() {
     }
 }
 
+export function setupLogStorage() {
+    if (SdkConfig.get().bug_report_endpoint_url) {
+        return initRageshakeStore();
+    }
+    console.warn("No bug report endpoint set - logs will not be persisted");
+    return Promise.resolve();
+}
+
 export async function loadConfig() {
     // XXX: We call this twice, once here and once in MatrixChat as a prop. We call it here to ensure
     // granular settings are loaded correctly and to avoid duplicating the override logic for the theme.

src/vector/rageshakesetup.ts

@@ -31,7 +31,8 @@ import SdkConfig from "matrix-react-sdk/src/SdkConfig";
 import sendBugReport from "matrix-react-sdk/src/rageshake/submit-rageshake";
 
 export function initRageshake() {
-    const prom = rageshake.init();
+    // we manually check persistence for rageshakes ourselves
+    const prom = rageshake.init(/*setUpPersistence=*/false);
     prom.then(() => {
         console.log("Initialised rageshake.");
         console.log("To fix line numbers in Chrome: " +
@@ -50,6 +51,10 @@ export function initRageshake() {
     return prom;
 }
 
+export function initRageshakeStore() {
+    return rageshake.tryInitStorage();
+}
+
 window.mxSendRageshake = function(text: string, withLogs?: boolean) {
     const url = SdkConfig.get().bug_report_endpoint_url;
     if (!url) {

yarn.lock

@@ -7506,9 +7506,10 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+matrix-js-sdk@9.10.0:
-  version "9.9.0"
+  version "9.10.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cd38fb9b4c349eb31feac14e806e710bf6431b72"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.10.0.tgz#ba32981391168778b301c01362a503a8469d3844"
+  integrity sha512-xvpgvTmCbS8dRTVvVULKbSwyES0y2F17TPukLIIXZMTqqeEBhfycVIjCV6LuACc0WBoRsZbi1/BIlgeWY7J03A==
   dependencies:
     "@babel/runtime" "^7.12.5"
     another-json "^0.2.0"
@@ -7528,9 +7529,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
+matrix-react-sdk@3.17.0:
-  version "3.16.0"
+  version "3.17.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3154dd6cd441b7710a525e75512e1665adf60746"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.17.0.tgz#8793c0106f9058af755309c90ee5e3da8ff2a163"
+  integrity sha512-e8AMlReejmSjt+THys9U4i575MqQ+D4TWi2JfTJ8liS7nqT+Rj2oL4cwA1nRs71kYgPYqknRZIl1mcn7yi0vGQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7558,7 +7560,7 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "9.10.0"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     pako "^2.0.3"