Skip to content

Commit 260ffdd

Browse files
authored
Merge branch 'develop' into compose-menu-tooltip
2 parents d2f38ed + e4e33cf commit 260ffdd

File tree

3 files changed

+35
-36
lines changed

3 files changed

+35
-36
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker.io/docker/dockerfile:1.19-labs@sha256:dce1c693ef318bca08c964ba3122ae6248e45a1b96d65c4563c8dc6fe80349a2
22

33
# Builder
4-
FROM --platform=$BUILDPLATFORM node:22-bullseye@sha256:cd951bb228ddf85882951d4bf4acefc5314eb2eb66eee002256f4bb17c2293e3 AS builder
4+
FROM --platform=$BUILDPLATFORM node:22-bullseye@sha256:38a57b74bd8640a5a70d6dcb0ea587e1574493615774bca4f28bc5354787d82c AS builder
55

66
# Support custom branch of the js-sdk. This also helps us build images of element-web develop.
77
ARG USE_CUSTOM_SDKS=false

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
"@babel/preset-typescript": "^7.12.7",
182182
"@babel/runtime": "^7.12.5",
183183
"@casualbot/jest-sonar-reporter": "2.2.7",
184-
"@element-hq/element-call-embedded": "0.16.0",
184+
"@element-hq/element-call-embedded": "0.16.1",
185185
"@element-hq/element-web-playwright-common": "^2.0.0",
186186
"@peculiar/webcrypto": "^1.4.3",
187187
"@playwright/test": "^1.50.1",

yarn.lock

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,10 +1556,10 @@
15561556
resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.2.1.tgz#cd0b25b3808cd9e684cd6cd549bbf8e1dcf05ee7"
15571557
integrity sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==
15581558

1559-
"@element-hq/[email protected].0":
1560-
version "0.16.0"
1561-
resolved "https://registry.yarnpkg.com/@element-hq/element-call-embedded/-/element-call-embedded-0.16.0.tgz#dae457fd38c5b251f6ea32594c43626a4f9d5d8a"
1562-
integrity sha512-cTJwW9cmQHrTUvcJm0xv9uSTMYiToDEaw5AuxXQS9jVjHQT8B3W3DWtKYAzq1PRRH13JZkcwXbHjdFpkxzhzCQ==
1559+
"@element-hq/[email protected].1":
1560+
version "0.16.1"
1561+
resolved "https://registry.yarnpkg.com/@element-hq/element-call-embedded/-/element-call-embedded-0.16.1.tgz#28bdbde426051cc2a3228a36e7196e0a254569d3"
1562+
integrity sha512-g3v/QFuNy8YVRGrKC5SxjIYvgBh6biOHgejhJT2Jk/yjOOUEuP0y2PBaADm+suPD9BB/Vk1jPxFk2uEIpEzhpA==
15631563

15641564
"@element-hq/[email protected]":
15651565
version "1.4.1"
@@ -3419,9 +3419,9 @@
34193419
"@types/ssh2" "*"
34203420

34213421
"@types/dockerode@^3.3.44":
3422-
version "3.3.44"
3423-
resolved "https://registry.yarnpkg.com/@types/dockerode/-/dockerode-3.3.44.tgz#1e6d5b291646820e9daabfa132cdb33c9d535b56"
3424-
integrity sha512-fUpIHlsbYpxAJb285xx3vp7q5wf5mjqSn3cYwl/MhiM+DB99OdO5sOCPlO0PjO+TyOtphPs7tMVLU/RtOo/JjA==
3422+
version "3.3.45"
3423+
resolved "https://registry.yarnpkg.com/@types/dockerode/-/dockerode-3.3.45.tgz#1b5f19301563acf811adc13a6b2b3e0981998a5e"
3424+
integrity sha512-iYpZF+xr5QLpIICejLdUF2r5gh8IXY1Gw3WLmt41dUbS3Vn/3hVgL+6lJBVbmrhYBWfbWPPstdr6+A0s95DTWA==
34253425
dependencies:
34263426
"@types/docker-modem" "*"
34273427
"@types/node" "*"
@@ -3653,11 +3653,11 @@
36533653
"@types/node" "*"
36543654

36553655
"@types/node@*", "@types/node@>=13.7.0":
3656-
version "24.7.2"
3657-
resolved "https://registry.yarnpkg.com/@types/node/-/node-24.7.2.tgz#5adf66b6e2ac5cab1d10a2ad3682e359cb652f4a"
3658-
integrity sha512-/NbVmcGTP+lj5oa4yiYxxeBjRivKQ5Ns1eSZeB99ExsEQ6rX5XYU1Zy/gGxY/ilqtD4Etx9mKyrPxZRetiahhA==
3656+
version "24.9.1"
3657+
resolved "https://registry.yarnpkg.com/@types/node/-/node-24.9.1.tgz#b7360b3c789089e57e192695a855aa4f6981a53c"
3658+
integrity sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==
36593659
dependencies:
3660-
undici-types "~7.14.0"
3660+
undici-types "~7.16.0"
36613661

36623662
"@types/node@18", "@types/node@^18.11.18":
36633663
version "18.19.130"
@@ -3796,9 +3796,9 @@
37963796
"@types/node" "*"
37973797

37983798
"@types/ssh2-streams@*":
3799-
version "0.1.12"
3800-
resolved "https://registry.yarnpkg.com/@types/ssh2-streams/-/ssh2-streams-0.1.12.tgz#e68795ba2bf01c76b93f9c9809e1f42f0eaaec5f"
3801-
integrity sha512-Sy8tpEmCce4Tq0oSOYdfqaBpA3hDM8SoxoFh5vzFsu2oL+znzGz8oVWW7xb4K920yYMUY+PIG31qZnFMfPWNCg==
3799+
version "0.1.13"
3800+
resolved "https://registry.yarnpkg.com/@types/ssh2-streams/-/ssh2-streams-0.1.13.tgz#f8d34a22be50fb8dbafbb2bbc289add0d22daa51"
3801+
integrity sha512-faHyY3brO9oLEA0QlcO8N2wT7R0+1sHWZvQ+y3rMLwdY1ZyS1z0W3t65j9PqT4HmQ6ALzNe7RZlNuCNE0wBSWA==
38023802
dependencies:
38033803
"@types/node" "*"
38043804

@@ -3991,9 +3991,8 @@
39913991
classnames "^2.5.1"
39923992
vaul "^1.0.0"
39933993

3994-
"@vector-im/matrix-wysiwyg-wasm@link:../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.40.0-53c9ca5ea907d91e4515da64f20a82e5586b882c-integrity/node_modules/bindings/wysiwyg-wasm":
3994+
"@vector-im/matrix-wysiwyg-wasm@link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.40.0-53c9ca5ea907d91e4515da64f20a82e5586b882c-integrity/node_modules/bindings/wysiwyg-wasm":
39953995
version "0.0.0"
3996-
uid ""
39973996

39983997
"@vector-im/[email protected]":
39993998
version "2.40.0"
@@ -4787,14 +4786,14 @@ balanced-match@^2.0.0:
47874786
integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
47884787

47894788
bare-events@^2.5.4, bare-events@^2.7.0:
4790-
version "2.8.0"
4791-
resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.8.0.tgz#ec962fa9e2bfafd4edd444942df1ed0c7aba8e4a"
4792-
integrity sha512-AOhh6Bg5QmFIXdViHbMc2tLDsBIRxdkIaIddPslJF9Z5De3APBScuqGP2uThXnIpqFrgoxMNC6km7uXNIMLHXA==
4789+
version "2.8.1"
4790+
resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.8.1.tgz#121afaeee9e9a8eb92e71d125bc85753d39913d0"
4791+
integrity sha512-oxSAxTS1hRfnyit2CL5QpAOS5ixfBjj6ex3yTNvXyY/kE719jQ/IjuESJBK2w5v4wwQRAHGseVJXx9QBYOtFGQ==
47934792

47944793
bare-fs@^4.0.1:
4795-
version "4.4.10"
4796-
resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.4.10.tgz#ddec5a889317effce9afe4cddd503b1b6b9f520d"
4797-
integrity sha512-arqVF+xX/rJHwrONZaSPhlzleT2gXwVs9rsAe1p1mIVwWZI2A76/raio+KwwxfWMO8oV9Wo90EaUkS2QwVmy4w==
4794+
version "4.5.0"
4795+
resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.5.0.tgz#f3227b4bc79a65ca7e91a1c05be5919c7c7d8340"
4796+
integrity sha512-GljgCjeupKZJNetTqxKaQArLK10vpmK28or0+RwWjEl5Rk+/xG3wkpmkv+WrcBm3q1BwHKlnhXzR8O37kcvkXQ==
47984797
dependencies:
47994798
bare-events "^2.5.4"
48004799
bare-path "^3.0.0"
@@ -4822,9 +4821,9 @@ bare-stream@^2.6.4:
48224821
streamx "^2.21.0"
48234822

48244823
bare-url@^2.2.2:
4825-
version "2.3.0"
4826-
resolved "https://registry.yarnpkg.com/bare-url/-/bare-url-2.3.0.tgz#06bb523cfdd5bb8dd224bf4e0062ff0231eca998"
4827-
integrity sha512-c+RCqMSZbkz97Mw1LWR0gcOqwK82oyYKfLoHJ8k13ybi1+I80ffdDzUy0TdAburdrR/kI0/VuN8YgEnJqX+Nyw==
4824+
version "2.3.1"
4825+
resolved "https://registry.yarnpkg.com/bare-url/-/bare-url-2.3.1.tgz#95e33e99bdc768766ca94246fdc397e88675ec9c"
4826+
integrity sha512-v2yl0TnaZTdEnelkKtXZGnotiV6qATBlnNuUMrHl6v9Lmmrh9mw9RYyImPU7/4RahumSwQS1k2oKXcRfXcbjJw==
48284827
dependencies:
48294828
bare-path "^3.0.0"
48304829

@@ -6101,7 +6100,7 @@ docker-modem@^5.0.6:
61016100
split-ca "^1.0.1"
61026101
ssh2 "^1.15.0"
61036102

6104-
dockerode@^4.0.8:
6103+
dockerode@^4.0.9:
61056104
version "4.0.9"
61066105
resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-4.0.9.tgz#15b32000edad25520be6fafa9ad6bc4529b06be7"
61076106
integrity sha512-iND4mcOWhPaCNh54WmK/KoSb35AFqPAUWFMffTQcp52uQt36b5uNwEJTSXntJZBbeGad72Crbi/hvDIv6us/6Q==
@@ -13030,9 +13029,9 @@ test-exclude@^6.0.0:
1303013029
minimatch "^3.0.4"
1303113030

1303213031
testcontainers@^11.0.0, testcontainers@^11.0.3:
13033-
version "11.7.1"
13034-
resolved "https://registry.yarnpkg.com/testcontainers/-/testcontainers-11.7.1.tgz#4ee8595f02b594012fae10433e059608a4aaa565"
13035-
integrity sha512-fjut+07G4Avp6Lly/6hQePpUpQFv9ZyQd+7JC5iCDKg+dWa2Sw7fXD3pBrkzslYFfKqGx9M6kyIaLpg9VeMsjw==
13032+
version "11.7.2"
13033+
resolved "https://registry.yarnpkg.com/testcontainers/-/testcontainers-11.7.2.tgz#4b3b0c4ebaf0dcb7a53312314107d623fc0c97ca"
13034+
integrity sha512-jeFzeyzLhIouRAbLnQNapJ2esBs/mvXkkYvO1/vSZehT3/7+Q557qaNxwKwMqAbfxfSh7gcx1OLlMsQUZ9JLdA==
1303613035
dependencies:
1303713036
"@balena/dockerignore" "^1.0.2"
1303813037
"@types/dockerode" "^3.3.44"
@@ -13041,7 +13040,7 @@ testcontainers@^11.0.0, testcontainers@^11.0.3:
1304113040
byline "^5.0.0"
1304213041
debug "^4.4.3"
1304313042
docker-compose "^1.3.0"
13044-
dockerode "^4.0.8"
13043+
dockerode "^4.0.9"
1304513044
get-port "^7.1.0"
1304613045
proper-lockfile "^4.1.2"
1304713046
properties-reader "^2.3.0"
@@ -13370,10 +13369,10 @@ undici-types@~5.26.4:
1337013369
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
1337113370
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
1337213371

13373-
undici-types@~7.14.0:
13374-
version "7.14.0"
13375-
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.14.0.tgz#4c037b32ca4d7d62fae042174604341588bc0840"
13376-
integrity sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==
13372+
undici-types@~7.16.0:
13373+
version "7.16.0"
13374+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
13375+
integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
1337713376

1337813377
undici@^7.16.0:
1337913378
version "7.16.0"

0 commit comments

Comments
 (0)