Reset to develop branch of matrix-js-sdk

Now that the toger5/add-room-key-fallback-on-encryption-manager-not-supported branch has been merged, we can reset to develop. (And need to, actually, because that branch is deleted.)
Merge pull request #3177 from element-hq/robin/reintroduce-update-state
2026-08-20 20:49:20 +00:00 · 2025-05-22 11:59:36 -04:00 · 2025-05-21 13:09:13 -04:00 · 2025-05-21 12:59:31 -04:00 · 2025-05-21 14:22:34 +02:00 · 2025-05-21 08:06:04 -04:00
3 changed files with 19 additions and 20 deletions
--- a/dev-backend-docker-compose.yml
+++ b/dev-backend-docker-compose.yml
@@ -6,7 +6,7 @@ services:
    image: ghcr.io/element-hq/lk-jwt-service:latest-ci
    hostname: auth-server
    environment:
-      - LK_JWT_PORT=8080
+      - LIVEKIT_JWT_PORT=8080
      - LIVEKIT_URL=wss://matrix-rtc.m.localhost/livekit/sfu
      - LIVEKIT_KEY=devkey
      - LIVEKIT_SECRET=secret
--- a/package.json
+++ b/package.json
@@ -102,8 +102,8 @@
    "livekit-client": "^2.11.3",
    "lodash-es": "^4.17.21",
    "loglevel": "^1.9.1",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#f3f4a1f7e2f5f2c26cf4fce89a729a9197f619b5",
-    "matrix-widget-api": "1.11.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#head=develop",
+    "matrix-widget-api": "^1.13.0",
    "normalize.css": "^8.0.1",
    "observable-hooks": "^4.2.3",
    "pako": "^2.0.4",
@@ -133,8 +133,7 @@
  },
  "resolutions": {
    "@livekit/components-core/rxjs": "^7.8.1",
-    "@livekit/track-processors/@mediapipe/tasks-vision": "^0.10.18",
-    "matrix-widget-api": "1.11.0"
+    "@livekit/track-processors/@mediapipe/tasks-vision": "^0.10.18"
  },
  "packageManager": "yarn@4.7.0"
 }
--- a/yarn.lock
+++ b/yarn.lock
@@ -2547,10 +2547,10 @@ __metadata:
  languageName: node
  linkType: hard

-"@matrix-org/matrix-sdk-crypto-wasm@npm:^14.0.1":
-  version: 14.0.1
-  resolution: "@matrix-org/matrix-sdk-crypto-wasm@npm:14.0.1"
-  checksum: 10c0/6e98abb61f8d6c43b26f04e83db92b39db74352861495eda9ac472b2f58411a45b2f150e4361c44c6800f98f99e89350d11941e87b9bf22204c9cab83ca93e27
+"@matrix-org/matrix-sdk-crypto-wasm@npm:^14.2.0":
+  version: 14.2.0
+  resolution: "@matrix-org/matrix-sdk-crypto-wasm@npm:14.2.0"
+  checksum: 10c0/cc51417d71ffe506401dbb85ff4930bf89b33b6718c9052ba3cc1b2989e989e5e7e6fceea7c5fb58576d64e7a5c947c4cece89dbfa785083d293508c80e0713d
  languageName: node
  linkType: hard

@@ -7007,8 +7007,8 @@ __metadata:
    livekit-client: "npm:^2.11.3"
    lodash-es: "npm:^4.17.21"
    loglevel: "npm:^1.9.1"
-    matrix-js-sdk: "github:matrix-org/matrix-js-sdk#f3f4a1f7e2f5f2c26cf4fce89a729a9197f619b5"
-    matrix-widget-api: "npm:1.11.0"
+    matrix-js-sdk: "github:matrix-org/matrix-js-sdk#head=develop"
+    matrix-widget-api: "npm:^1.13.0"
    normalize.css: "npm:^8.0.1"
    observable-hooks: "npm:^4.2.3"
    pako: "npm:^2.0.4"
@@ -9610,12 +9610,12 @@ __metadata:
  languageName: node
  linkType: hard

-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#f3f4a1f7e2f5f2c26cf4fce89a729a9197f619b5":
-  version: 37.5.0
-  resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=f3f4a1f7e2f5f2c26cf4fce89a729a9197f619b5"
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#head=develop":
+  version: 37.6.0
+  resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=93982716951ce2583904bfc26b27d6a86ba17a87"
  dependencies:
    "@babel/runtime": "npm:^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-wasm": "npm:^14.0.1"
+    "@matrix-org/matrix-sdk-crypto-wasm": "npm:^14.2.0"
    "@matrix-org/olm": "npm:3.2.15"
    another-json: "npm:^0.2.0"
    bs58: "npm:^6.0.0"
@@ -9629,17 +9629,17 @@ __metadata:
    sdp-transform: "npm:^2.14.1"
    unhomoglyph: "npm:^1.0.6"
    uuid: "npm:11"
-  checksum: 10c0/14058044851110df967252ab9df0dcc480b2f60cedfb049edb51f8b8925d131f78b4ee9b974e5cdd39093fa32ce7e3318523059c82ecce290fa2fe03ed98506b
+  checksum: 10c0/22a28099d2deaf0ca7f609a5859fe00fbd20c314d3b607a95b4a623a8aa159e428310b1849c77ab7b9875a29fc2d924cddbb6fc83dc4e42a74c4713401dcb0be
  languageName: node
  linkType: hard

-"matrix-widget-api@npm:1.11.0":
-  version: 1.11.0
-  resolution: "matrix-widget-api@npm:1.11.0"
+"matrix-widget-api@npm:^1.10.0, matrix-widget-api@npm:^1.13.0":
+  version: 1.13.1
+  resolution: "matrix-widget-api@npm:1.13.1"
  dependencies:
    "@types/events": "npm:^3.0.0"
    events: "npm:^3.2.0"
-  checksum: 10c0/ac35ed8fb2b5df6d186beb64b5faf907ec113d708ad8353bdd8f9196fb3da255561b8807e2e845f39d4cf7ae6af36f90b54c230a0a100556ac7ebd8f18bee848
+  checksum: 10c0/25ded744922755b3eb65f4e171cf6cff1a2e0fe43fc3fecbb13e565e41d8af066daa817dd2c3c7d921b996af399eec3b23df70ab7b682cf422d9cee7ca202512
  languageName: node
  linkType: hard
Author	SHA1	Message	Date
Robin	821c6e3763	Reset to develop branch of matrix-js-sdk Now that the toger5/add-room-key-fallback-on-encryption-manager-not-supported branch has been merged, we can reset to develop. (And need to, actually, because that branch is deleted.)	2025-05-22 11:59:36 -04:00
Robin	aeae964e97	Merge pull request #3177 from element-hq/robin/reintroduce-update-state Improve the reliability of state changes in widget mode	2025-05-21 13:09:13 -04:00
Robin	e4924df8fb	Reference matrix-js-sdk by branch name Rather than by commit, which makes it hard to tell whether we're using mainline matrix-js-sdk or not.	2025-05-21 12:59:31 -04:00
fkwp	cd48139fc3	Merge pull request #3279 from element-hq/af/backend-compose-fix-lk-port-cfg Fix lk-jwt-service config in example compose file	2025-05-21 14:22:34 +02:00
Andrew Ferrazzutti	2ec4b4ee87	Fix lk-jwt-service config in example compose file The port config name was changed in v0.2.0	2025-05-21 08:06:04 -04:00
Robin	c473d1fa8f	Update matrix-widget-api to support update_state action	2025-05-20 17:54:57 -04:00
Robin	57f312494f	Update matrix-js-sdk to support update_state action	2025-05-20 17:54:30 -04:00