From 9e2648877a5208b4cbc8d7bf8d503fba95ac9753 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 23 Nov 2020 16:52:23 +0000 Subject: [PATCH] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 31 +++++++++++-------------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 19b7c488f2..d2c2e274af 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.9.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.8", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 2dcbdcaca1..8c82719dee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,6 @@ 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@9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.2.0.tgz#4b01dbb170266c4fe37be9397065d870561ad220" - integrity sha512-3lPgCB2in+AHDd+tLT8HbJ9elqDeJjYCE8i8Ti+NO2Myua62HIsf3pE/C/FE/QCDTuZBTjN0vgjym22M+GO65g== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "9.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6661bde6088e6e43f31198e8532432e162aef33c" @@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.9.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.9.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.9.0.tgz#23836f79d143d359ef63020d7ae9999c4a406c02" - integrity sha512-T24usyiQVepk/hptzFvCDYoWGjfrxe2TFR/59LaEn38+mRBzyogXshOLBpsZOLDAfvvE8RFfYmCH1z58AO2j/Q== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/ddc3f275a803269ee301d73d788fd1053120d59a" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7965,8 +7949,8 @@ matrix-react-sdk@3.9.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.2.0" - matrix-widget-api "^0.1.0-beta.8" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-widget-api "^0.1.0-beta.9" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -8003,6 +7987,13 @@ matrix-widget-api@^0.1.0-beta.8: dependencies: events "^3.2.0" +matrix-widget-api@^0.1.0-beta.9: + version "0.1.0-beta.9" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.9.tgz#83952132c1610e013acb3e695f923f971ddd5637" + integrity sha512-nXo4iaquSya6hYLXccX8o1K960ckSQ0YXIubRDha+YmB+L09F5a7bUPS5JN2tYANOMzyfFAzWVuFwjHv4+K+rg== + dependencies: + events "^3.2.0" + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"