Merge pull request #14522 from mattcen/fix-arm-docker-build

Fix arm docker build

.eslintrc.js

@@ -20,4 +20,4 @@ module.exports = {
             "prefer-promise-reject-errors": "off",
         },
     }],
-}
+};

Dockerfile

@@ -1,5 +1,5 @@
 # Builder
-FROM node:10 as builder
+FROM node:12 as builder
 
 # Support custom branches of the react-sdk and js-sdk. This also helps us build
 # images of riot-web develop.
@@ -9,7 +9,10 @@ ARG REACT_SDK_BRANCH="master"
 ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
 ARG JS_SDK_BRANCH="master"
 
-RUN apt-get update && apt-get install -y git dos2unix
+RUN apt-get update && apt-get install -y git dos2unix \
+# These packages are required for building Canvas on architectures like Arm
+# See https://www.npmjs.com/package/canvas#compiling
+  build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
 
 WORKDIR /src
 

docs/config.md

@@ -4,7 +4,7 @@ Configuration
 You can configure the app by copying `config.sample.json` to
 `config.json` and customising it:
 
-For a good example, see https;//develop.element.io/config.json.
+For a good example, see https://develop.element.io/config.json.
 
 1. `default_server_config` sets the default homeserver and identity server URL for
    Element to use. The object is the same as returned by [https://<server_name>/.well-known/matrix/client](https://matrix.org/docs/spec/client_server/latest.html#get-well-known-matrix-client),

package.json

@@ -59,8 +59,8 @@
     "browser-request": "^0.3.3",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "8.0.0",
-    "matrix-react-sdk": "3.0.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "prop-types": "^15.7.2",
     "react": "^16.9.0",
@@ -101,11 +101,9 @@
     "cpx": "^1.3.2",
     "css-loader": "^3.3.2",
     "eslint": "7.3.1",
-    "eslint-config-google": "^0.7.1",
     "eslint-config-matrix-org": "^0.1.2",
     "eslint-plugin-babel": "^4.1.2",
     "eslint-plugin-flowtype": "^2.50.3",
-    "eslint-plugin-jest": "^23.0.4",
     "eslint-plugin-react": "^7.11.1",
     "eslint-plugin-react-hooks": "^2.2.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",

scripts/copy-res.js

@@ -30,6 +30,7 @@ const INCLUDE_LANGS = [
     {'value': 'is', 'label': 'íslenska'},
     {'value': 'it', 'label': 'Italiano'},
     {'value': 'ja', 'label': '日本語'},
+    {'value': 'jbo', 'label': 'banjubu\'o'},
     {'value': 'ko', 'label': '한국어'},
     {'value': 'lt', 'label': 'Lietuvių'},
     {'value': 'lv', 'label': 'Latviešu'},

src/i18n/strings/es.json

@@ -28,5 +28,8 @@
     "Failed to start": "Fallo al iniciar",
     "Your Element is misconfigured": "Su Element está mal configurado",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Su configuración de Element contiene JSON inválido. Por favor corríjalo e inténtelo de nuevo.",
-    "Download Completed": "Descarga completada"
+    "Download Completed": "Descarga completada",
+    "Open": "Abrir",
+    "Your browser can't run %(brand)s": "Su navegador es compatible con %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funciones avanzadas no soportadas por su navegador."
 }

src/i18n/strings/eu.json

@@ -4,7 +4,7 @@
     "Unknown device": "Gailu ezezaguna",
     "You need to be using HTTPS to place a screen-sharing call.": "HTTPS erabili behar duzu sekretuak partekatzeko dei bat ezartzeko.",
     "Welcome to Element": "Ongi etorri Element mezularitzara",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Deszentralizatutako eta zifratutako txat eta elkarlana [matrix] sareari esker",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Txat eta elkarlan deszentralizatua eta zifratua [matrix] sarean",
     "Sign In": "Hasi saioa",
     "Create Account": "Sortu kontua",
     "Explore rooms": "Arakatu gelak",
@@ -31,5 +31,6 @@
     "Download Completed": "Deskarga burututa",
     "Open": "Ireki",
     "Your browser can't run %(brand)s": "Zure nabigatzaileak ezin du %(brand)s exekutatu",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s-(e)k zure oraingo nabigatzaile honek euskarririk ematen ez dien ezaugarri aurreratuak erabiltzen ditu."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s-(e)k zure oraingo nabigatzaile honek euskarririk ematen ez dien ezaugarri aurreratuak erabiltzen ditu.",
+    "Powered by Matrix": "Matrixekin egina"
 }

src/i18n/strings/hu.json

@@ -31,5 +31,6 @@
     "Your Element is misconfigured": "Az Element hibásan van beállítva",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Az Element érvénytelen JSON-t tartalmazó konfigurációval rendelkezik. Kérlek javítsd és töltsd újra az oldalt.",
     "Your browser can't run %(brand)s": "A böngésződ nem tudja futtatni ezt: %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s haladó böngésző funkciókat használ amiket a jelenlegi böngésződ nem támogat."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s haladó böngésző funkciókat használ amiket a jelenlegi böngésződ nem támogat.",
+    "Powered by Matrix": "A gépházban: Matrix"
 }

src/i18n/strings/is.json

@@ -4,5 +4,19 @@
     "Unknown device": "Óþekkt tæki",
     "Dismiss": "Hafna",
     "You need to be using HTTPS to place a screen-sharing call.": "Þú verður að nota HTTPS til að hringja samtal með deilingu á skjá.",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall & samstarfstól keyrt með [matrix]"
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall & samstarfstól keyrt með [matrix]",
+    "Open": "Opna",
+    "Unsupported browser": "Óstuddur vafri",
+    "Your browser can't run %(brand)s": "Vafri þinn geta ekki keyrt upp %(brand)s",
+    "Sign In": "Skrá inn",
+    "Create Account": "Stofna Reikning",
+    "Explore rooms": "Kanna herbergi",
+    "Missing indexeddb worker script!": "Að vanta indexeddb vinnumaður tölvuhandrit!",
+    "The message from the parser is: %(message)s": "Skilaboðið frá þáttaranum er %(message)s",
+    "Invalid JSON": "Ógilt JSON",
+    "Download Completed": "Niðurhalið Búið",
+    "%(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.": "vinsamlegast setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> fyrir besta reynsluna.",
+    "I understand the risks and wish to continue": "Ég skil áhættuna og óska að halda áfram",
+    "Go to element.io": "farðu í element.io"
 }

src/i18n/strings/pt_BR.json

@@ -1,10 +1,10 @@
 {
     "Dismiss": "Descartar",
     "powered by Matrix": "oferecido por Matrix",
-    "Unknown device": "Dispositivo desconhecido",
+    "Unknown device": "Aparelho desconhecido",
     "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para poder iniciar uma chamada com compartilhamento de tela.",
     "Welcome to Element": "Seja bem-vinda(o) a Element",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo oferecido por [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo construído com [matrix]",
     "Sign In": "Entrar",
     "Create Account": "Criar Conta",
     "Explore rooms": "Explore as salas",
@@ -18,7 +18,7 @@
     "Open user settings": "Abrir configurações do usuário",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Navegador não suportado",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instale o <chromeLink> Chrome </chromeLink>, o <firefoxLink> Firefox </firefoxLink> ou o <safariLink> Safari </safariLink> para obter uma melhor experiência.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale o <chromeLink>Chrome</chromeLink>, o <firefoxLink>Firefox</firefoxLink> ou o <safariLink>Safari</safariLink> para obter a melhor experiência de uso.",
     "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.": "Você pode continuar usando o navegador atual, mas alguns dos recursos podem não funcionar e a aparência do aplicativo pode estar incorreta.",
     "I understand the risks and wish to continue": "Entendo os riscos e desejo continuar",
     "Go to element.io": "Vá para element.io",
@@ -26,11 +26,11 @@
     "Missing indexeddb worker script!": "O script indexeddb não foi encontrado!",
     "Open": "Abrir",
     "Previous/next recently visited room or community": "Anterior/Próxima sala ou comunidade visitada recentemente",
-    "%(brand)s Desktop (%(platformName)s)": "Desktop de %(brand) (%(platformName))",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "Go to your browser to complete Sign In": "Vá para o seu navegador para concluir o login",
     "Your Element is misconfigured": "Seu Element está desconfigurado",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração do Element contém JSON inválido. Por favor, corrija o problema e recarregue a página.",
-    "Your browser can't run %(brand)s": "Seu navegador não consegue rodar o %(brand)",
+    "Your browser can't run %(brand)s": "Seu navegador não consegue rodar %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidades avançadas de navegador que não são suportadas pelo seu navegador atual.",
-    "Powered by Matrix": "Powered by Matrix"
+    "Powered by Matrix": "Construído com tecnologia Matrix"
 }

src/i18n/strings/si.json

@@ -0,0 +1,4 @@
+{
+    "Unknown device": "නොදන්නා උපකරණය",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)"
+}

src/i18n/strings/uk.json

@@ -11,26 +11,26 @@
     "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.": "Невірна конфігурація: не вказано сервер за замовчуванням.",
-    "The message from the parser is: %(message)s": "Повідомлення від парсера: %(message)s",
+    "The message from the parser is: %(message)s": "Аналізатор повідомляє: %(message)s",
     "Invalid JSON": "Хибний JSON",
     "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.": "Ви можете продовжити, користуючись вашим поточним переглядачем, але деякі функції можуть не працювати і застосунок може виглядати неправильно.",
+    "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",
     "Failed to start": "Запуск не вдався",
     "Download Completed": "Завантаження завершено",
     "Missing indexeddb worker script!": "Відсутній скрипт воркеру для IndexedDB!",
     "Your Element is misconfigured": "Ваш Element налаштовано неправильно",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Конфігурація Element містить невірний JSON. Виправте проблему та обновіть сторінку.",
-    "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.": "Ваша конфігурація Element містить хибний JSON. Виправте проблему та оновіть сторінку.",
+    "Unable to load config file: please refresh the page to try again.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку.",
     "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": "Перейдіть у браузер для завершення входу",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
+    "Go to your browser to complete Sign In": "Відкрийте переглядач щоб завершити входження",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Powered by Matrix": "Працює на Matrix",
-    "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 використовує багато новітніх функцій, які не підтримуються вашим браузером."
+    "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 використовує передові властивості, які ваш переглядач не підтримує."
 }

src/vector/mobile_guide/index.js

@@ -93,7 +93,7 @@ async function initPage() {
 
     if (hsUrl !== 'https://matrix.org/') {
         document.getElementById('configure_element_button').href =
-            "https://app.element.io/config/config?hs_url=" + encodeURIComponent(hsUrl) +
+            "https://mobile.element.io?hs_url=" + encodeURIComponent(hsUrl) +
             "&is_url=" + encodeURIComponent(isUrl);
         document.getElementById('step1_heading').innerHTML= '1: Install the app';
         document.getElementById('step2_container').style.display = 'block';

yarn.lock

@@ -1394,16 +1394,6 @@
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/experimental-utils@^2.5.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
-  integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.34.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
-
 "@typescript-eslint/parser@^3.4.0":
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz#3e9cd9df9ea644536feb6e5acdb8279ecff96ce9"
@@ -1420,19 +1410,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz#09897fab0cb95479c01166b10b2c03c224821077"
   integrity sha512-reCaK+hyKkKF+itoylAnLzFeNYAEktB0XVfSQvf0gcVgpz1l49Lt6Vo9x4MVCCxiDydA0iLAjTF/ODH0pbfnpg==
 
-"@typescript-eslint/typescript-estree@2.34.0":
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
-  integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
-  dependencies:
-    debug "^4.1.1"
-    eslint-visitor-keys "^1.1.0"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
-
 "@typescript-eslint/typescript-estree@3.7.0":
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz#66872e6da120caa4b64e6b4ca5c8702afc74738d"
@@ -3866,9 +3843,9 @@ electron-to-chromium@^1.3.413:
   integrity sha512-Oo+0+CN9d2z6FToQW6Hwvi9ez09Y/usKwr0tsDsyg43a871zVJCi1nR0v03djLbRNcaCKjtrnVf2XJhTxEpPCg==
 
 elliptic@^6.0.0, elliptic@^6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
-  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -4069,11 +4046,6 @@ eslint-config-google@^0.14.0:
   resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a"
   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
 
-eslint-config-google@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz#5598f8498e9e078420f34b80495b8d959f651fb2"
-  integrity sha1-VZj4SY6eB4Qg80uASVuNlZ9lH7I=
-
 eslint-config-matrix-org@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.2.tgz#b5d7e193e4f3fc5041905967b53c5ddd6924c793"
@@ -4169,13 +4141,6 @@ eslint-plugin-import@^2.14.0:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jest@^23.0.4:
-  version "23.13.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.13.2.tgz#7b7993b4e09be708c696b02555083ddefd7e4cc7"
-  integrity sha512-qZit+moTXTyZFNDqSIR88/L3rdBlTU7CuW6XmyErD2FfHEkdoLgThkRbiQjzgYnX6rfgLx3Ci4eJmF4Ui5v1Cw==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "^2.5.0"
-
 eslint-plugin-react-hooks@^2.2.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0"
@@ -7347,10 +7312,9 @@ mathml-tag-names@^2.1.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@8.0.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "8.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.0.tgz#78efb071ed1f6430553a9d6937d7bcfbae24cce8"
-  integrity sha512-1p0Bv5My0+opkgqq9jGMa8myimGjiuGjzONR9o9i+VY/2hCaT67qIs3oNM3RI+c8sanijr3CHBaeo4tfyXzOuQ==
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -7370,10 +7334,9 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.0.0:
+"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.0.0.tgz#d7172bee17836409356c9406e7a5a08d7cfd916b"
-  integrity sha512-dIh+I6xuCpwqm+JKGcJam2L30P5VNKPXoBkVltpMmjBtNM390ppu+KyhuPB2D0yXHwzVmAyn38dvHXgAYtK74Q==
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f9540dd7cd67666ad58beac9b11c7bc4a5872673"
   dependencies:
     "@babel/runtime" "^7.10.5"
     await-lock "^2.0.1"
@@ -7401,7 +7364,7 @@ matrix-react-sdk@3.0.0:
     is-ip "^2.0.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.19"
-    matrix-js-sdk "8.0.0"
+    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
     minimist "^1.2.5"
     pako "^1.0.11"
     parse5 "^5.1.1"