Skip to content

Commit 60881d7

Browse files
authored
Merge pull request #3281 from element-hq/robin/backport-reintroduce-update-state
Improve the reliability of state changes in widget mode
2 parents 8497f00 + 5f65c51 commit 60881d7

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102
"livekit-client": "^2.11.3",
103103
"lodash-es": "^4.17.21",
104104
"loglevel": "^1.9.1",
105-
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#f3f4a1f7e2f5f2c26cf4fce89a729a9197f619b5",
106-
"matrix-widget-api": "1.11.0",
105+
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#head=toger5/add-room-key-fallback-on-encryption-manager-not-supported",
106+
"matrix-widget-api": "^1.13.0",
107107
"normalize.css": "^8.0.1",
108108
"observable-hooks": "^4.2.3",
109109
"pako": "^2.0.4",
@@ -133,8 +133,7 @@
133133
},
134134
"resolutions": {
135135
"@livekit/components-core/rxjs": "^7.8.1",
136-
"@livekit/track-processors/@mediapipe/tasks-vision": "^0.10.18",
137-
"matrix-widget-api": "1.11.0"
136+
"@livekit/track-processors/@mediapipe/tasks-vision": "^0.10.18"
138137
},
139138
"packageManager": "yarn@4.7.0"
140139
}

yarn.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7007,8 +7007,8 @@ __metadata:
70077007
livekit-client: "npm:^2.11.3"
70087008
lodash-es: "npm:^4.17.21"
70097009
loglevel: "npm:^1.9.1"
7010-
matrix-js-sdk: "github:matrix-org/matrix-js-sdk#f3f4a1f7e2f5f2c26cf4fce89a729a9197f619b5"
7011-
matrix-widget-api: "npm:1.11.0"
7010+
matrix-js-sdk: "github:matrix-org/matrix-js-sdk#head=toger5/add-room-key-fallback-on-encryption-manager-not-supported"
7011+
matrix-widget-api: "npm:^1.13.0"
70127012
normalize.css: "npm:^8.0.1"
70137013
observable-hooks: "npm:^4.2.3"
70147014
pako: "npm:^2.0.4"
@@ -9610,9 +9610,9 @@ __metadata:
96109610
languageName: node
96119611
linkType: hard
96129612

9613-
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#f3f4a1f7e2f5f2c26cf4fce89a729a9197f619b5":
9614-
version: 37.5.0
9615-
resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=f3f4a1f7e2f5f2c26cf4fce89a729a9197f619b5"
9613+
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#head=toger5/add-room-key-fallback-on-encryption-manager-not-supported":
9614+
version: 37.6.0
9615+
resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=7fa9195e398764749b0195f14d3cf0190ad10253"
96169616
dependencies:
96179617
"@babel/runtime": "npm:^7.12.5"
96189618
"@matrix-org/matrix-sdk-crypto-wasm": "npm:^14.0.1"
@@ -9629,17 +9629,17 @@ __metadata:
96299629
sdp-transform: "npm:^2.14.1"
96309630
unhomoglyph: "npm:^1.0.6"
96319631
uuid: "npm:11"
9632-
checksum: 10c0/14058044851110df967252ab9df0dcc480b2f60cedfb049edb51f8b8925d131f78b4ee9b974e5cdd39093fa32ce7e3318523059c82ecce290fa2fe03ed98506b
9632+
checksum: 10c0/f2c973cf7e4ac01b387a78af11c44735cc2895b28b571f9bbe8c18ed29c3d7383272116dc181057b69e55771dbafb3a4a1527593d54f3c37db705fb57b81616d
96339633
languageName: node
96349634
linkType: hard
96359635

9636-
"matrix-widget-api@npm:1.11.0":
9637-
version: 1.11.0
9638-
resolution: "matrix-widget-api@npm:1.11.0"
9636+
"matrix-widget-api@npm:^1.10.0, matrix-widget-api@npm:^1.13.0":
9637+
version: 1.13.1
9638+
resolution: "matrix-widget-api@npm:1.13.1"
96399639
dependencies:
96409640
"@types/events": "npm:^3.0.0"
96419641
events: "npm:^3.2.0"
9642-
checksum: 10c0/ac35ed8fb2b5df6d186beb64b5faf907ec113d708ad8353bdd8f9196fb3da255561b8807e2e845f39d4cf7ae6af36f90b54c230a0a100556ac7ebd8f18bee848
9642+
checksum: 10c0/25ded744922755b3eb65f4e171cf6cff1a2e0fe43fc3fecbb13e565e41d8af066daa817dd2c3c7d921b996af399eec3b23df70ab7b682cf422d9cee7ca202512
96439643
languageName: node
96449644
linkType: hard
96459645

0 commit comments

Comments
 (0)