diff --git a/package.json b/package.json index c0e489515e..fa4535935b 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "is-ip": "^2.0.0", "linkifyjs": "^2.1.6", "lodash": "^4.17.14", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "6.2.0-rc.1", "minimist": "^1.2.0", "pako": "^1.0.5", "parse5": "^5.1.1", @@ -164,7 +164,9 @@ "testMatch": [ "/test/**/*-test.js" ], - "setupFiles": ["jest-canvas-mock"], + "setupFiles": [ + "jest-canvas-mock" + ], "setupFilesAfterEnv": [ "/test/setupTests.js" ], diff --git a/yarn.lock b/yarn.lock index d9423fc5ab..3a3fca0fcc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5801,9 +5801,10 @@ mathml-tag-names@^2.0.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@github:matrix-org/matrix-js-sdk#develop": - version "6.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a4a7097c103da42075f2c70e070fd01fa6fb0d48" +matrix-js-sdk@6.2.0-rc.1: + version "6.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.0-rc.1.tgz#467cc1dc9f59a95573da8bc5f9eeef76e5fdd792" + integrity sha512-bAg8muF2xP6kXLpbDSSWRTvkxV7QoF8H14RmMxAu4IWuQg/WB7BFcG7JZyGwyOD7gmPVPMIw8mHXGkUuh1mKtA== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0"