Skip to content

[pull] develop from RocketChat:develop #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 12, 2026
+33 −56
Merged

[pull] develop from RocketChat:develop #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/services/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"pino": "10.3.1",
"sodium-native": "^4.3.3",
"sodium-plus": "^0.9.0",
"ws": "~8.19.0"
"ws": "~8.21.0"
},
"devDependencies": {
"@rocket.chat/icons": "~0.47.0",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/ddp-streamer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"sharp": "^0.33.5",
"underscore": "^1.13.8",
"uuid": "^11.1.1",
"ws": "~8.19.0"
"ws": "~8.21.0"
},
"devDependencies": {
"@rocket.chat/apps-engine": "workspace:^",
Expand Down
11 changes: 10 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,12 @@
"serialize-javascript": "^7.0.5",
"launch-editor/shell-quote": "1.8.4",
"npm-run-all/shell-quote": "1.8.4",
"socks-proxy-agent/socks": "^2.8.9",
"mongodb/socks": "^2.8.9",
"underscore": "1.13.8",
"ws@npm:^8": "^8.20.1",
"ws@npm:^8.2.3": "^8.20.1",
"ws@npm:^8.18.0": "^8.20.1",
"undici@npm:^6.19.5": "^6.24.0",
"webpack": "~5.104.0",
"yaml@npm:^1.10.0": "^1.10.3",
Expand Down Expand Up @@ -155,7 +160,11 @@
"@peggyjs/from-mem/semver": "7.7.4",
"node-gyp/tar": "7.5.13",
"cacache/tar": "7.5.13",
"@mapbox/node-pre-gyp/tar": "7.5.13"
"@mapbox/node-pre-gyp/tar": "7.5.13",
"@opentelemetry/exporter-logs-otlp-grpc/@grpc/grpc-js": "^1.14.4",
"@opentelemetry/exporter-metrics-otlp-grpc/@grpc/grpc-js": "^1.14.4",
"@opentelemetry/exporter-trace-otlp-grpc/@grpc/grpc-js": "^1.14.4",
"@opentelemetry/otlp-grpc-exporter-base/@grpc/grpc-js": "^1.14.4"
},
"dependencies": {
"@types/stream-buffers": "^3.0.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/ddp-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"jest": "~30.2.0",
"jest-websocket-mock": "~2.5.0",
"typescript": "~5.9.3",
"ws": "~8.19.0"
"ws": "~8.21.0"
},
"peerDependencies": {
"@rocket.chat/emitter": "*"
Expand Down
72 changes: 20 additions & 52 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4048,13 +4048,13 @@ __metadata:
languageName: node
linkType: hard

"@grpc/grpc-js@npm:^1.14.3":
version: 1.14.3
resolution: "@grpc/grpc-js@npm:1.14.3"
"@grpc/grpc-js@npm:^1.14.4":
version: 1.14.4
resolution: "@grpc/grpc-js@npm:1.14.4"
dependencies:
"@grpc/proto-loader": "npm:^0.8.0"
"@js-sdsl/ordered-map": "npm:^4.4.2"
checksum: 10/bb9bfe2f749179ae5ac7774d30486dfa2e0b004518c28de158b248e0f6f65f40138f01635c48266fa540670220f850216726e3724e1eb29d078817581c96e4db
checksum: 10/f9cdbd81e7388dc784c57274fcf6f4f4484da8968dd0975b97a14708d3fb117ae4a7bc2848e1bd1cc8b8ed9ee7a80ff131bfe728c85260da90a4e0b170e31ca9
languageName: node
linkType: hard

Expand Down Expand Up @@ -9198,7 +9198,7 @@ __metadata:
jest: "npm:~30.2.0"
jest-websocket-mock: "npm:~2.5.0"
typescript: "npm:~5.9.3"
ws: "npm:~8.19.0"
ws: "npm:~8.21.0"
peerDependencies:
"@rocket.chat/emitter": "*"
languageName: unknown
Expand Down Expand Up @@ -9250,7 +9250,7 @@ __metadata:
typescript: "npm:~5.9.3"
underscore: "npm:^1.13.8"
uuid: "npm:^11.1.1"
ws: "npm:~8.19.0"
ws: "npm:~8.21.0"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -24629,13 +24629,10 @@ __metadata:
languageName: node
linkType: hard

"ip-address@npm:^9.0.5":
version: 9.0.5
resolution: "ip-address@npm:9.0.5"
dependencies:
jsbn: "npm:1.1.0"
sprintf-js: "npm:^1.1.3"
checksum: 10/1ed81e06721af012306329b31f532b5e24e00cb537be18ddc905a84f19fe8f83a09a1699862bf3a1ec4b9dea93c55a3fa5faf8b5ea380431469df540f38b092c
"ip-address@npm:^10.1.1":
version: 10.2.0
resolution: "ip-address@npm:10.2.0"
checksum: 10/12fec399e1af5753ac322e47a6d81a50d3a528b3abb17c09525b2a2edcaedcca628c40520706f7037bc4d8e951b0296c47e7b86d0a8e6e2335c8f0ba4afcfac1
languageName: node
linkType: hard

Expand Down Expand Up @@ -26622,13 +26619,6 @@ __metadata:
languageName: node
linkType: hard

"jsbn@npm:1.1.0":
version: 1.1.0
resolution: "jsbn@npm:1.1.0"
checksum: 10/bebe7ae829bbd586ce8cbe83501dd8cb8c282c8902a8aeeed0a073a89dc37e8103b1244f3c6acd60278bcbfe12d93a3f83c9ac396868a3b3bbc3c5e5e3b648ef
languageName: node
linkType: hard

"jschardet@npm:^3.1.4":
version: 3.1.4
resolution: "jschardet@npm:3.1.4"
Expand Down Expand Up @@ -33371,7 +33361,7 @@ __metadata:
sodium-plus: "npm:^0.9.0"
ts-node: "npm:^10.9.2"
typescript: "npm:~5.9.3"
ws: "npm:~8.19.0"
ws: "npm:~8.21.0"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -34267,13 +34257,13 @@ __metadata:
languageName: node
linkType: hard

"socks@npm:^2.8.3":
version: 2.8.3
resolution: "socks@npm:2.8.3"
"socks@npm:^2.8.9":
version: 2.8.9
resolution: "socks@npm:2.8.9"
dependencies:
ip-address: "npm:^9.0.5"
ip-address: "npm:^10.1.1"
smart-buffer: "npm:^4.2.0"
checksum: 10/ffcb622c22481dfcd7589aae71fbfd71ca34334064d181df64bf8b7feaeee19706aba4cffd1de35cc7bbaeeaa0af96be2d7f40fcbc7bc0ab69533a7ae9ffc4fb
checksum: 10/8675e6b023faeaa5c2511664b106fd21f5d5ecb403584412e0efae58a76e0c0661c0c18ca340988f6cb398232308dae85fb710f847c9c6e0a6af33b07e4cd33a
languageName: node
linkType: hard

Expand Down Expand Up @@ -34517,13 +34507,6 @@ __metadata:
languageName: node
linkType: hard

"sprintf-js@npm:^1.1.3":
version: 1.1.3
resolution: "sprintf-js@npm:1.1.3"
checksum: 10/e7587128c423f7e43cc625fe2f87e6affdf5ca51c1cc468e910d8aaca46bb44a7fbcfa552f787b1d3987f7043aeb4527d1b99559e6621e01b42b3f45e5a24cbb
languageName: node
linkType: hard

"sprintf-js@npm:~1.0.2":
version: 1.0.3
resolution: "sprintf-js@npm:1.0.3"
Expand Down Expand Up @@ -37815,24 +37798,9 @@ __metadata:
languageName: node
linkType: hard

"ws@npm:^8, ws@npm:^8.18.0, ws@npm:^8.2.3":
version: 8.18.2
resolution: "ws@npm:8.18.2"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ">=5.0.2"
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 10/018e04ec95561d88248d53a2eaf094b4ae131e9b062f2679e6e8a62f04649bc543448f1e038125225ac6bbb25f54c1e65d7a2cc9dbc1e28b43e5e6b7162ad88e
languageName: node
linkType: hard

"ws@npm:~8.19.0":
version: 8.19.0
resolution: "ws@npm:8.19.0"
"ws@npm:^8.20.1, ws@npm:~8.21.0":
version: 8.21.0
resolution: "ws@npm:8.21.0"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ">=5.0.2"
Expand All @@ -37841,7 +37809,7 @@ __metadata:
optional: true
utf-8-validate:
optional: true
checksum: 10/26e4901e93abaf73af9f26a93707c95b4845e91a7a347ec8c569e6e9be7f9df066f6c2b817b2d685544e208207898a750b78461e6e8d810c11a370771450c31b
checksum: 10/088411956432c8f876158409d5a285cb9ad1382f593391f51d3a599bd0a5b277f876609ebd00fc3596321c4a4c9064d6fffe1ebad960e8ea7fd9ae25324f35c2
languageName: node
linkType: hard

Expand Down
Loading