From 667f902278a57b3421329595a0bece291efef370 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Mon, 7 Nov 2022 12:50:59 -0500 Subject: [PATCH] Switch to the develop branch of matrix-js-sdk --- README.md | 3 +-- package.json | 2 +- yarn.lock | 9 +++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1445381..9a1d82b 100644 --- a/README.md +++ b/README.md @@ -42,12 +42,11 @@ server { ## Development -Element Call is built against the `robertlong/group-call` branch of [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk/pull/2553). To get started, clone, install, and link the package: +Element Call is built against [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk/pull/2553). To get started, clone, install, and link the package: ``` git clone https://github.com/matrix-org/matrix-js-sdk.git cd matrix-js-sdk -git switch robertlong/group-call yarn yarn link ``` diff --git a/package.json b/package.json index d7efc5d..4756e2d 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "i18next": "^21.10.0", "i18next-browser-languagedetector": "^6.1.8", "i18next-http-backend": "^1.4.4", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#8235b65d713ba0c8be0e9f9c891472786b571b97", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#df2b65f111cf09df19b12fbe8210a54a1a23b3d8", "matrix-widget-api": "^1.0.0", "mermaid": "^8.13.8", "normalize.css": "^8.0.1", diff --git a/yarn.lock b/yarn.lock index 8e62118..a1dfff3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10191,14 +10191,14 @@ matcher-collection@^2.0.0: "@types/minimatch" "^3.0.3" minimatch "^3.0.2" -matrix-events-sdk@^0.0.1-beta.7: +matrix-events-sdk@0.0.1-beta.7: version "0.0.1-beta.7" resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#8235b65d713ba0c8be0e9f9c891472786b571b97": +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#df2b65f111cf09df19b12fbe8210a54a1a23b3d8": version "21.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/8235b65d713ba0c8be0e9f9c891472786b571b97" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/df2b65f111cf09df19b12fbe8210a54a1a23b3d8" dependencies: "@babel/runtime" "^7.12.5" "@types/sdp-transform" "^2.4.5" @@ -10206,7 +10206,7 @@ matrix-events-sdk@^0.0.1-beta.7: bs58 "^5.0.0" content-type "^1.0.4" loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" + matrix-events-sdk "0.0.1-beta.7" matrix-widget-api "^1.0.0" p-retry "4" qs "^6.9.6" @@ -12608,6 +12608,7 @@ rrweb-snapshot@^1.1.14: version "1.1.14" resolved "https://registry.yarnpkg.com/rrweb-snapshot/-/rrweb-snapshot-1.1.14.tgz#9d4d9be54a28a893373428ee4393ec7e5bd83fcc" integrity sha512-eP5pirNjP5+GewQfcOQY4uBiDnpqxNRc65yKPW0eSoU1XamDfc4M8oqpXGMyUyvLyxFDB0q0+DChuxxiU2FXBQ== + rsvp@^4.8.2: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"