From d08306b8635a3cbd8af3bb9de92b1c26c2d0e162 Mon Sep 17 00:00:00 2001 From: Julio Araujo Date: Thu, 5 Mar 2026 19:34:11 +0100 Subject: [PATCH 1/2] chore(deps): bump DOMPurify (#39384) --- apps/meteor/package.json | 2 +- packages/gazzodown/package.json | 2 +- packages/livechat/package.json | 2 +- packages/ui-client/package.json | 2 +- packages/web-ui-registration/package.json | 2 +- yarn.lock | 18 +++++++++--------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/meteor/package.json b/apps/meteor/package.json index f14a6647d08da..bc0a08ad8a939 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -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", diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 8bc65fa24b894..6ddd035987f68 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -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" diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 5528e8197cef8..ce8e47119bca0 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -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", diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 1dc487db149fc..422ecf8f6bc1f 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -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", diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 5ff6492c79b94..8bf00c7184056 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -17,7 +17,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "dompurify": "~3.3.1" + "dompurify": "~3.3.2" }, "devDependencies": { "@rocket.chat/core-typings": "workspace:~", diff --git a/yarn.lock b/yarn.lock index 6595ca80f9b55..a094498586bfd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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 From 46a17742d880deafa8cdc98c967e3b5c9fcf8c05 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 5 Mar 2026 17:48:19 -0300 Subject: [PATCH 2/2] ci: fix callback in permissions.helper.ts for promise resolution (#39390) Co-authored-by: Diego Sampaio Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> --- apps/meteor/tests/data/permissions.helper.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/meteor/tests/data/permissions.helper.ts b/apps/meteor/tests/data/permissions.helper.ts index 8069b44fea114..0f8036c3c1704 100644 --- a/apps/meteor/tests/data/permissions.helper.ts +++ b/apps/meteor/tests/data/permissions.helper.ts @@ -13,7 +13,14 @@ export const updatePermission = (permission: string, roles: string[]): Promise setTimeout(() => (!err && resolve()) || reject(err), 100)); + .end((err?: Error) => { + if (err) { + reject(err); + return; + } + + resolve(); + }); }); export const updateEEPermission = (permission: string, roles: string[]): Promise =>