Skip to content

Commit

Permalink
Reset matrix-js-sdk back to develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
RiotRobot committed Jul 18, 2023
1 parent 19d663d commit 1c420b4
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
"@matrix-org/react-sdk-module-api": "^1.0.0",
"gfm.css": "^1.1.2",
"jsrsasign": "^10.5.25",
"katex": "^0.16.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"katex": "^0.16.0",
"matrix-widget-api": "^1.3.1",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
34 changes: 28 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1634,6 +1634,11 @@
resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.5.0.tgz#38b69c4e29d243944c5712cca7b674a3432056e6"
integrity sha512-uL5kf7MqC+GxsGJtimPVbFliyaFinohTHSzohz31JTysktHsjRR2SC+vV7sy2/dstTWVdG9EGOnohyPsB+oi3A==

"@matrix-org/matrix-sdk-crypto-js@^0.1.1":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.4.tgz#c13c7c8c3a1d8da08e6ad195d25e5e61cc402df7"
integrity sha512-OxG84iSeR89zYLFeb+DCaFtZT+DDiIu+kTkqY8OYfhE5vpGLFX2sDVBRrAdos1IUqEoboDloDBR9+yU7hNRyog==

"@matrix-org/matrix-sdk-crypto-wasm@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.0.1.tgz#21a0557a7bb3f60b37c6d412be8906c056fe79b8"
Expand All @@ -1646,7 +1651,6 @@

"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz":
version "3.2.14"
uid acd96c00a881d0f462e1f97a56c73742c8dbc984
resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz#acd96c00a881d0f462e1f97a56c73742c8dbc984"

"@matrix-org/react-sdk-module-api@^1.0.0":
Expand Down Expand Up @@ -8415,10 +8419,29 @@ 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@27.0.0:
version "27.0.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.0.0.tgz#83dae79930325a5aa552f9d9899b31351ecc7bf3"
integrity sha512-Py9My7t72sU0YawdqRCs1BvDwjvAUR5gmwa/oXBxMPFIV5qDrm4F8NvUJLNA80DnYxQT4nDjnM69H8QLv5IRfg==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-js" "^0.1.1"
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.3.1"
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 "26.2.0"
uid "0b193f466562304d7f9976aec1970d42cf2abb08"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/0b193f466562304d7f9976aec1970d42cf2abb08"
version "27.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f77662406c681e685ba600b4a8b9ede14e1f674f"
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm" "^1.0.1"
Expand All @@ -8444,7 +8467,6 @@ matrix-mock-request@^2.5.0:

"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.75.0"
uid f1db2b3687baf0c7456b796fbfd5afe33fca2531
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f1db2b3687baf0c7456b796fbfd5afe33fca2531"
dependencies:
"@babel/runtime" "^7.12.5"
Expand Down Expand Up @@ -8485,7 +8507,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 "27.0.0"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-widget-api "^1.4.0"
memoize-one "^6.0.0"
minimist "^1.2.5"
Expand Down

0 comments on commit 1c420b4

Please sign in to comment.