Skip to content

[pull] develop from RocketChat:develop #393

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 2 commits into from
Mar 6, 2026
Merged

[pull] develop from RocketChat:develop #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d08306b
chore(deps): bump DOMPurify (#39384)
julio-rocketchat Mar 5, 2026
46a1774
ci: fix callback in permissions.helper.ts for promise resolution (#39…
ggazzo Mar 5, 2026
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/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
"date-fns": "~4.1.0",
"date.js": "~0.3.3",
"debug": "~4.3.7",
"dompurify": "~3.3.1",
"dompurify": "~3.3.2",
"drachtio-srf": "patch:drachtio-srf@npm%3A5.0.12#~/.yarn/patches/drachtio-srf-npm-5.0.12-b0b1afaad6.patch",
"ejson": "^2.2.3",
"emailreplyparser": "^0.0.5",
Expand Down
9 changes: 8 additions & 1 deletion apps/meteor/tests/data/permissions.helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ export const updatePermission = (permission: string, roles: string[]): Promise<v
.send({ permissions: [{ _id: permission, roles }] })
.expect('Content-Type', 'application/json')
.expect(200)
.end((err?: Error) => setTimeout(() => (!err && resolve()) || reject(err), 100));
.end((err?: Error) => {
if (err) {
reject(err);
return;
}

resolve();
});
});

export const updateEEPermission = (permission: string, roles: string[]): Promise<void | Error> =>
Expand Down
2 changes: 1 addition & 1 deletion packages/gazzodown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"date-fns": "~4.1.0",
"dompurify": "~3.3.1",
"dompurify": "~3.3.2",
"highlight.js": "11.8.0",
"react-error-boundary": "^3.1.4",
"react-stately": "~3.17.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/livechat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"ajv-formats": "^3.0.1",
"css-vars-ponyfill": "^2.4.9",
"date-fns": "~4.1.0",
"dompurify": "~3.3.1",
"dompurify": "~3.3.2",
"emoji-mart": "^3.0.1",
"history": "~5.3.0",
"i18next": "~23.4.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@rocket.chat/onboarding-ui": "~0.36.2",
"dompurify": "~3.3.1"
"dompurify": "~3.3.2"
},
"devDependencies": {
"@react-aria/toolbar": "^3.0.0-nightly.5042",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-ui-registration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"dompurify": "~3.3.1"
"dompurify": "~3.3.2"
},
"devDependencies": {
"@rocket.chat/core-typings": "workspace:~",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8698,7 +8698,7 @@ __metadata:
"@types/react": "npm:~18.3.27"
"@types/react-dom": "npm:~18.3.7"
date-fns: "npm:~4.1.0"
dompurify: "npm:~3.3.1"
dompurify: "npm:~3.3.2"
eslint: "npm:~9.39.3"
highlight.js: "npm:11.8.0"
i18next: "npm:~23.4.9"
Expand Down Expand Up @@ -8900,7 +8900,7 @@ __metadata:
cssnano: "npm:^7.0.7"
date-fns: "npm:~4.1.0"
desvg-loader: "npm:^0.1.0"
dompurify: "npm:~3.3.1"
dompurify: "npm:~3.3.2"
emoji-mart: "npm:^3.0.1"
eslint: "npm:~9.39.3"
file-loader: "npm:^6.2.0"
Expand Down Expand Up @@ -9299,7 +9299,7 @@ __metadata:
date.js: "npm:~0.3.3"
debug: "npm:~4.3.7"
docker-compose: "npm:^0.24.8"
dompurify: "npm:~3.3.1"
dompurify: "npm:~3.3.2"
drachtio-srf: "patch:drachtio-srf@npm%3A5.0.12#~/.yarn/patches/drachtio-srf-npm-5.0.12-b0b1afaad6.patch"
ejson: "npm:^2.2.3"
emailreplyparser: "npm:^0.0.5"
Expand Down Expand Up @@ -10143,7 +10143,7 @@ __metadata:
"@types/jest": "npm:~30.0.0"
"@types/react": "npm:~18.3.27"
"@types/react-dom": "npm:~18.3.7"
dompurify: "npm:~3.3.1"
dompurify: "npm:~3.3.2"
eslint: "npm:~9.39.3"
i18next: "npm:~23.4.9"
jest: "npm:~30.2.0"
Expand Down Expand Up @@ -10496,7 +10496,7 @@ __metadata:
"@testing-library/react": "npm:~16.3.2"
"@types/react": "npm:~18.3.27"
"@types/react-dom": "npm:~18.3.7"
dompurify: "npm:~3.3.1"
dompurify: "npm:~3.3.2"
eslint: "npm:~9.39.3"
i18next: "npm:~23.4.9"
react: "npm:~18.3.1"
Expand Down Expand Up @@ -19434,15 +19434,15 @@ __metadata:
languageName: node
linkType: hard

"dompurify@npm:~3.3.1":
version: 3.3.1
resolution: "dompurify@npm:3.3.1"
"dompurify@npm:~3.3.2":
version: 3.3.2
resolution: "dompurify@npm:3.3.2"
dependencies:
"@types/trusted-types": "npm:^2.0.7"
dependenciesMeta:
"@types/trusted-types":
optional: true
checksum: 10/f71cca489e628591165d16e8cf4fa4f0d3e2ee48db4d73e9d2c5bedc6f915c92f9e9f101f8c4ba790bec0cdffe7f4e1747f5e31c69dc53ce7ae20a81ff6b0022
checksum: 10/3ca02559677ce6d9583a500f21ffbb6b9e88f1af99f69fa0d0d9442cddbac98810588c869f8b435addb5115492d6e49870024bca322169b941bafedb99c7f281
languageName: node
linkType: hard

Expand Down
Loading