Skip to content

[pull] develop from RocketChat:develop #395

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

[pull] develop from RocketChat:develop #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cf49a8
chore: Upgrade `@rocket.chat/icons` package (#39418)
gabriellsh Mar 6, 2026
644bf0a
chore(apps-engine): add missing await in AppSchedulerManager.cleanUp …
smirk-dev Mar 6, 2026
ba0be3c
chore: remove left-over .worktrees dir (#39339)
cardoso Mar 6, 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
1 change: 0 additions & 1 deletion .worktrees/replies-refactor
Open in desktop
Submodule replies-refactor deleted from e5b749
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 @@ -47,7 +47,7 @@
"ws": "~8.18.3"
},
"devDependencies": {
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@types/cookie": "^0.5.4",
"@types/cookie-parser": "^1.4.10",
"@types/ejson": "^2.2.2",
Expand Down
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 @@ -110,7 +110,7 @@
"@rocket.chat/gazzodown": "workspace:^",
"@rocket.chat/http-router": "workspace:^",
"@rocket.chat/i18n": "workspace:^",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/instance-status": "workspace:^",
"@rocket.chat/jwt": "workspace:^",
"@rocket.chat/layout": "^0.34.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/uikit-playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@rocket.chat/fuselage-toastbar": "^0.35.2",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/fuselage-ui-kit": "workspace:~",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/logo": "^0.32.4",
"@rocket.chat/styled": "~0.32.0",
"@rocket.chat/ui-avatar": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/ui-theming/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/ui-contexts": "workspace:~",
"@types/react": "~18.3.27",
"@types/react-dom": "~18.3.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps-engine/src/server/managers/AppSchedulerManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class AppSchedulerManager {
}

public async cleanUp(appId: string): Promise<void> {
(this.bridge as IInternalSchedulerBridge & SchedulerBridge).cancelAllJobs(appId);
await (this.bridge as IInternalSchedulerBridge & SchedulerBridge).cancelAllJobs(appId);
}

private isNotToRunJob(status: AppStatus, previousStatus: AppStatus): boolean {
Expand Down
2 changes: 1 addition & 1 deletion packages/core-services/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/federation-sdk": "0.3.9",
"@rocket.chat/http-router": "workspace:^",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/media-signaling": "workspace:^",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/models": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-typings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test": "echo \"no tests\" && exit 1"
},
"dependencies": {
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~",
"typia": "~9.7.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage-ui-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/mock-providers": "workspace:^",
"@rocket.chat/styled": "~0.32.0",
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 @@ -34,7 +34,7 @@
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/styled": "~0.32.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"devDependencies": {
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/tsconfig": "workspace:*",
"@storybook/react": "^8.6.17",
"eslint": "~9.39.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-avatar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/ui-contexts": "workspace:^",
"@types/react": "~18.3.27",
"@types/react-dom": "~18.3.7",
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 @@ -29,7 +29,7 @@
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/layout": "^0.34.2",
"@rocket.chat/logo": "^0.32.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-composer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/tsconfig": "workspace:*",
"@storybook/addon-a11y": "^8.6.17",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-contexts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/i18n": "workspace:~",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/tools": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"typia": "~9.7.2"
},
"devDependencies": {
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/tsconfig": "workspace:*",
"@types/jest": "~30.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-video-conf/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@rocket.chat/fuselage": "^0.73.0",
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/styled": "~0.32.0",
"@rocket.chat/tsconfig": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-voip/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/fuselage-ui-kit": "workspace:^",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/mock-providers": "workspace:~",
"@rocket.chat/styled": "~0.32.0",
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 @@ -27,7 +27,7 @@
"@rocket.chat/fuselage-hooks": "^0.40.0",
"@rocket.chat/fuselage-tokens": "~0.33.2",
"@rocket.chat/i18n": "workspace:~",
"@rocket.chat/icons": "~0.46.0",
"@rocket.chat/icons": "~0.47.0",
"@rocket.chat/layout": "^0.34.2",
"@rocket.chat/mock-providers": "workspace:~",
"@rocket.chat/rest-typings": "workspace:~",
Expand Down
42 changes: 21 additions & 21 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8256,7 +8256,7 @@ __metadata:
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/federation-sdk": "npm:0.3.9"
"@rocket.chat/http-router": "workspace:^"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/media-signaling": "workspace:^"
"@rocket.chat/message-parser": "workspace:^"
Expand All @@ -8279,7 +8279,7 @@ __metadata:
resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
dependencies:
"@rocket.chat/apps-engine": "workspace:^"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/message-parser": "workspace:^"
"@rocket.chat/ui-kit": "workspace:~"
"@types/express": "npm:^4.17.25"
Expand Down Expand Up @@ -8586,7 +8586,7 @@ __metadata:
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/gazzodown": "workspace:^"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/mock-providers": "workspace:^"
"@rocket.chat/styled": "npm:~0.32.0"
Expand Down Expand Up @@ -8675,7 +8675,7 @@ __metadata:
"@rocket.chat/fuselage": "npm:^0.73.0"
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/message-parser": "workspace:^"
"@rocket.chat/styled": "npm:~0.32.0"
Expand Down Expand Up @@ -8771,10 +8771,10 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/icons@npm:~0.46.0":
version: 0.46.0
resolution: "@rocket.chat/icons@npm:0.46.0"
checksum: 10/1b4150598549f0573cd9c029892f3f42d5228ba530410a3b74cd9cba6d01c93ed792207e5b4eee1b507291d9411c01c2e1939680c7d92ddab5fce28775950d47
"@rocket.chat/icons@npm:~0.47.0":
version: 0.47.0
resolution: "@rocket.chat/icons@npm:0.47.0"
checksum: 10/1a7a99a4bd7227f81225dc79bd966057dae1200c461320e7627ebfe2e2cee3a4d62e2577fb0892a9c1d79d57cb38cb69bd523ea1741587203a063c68b7f508d4
languageName: node
linkType: hard

Expand Down Expand Up @@ -9126,7 +9126,7 @@ __metadata:
"@rocket.chat/gazzodown": "workspace:^"
"@rocket.chat/http-router": "workspace:^"
"@rocket.chat/i18n": "workspace:^"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/instance-status": "workspace:^"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/jwt": "workspace:^"
Expand Down Expand Up @@ -9999,7 +9999,7 @@ __metadata:
"@rocket.chat/fuselage": "npm:^0.73.0"
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/tsconfig": "workspace:*"
"@storybook/addon-a11y": "npm:^8.6.17"
"@storybook/addon-essentials": "npm:^8.6.17"
Expand Down Expand Up @@ -10097,7 +10097,7 @@ __metadata:
"@rocket.chat/fuselage": "npm:^0.73.0"
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/ui-contexts": "workspace:^"
"@types/react": "npm:~18.3.27"
"@types/react-dom": "npm:~18.3.7"
Expand All @@ -10124,7 +10124,7 @@ __metadata:
"@rocket.chat/fuselage": "npm:^0.73.0"
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/layout": "npm:^0.34.2"
"@rocket.chat/logo": "npm:^0.32.4"
Expand Down Expand Up @@ -10182,7 +10182,7 @@ __metadata:
"@rocket.chat/fuselage": "npm:^0.73.0"
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/tsconfig": "workspace:*"
"@storybook/addon-a11y": "npm:^8.6.17"
Expand Down Expand Up @@ -10224,7 +10224,7 @@ __metadata:
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/i18n": "workspace:~"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/password-policies": "workspace:^"
"@rocket.chat/rest-typings": "workspace:^"
Expand Down Expand Up @@ -10255,7 +10255,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/ui-kit@workspace:packages/ui-kit"
dependencies:
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/tsconfig": "workspace:*"
"@types/jest": "npm:~30.0.0"
Expand All @@ -10282,7 +10282,7 @@ __metadata:
"@rocket.chat/fuselage": "npm:^0.73.0"
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/ui-contexts": "workspace:~"
"@types/react": "npm:~18.3.27"
"@types/react-dom": "npm:~18.3.7"
Expand Down Expand Up @@ -10311,7 +10311,7 @@ __metadata:
"@rocket.chat/fuselage": "npm:^0.73.0"
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/styled": "npm:~0.32.0"
"@rocket.chat/tsconfig": "workspace:*"
Expand Down Expand Up @@ -10365,7 +10365,7 @@ __metadata:
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/fuselage-ui-kit": "workspace:^"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/media-signaling": "workspace:~"
"@rocket.chat/mock-providers": "workspace:~"
Expand Down Expand Up @@ -10437,7 +10437,7 @@ __metadata:
"@rocket.chat/fuselage-toastbar": "npm:^0.35.2"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/fuselage-ui-kit": "workspace:~"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/logo": "npm:^0.32.4"
"@rocket.chat/styled": "npm:~0.32.0"
"@rocket.chat/tsconfig": "workspace:*"
Expand Down Expand Up @@ -10477,7 +10477,7 @@ __metadata:
"@rocket.chat/fuselage-hooks": "npm:^0.40.0"
"@rocket.chat/fuselage-tokens": "npm:~0.33.2"
"@rocket.chat/i18n": "workspace:~"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/layout": "npm:^0.34.2"
"@rocket.chat/mock-providers": "workspace:~"
"@rocket.chat/rest-typings": "workspace:~"
Expand Down Expand Up @@ -32446,7 +32446,7 @@ __metadata:
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/emitter": "npm:^0.32.0"
"@rocket.chat/icons": "npm:~0.46.0"
"@rocket.chat/icons": "npm:~0.47.0"
"@rocket.chat/message-parser": "workspace:^"
"@rocket.chat/model-typings": "workspace:^"
"@rocket.chat/models": "workspace:^"
Expand Down
Loading