Skip to content

Commit 10d5855

Browse files
committed
Reset matrix-react-sdk back to develop branch
1 parent 182ec9c commit 10d5855

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"jsrsasign": "^10.1.5",
6060
"katex": "^0.12.0",
6161
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
62-
"matrix-react-sdk": "3.20.0",
62+
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
6363
"matrix-widget-api": "^0.1.0-beta.13",
6464
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
6565
"prop-types": "^15.7.2",

yarn.lock

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7630,21 +7630,6 @@ mathml-tag-names@^2.1.3:
76307630
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
76317631
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
76327632

7633-
7634-
version "10.1.0"
7635-
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.1.0.tgz#11a78e0330530f78498847c52d390d2a599b029b"
7636-
integrity sha512-VR1bwSKOf7jZa9+0UoAsYvyvLsNGBhT/BdxHMgQKuwx34GwZucp3Tqg/Ng2oTK+0b991xkEk4nRvJoCKK++Ulg==
7637-
dependencies:
7638-
"@babel/runtime" "^7.12.5"
7639-
another-json "^0.2.0"
7640-
browser-request "^0.3.3"
7641-
bs58 "^4.0.1"
7642-
content-type "^1.0.4"
7643-
loglevel "^1.7.1"
7644-
qs "^6.9.6"
7645-
request "^2.88.2"
7646-
unhomoglyph "^1.0.6"
7647-
76487633
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
76497634
version "10.1.0"
76507635
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2d73805ca3d8c5a140fe05e574f826696de1656a"
@@ -7667,10 +7652,9 @@ matrix-mock-request@^1.2.3:
76677652
bluebird "^3.5.0"
76687653
expect "^1.20.2"
76697654

7670-
matrix-react-sdk@3.20.0:
7655+
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
76717656
version "3.20.0"
7672-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.20.0.tgz#ac64cb6b769d000a1c076ff87be4c75daa97581a"
7673-
integrity sha512-ZSfmr+VdZwiN7DOXubX0LbnB/TL1OU7W93JndEjKDUIn3jCAdbHQdlAefQRsRmyWIQbfuEKyOlrG6qn+Ua7o6Q==
7657+
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/1b372b17e039db98a9dba34ba90e25e5433b1aec"
76747658
dependencies:
76757659
"@babel/runtime" "^7.12.5"
76767660
await-lock "^2.1.0"
@@ -7698,7 +7682,7 @@ [email protected]:
76987682
katex "^0.12.0"
76997683
linkifyjs "^2.1.9"
77007684
lodash "^4.17.20"
7701-
matrix-js-sdk "10.1.0"
7685+
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
77027686
matrix-widget-api "^0.1.0-beta.13"
77037687
minimist "^1.2.5"
77047688
opus-recorder "^8.0.3"
@@ -7716,7 +7700,7 @@ [email protected]:
77167700
react-transition-group "^4.4.1"
77177701
resize-observer-polyfill "^1.5.1"
77187702
rfc4648 "^1.4.0"
7719-
sanitize-html "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db"
7703+
sanitize-html "^2.3.2"
77207704
tar-js "^0.3.0"
77217705
text-encoding-utf-8 "^1.0.2"
77227706
url "^0.11.0"
@@ -8823,6 +8807,11 @@ parse-passwd@^1.0.0:
88238807
resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
88248808
integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
88258809

8810+
parse-srcset@^1.0.2:
8811+
version "1.0.2"
8812+
resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
8813+
integrity sha1-8r0iH2zJcKk42IVWq8WJyqqiveE=
8814+
88268815
parse5-htmlparser2-tree-adapter@^6.0.0:
88278816
version "6.0.1"
88288817
resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
@@ -10709,6 +10698,19 @@ sane@^4.0.3:
1070910698
minimist "^1.1.1"
1071010699
walker "~1.0.5"
1071110700

10701+
sanitize-html@^2.3.2:
10702+
version "2.3.3"
10703+
resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.3.3.tgz#3db382c9a621cce4c46d90f10c64f1e9da9e8353"
10704+
integrity sha512-DCFXPt7Di0c6JUnlT90eIgrjs6TsJl/8HYU3KLdmrVclFN4O0heTcVbJiMa23OKVr6aR051XYtsgd8EWwEBwUA==
10705+
dependencies:
10706+
deepmerge "^4.2.2"
10707+
escape-string-regexp "^4.0.0"
10708+
htmlparser2 "^6.0.0"
10709+
is-plain-object "^5.0.0"
10710+
klona "^2.0.3"
10711+
parse-srcset "^1.0.2"
10712+
postcss "^8.0.2"
10713+
1071210714
"sanitize-html@github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db":
1071310715
version "2.0.0-rc.3"
1071410716
resolved "https://codeload.github.com/apostrophecms/sanitize-html/tar.gz/3c7f93f2058f696f5359e3e58d464161647226db"

0 commit comments

Comments
 (0)