From 12da7c2773e6170e4c2093b8d5f6ab6e48359ada Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 31 Oct 2023 14:59:24 +0000 Subject: [PATCH] Upgrade matrix-react-sdk to 3.84.0-rc.1 --- package.json | 6 +++--- yarn.lock | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f13c6e25bc..7eb8d0ec02 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.84.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", @@ -124,6 +124,7 @@ "chokidar": "^3.5.1", "concurrently": "^8.0.0", "cpx": "1.5.0", + "cronstrue": "^2.41.0", "css-loader": "^4", "dotenv": "^16.0.2", "eslint": "8.51.0", @@ -186,8 +187,7 @@ "webpack-dev-server": "^4.15.1", "worker-loader": "^3.0.0", "worklet-loader": "^2.0.0", - "yaml": "^2.3.3", - "cronstrue": "^2.41.0" + "yaml": "^2.3.3" }, "@casualbot/jest-sonar-reporter": { "outputDirectory": "coverage", diff --git a/yarn.lock b/yarn.lock index 4d3b9efb33..63a8f589e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1666,6 +1666,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.1.1.tgz#5b20125d73eb404b1c49b61380f443c5fcfbacd2" integrity sha512-PNFdLr68uLNT81iFmJL0PH98t7/U4g+a51d5+BmbKo0LEqchLkEKNraD1vq/kzPK6X7p/3IapQI5P+5Lr8jHsg== +"@matrix-org/matrix-sdk-crypto-wasm@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.2.0.tgz#7c60afe01915281a6b71502821bc8e01afbfa70d" + integrity sha512-txmvaTiZpVV0/kWCRcE7tZvRESCEc1ynLJDVh9OUsFlaXfl13c7qdD3E6IJEJ8YiPMIn+PHogdfBZsO84reaMg== + "@matrix-org/matrix-wysiwyg@2.4.1": version "2.4.1" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.4.1.tgz#e1325a42366a1c891b2ba90c88e597b39187b2cb" @@ -8818,6 +8823,26 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== +matrix-js-sdk@30.0.0-rc.1: + version "30.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.0.0-rc.1.tgz#e3ff14c6992562ca12c205020b7c1bfc57b451fa" + integrity sha512-W7/MCbNKuhXPfCmdhbWPclJy8xiY39jcW7nch8mKI5ovxTtgE1yioKcFVjIGIgjPrOJ5bmVrnsAQsgra2RV5Yw== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^2.2.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^3.1.2" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^2.2.4" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "9" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "29.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d750e33ec955a9305a29426e5a64f05e66b14310" @@ -8844,9 +8869,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.83.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/6e24b4d221e6deb9b84173f1afb753ce7211de00" +matrix-react-sdk@3.84.0-rc.1: + version "3.84.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.84.0-rc.1.tgz#0683b44c05095d57fe40adfa50c2cee1cc0f0ce5" + integrity sha512-8SHgC1/nSrHp87UIZxF/0rqSdJru/5E0bEiINaaUaTGV+MVDgF/kCa/2T67FO2MCMFWYF6+NYZxhbpDdwZX4ew== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.8.0" @@ -8889,7 +8915,7 @@ matrix-mock-request@^2.5.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "30.0.0-rc.1" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5"