Skip to content

[pull] develop from RocketChat:develop #535

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 4, 2026
Merged

[pull] develop from RocketChat:develop #535

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: 0 additions & 2 deletions apps/uikit-playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"prettier": "~3.3.3",
"rc-scrollbars": "^1.1.6",
"react": "~18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "~18.3.1",
"react-router-dom": "^6.30.3",
"react-split-pane": "^0.1.92",
Expand All @@ -45,7 +44,6 @@
"@rocket.chat/tsconfig": "workspace:*",
"@types/lodash": "~4.17.24",
"@types/react": "~18.3.28",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-dom": "~18.3.7",
"@vitejs/plugin-react": "~6.0.1",
"eslint": "~9.39.4",
Expand Down
2 changes: 1 addition & 1 deletion apps/uikit-playground/src/Components/Preview/Display/Surface/Surface.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { DropResult } from '@hello-pangea/dnd';
import { Box } from '@rocket.chat/fuselage';
import { UiKitContext } from '@rocket.chat/fuselage-ui-kit';
import { useContext, useState, useEffect } from 'react';
import type { DropResult } from 'react-beautiful-dnd';

import { reorder } from './Reorder';
import SurfaceRender from './SurfaceRender';
Expand Down
109 changes: 6 additions & 103 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2545,7 +2545,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.9.2":
"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6":
version: 7.26.10
resolution: "@babel/runtime@npm:7.26.10"
dependencies:
Expand Down Expand Up @@ -11266,7 +11266,6 @@ __metadata:
"@rocket.chat/ui-contexts": "workspace:~"
"@types/lodash": "npm:~4.17.24"
"@types/react": "npm:~18.3.28"
"@types/react-beautiful-dnd": "npm:^13.1.8"
"@types/react-dom": "npm:~18.3.7"
"@vitejs/plugin-react": "npm:~6.0.1"
codemirror: "npm:^6.0.2"
Expand All @@ -11275,7 +11274,6 @@ __metadata:
prettier: "npm:~3.3.3"
rc-scrollbars: "npm:^1.1.6"
react: "npm:~18.3.1"
react-beautiful-dnd: "npm:^13.1.1"
react-dom: "npm:~18.3.1"
react-router-dom: "npm:^6.30.3"
react-split-pane: "npm:^0.1.92"
Expand Down Expand Up @@ -14436,16 +14434,6 @@ __metadata:
languageName: node
linkType: hard

"@types/hoist-non-react-statics@npm:^3.3.0":
version: 3.3.1
resolution: "@types/hoist-non-react-statics@npm:3.3.1"
dependencies:
"@types/react": "npm:*"
hoist-non-react-statics: "npm:^3.3.0"
checksum: 10/071e6d75a0ed9aa0e9ca2cc529a8c15bf7ac3e4a37aac279772ea6036fd0bf969b67fb627b65cfce65adeab31fec1e9e95b4dcdefeab075b580c0c7174206f63
languageName: node
linkType: hard

"@types/html-minifier-terser@npm:^6.0.0":
version: 6.1.0
resolution: "@types/html-minifier-terser@npm:6.1.0"
Expand Down Expand Up @@ -15015,15 +15003,6 @@ __metadata:
languageName: node
linkType: hard

"@types/react-beautiful-dnd@npm:^13.1.8":
version: 13.1.8
resolution: "@types/react-beautiful-dnd@npm:13.1.8"
dependencies:
"@types/react": "npm:*"
checksum: 10/cb8a182ed0ea6f680c7c343fcb4e54237437ca90dc88c2a70f4a203ec8ad0740e389e3ab7772c8cc1479f05e5a046bccbc33d54055b94e0fe5b22be030ab23d2
languageName: node
linkType: hard

"@types/react-dom@npm:~18.3.7":
version: 18.3.7
resolution: "@types/react-dom@npm:18.3.7"
Expand All @@ -15033,18 +15012,6 @@ __metadata:
languageName: node
linkType: hard

"@types/react-redux@npm:^7.1.20":
version: 7.1.25
resolution: "@types/react-redux@npm:7.1.25"
dependencies:
"@types/hoist-non-react-statics": "npm:^3.3.0"
"@types/react": "npm:*"
hoist-non-react-statics: "npm:^3.3.0"
redux: "npm:^4.0.0"
checksum: 10/1c5780ff46b9a2bba3b68b26645ce9704cd3ef387141240c1369fcbef51370a84b8a5fc6ca27966f96f6e5b41618c88f498fedc7056870b207cbafbb4da34e91
languageName: node
linkType: hard

"@types/react@npm:*":
version: 18.3.23
resolution: "@types/react@npm:18.3.23"
Expand Down Expand Up @@ -19367,7 +19334,7 @@ __metadata:
languageName: node
linkType: hard

"css-box-model@npm:^1.2.0, css-box-model@npm:^1.2.1":
"css-box-model@npm:^1.2.1":
version: 1.2.1
resolution: "css-box-model@npm:1.2.1"
dependencies:
Expand Down Expand Up @@ -23881,15 +23848,6 @@ __metadata:
languageName: node
linkType: hard

"hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2":
version: 3.3.2
resolution: "hoist-non-react-statics@npm:3.3.2"
dependencies:
react-is: "npm:^16.7.0"
checksum: 10/1acbe85f33e5a39f90c822ad4d28b24daeb60f71c545279431dc98c312cd28a54f8d64788e477fe21dc502b0e3cf58589ebe5c1ad22af27245370391c2d24ea6
languageName: node
linkType: hard

"homedir-polyfill@npm:^1.0.0, homedir-polyfill@npm:^1.0.1":
version: 1.0.3
resolution: "homedir-polyfill@npm:1.0.3"
Expand Down Expand Up @@ -28122,13 +28080,6 @@ __metadata:
languageName: node
linkType: hard

"memoize-one@npm:^5.1.1":
version: 5.2.1
resolution: "memoize-one@npm:5.2.1"
checksum: 10/b7141dc148b5c6fdd51e77ecf0421fd2581681eb8756e0b3dfbd4fe765b5e2b5a6bc90214bb6f19a96b6aed44de17eda3407142a7be9e24ccd0774bbd9874d1b
languageName: node
linkType: hard

"memoize-one@npm:^6.0.0":
version: 6.0.0
resolution: "memoize-one@npm:6.0.0"
Expand Down Expand Up @@ -31965,7 +31916,7 @@ __metadata:
languageName: node
linkType: hard

"raf-schd@npm:^4.0.2, raf-schd@npm:^4.0.3":
"raf-schd@npm:^4.0.3":
version: 4.0.3
resolution: "raf-schd@npm:4.0.3"
checksum: 10/45514041c5ad31fa96aef3bb3c572a843b92da2f2cd1cb4a47c9ad58e48761d3a4126e18daa32b2bfa0bc2551a42d8f324a0e40e536cb656969929602b4e8b58
Expand Down Expand Up @@ -32210,24 +32161,6 @@ __metadata:
languageName: node
linkType: hard

"react-beautiful-dnd@npm:^13.1.1":
version: 13.1.1
resolution: "react-beautiful-dnd@npm:13.1.1"
dependencies:
"@babel/runtime": "npm:^7.9.2"
css-box-model: "npm:^1.2.0"
memoize-one: "npm:^5.1.1"
raf-schd: "npm:^4.0.2"
react-redux: "npm:^7.2.0"
redux: "npm:^4.0.4"
use-memo-one: "npm:^1.1.1"
peerDependencies:
react: ^16.8.5 || ^17.0.0 || ^18.0.0
react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
checksum: 10/2de8162a74f7fc78294e5a928b92d3fff02c579d137a25d53b1ab4313abeb108709bb7281512f7f94d18257de3122b8c85cb5a8375113cb8657088b1a9bda65b
languageName: node
linkType: hard

"react-docgen-typescript-plugin@npm:^1.0.8":
version: 1.0.8
resolution: "react-docgen-typescript-plugin@npm:1.0.8"
Expand Down Expand Up @@ -32342,14 +32275,14 @@ __metadata:
languageName: node
linkType: hard

"react-is@npm:^16.13.1, react-is@npm:^16.7.0, react-is@npm:^16.8.6":
"react-is@npm:^16.13.1, react-is@npm:^16.8.6":
version: 16.13.1
resolution: "react-is@npm:16.13.1"
checksum: 10/5aa564a1cde7d391ac980bedee21202fc90bdea3b399952117f54fb71a932af1e5902020144fb354b4690b2414a0c7aafe798eb617b76a3d441d956db7726fdf
languageName: node
linkType: hard

"react-is@npm:^17.0.1, react-is@npm:^17.0.2":
"react-is@npm:^17.0.1":
version: 17.0.2
resolution: "react-is@npm:17.0.2"
checksum: 10/73b36281e58eeb27c9cc6031301b6ae19ecdc9f18ae2d518bdb39b0ac564e65c5779405d623f1df9abf378a13858b79442480244bd579968afc1faf9a2ce5e05
Expand Down Expand Up @@ -32392,27 +32325,6 @@ __metadata:
languageName: node
linkType: hard

"react-redux@npm:^7.2.0":
version: 7.2.9
resolution: "react-redux@npm:7.2.9"
dependencies:
"@babel/runtime": "npm:^7.15.4"
"@types/react-redux": "npm:^7.1.20"
hoist-non-react-statics: "npm:^3.3.2"
loose-envify: "npm:^1.4.0"
prop-types: "npm:^15.7.2"
react-is: "npm:^17.0.2"
peerDependencies:
react: ^16.8.3 || ^17 || ^18
peerDependenciesMeta:
react-dom:
optional: true
react-native:
optional: true
checksum: 10/1c3018bd2601e6d18339281867910b583dcbb3d8856403086e08c00abf0dfe467a94c0d1356bafa8cdf107bf1e2c9899a28486e4778e85c8bc4dfed2076b116f
languageName: node
linkType: hard

"react-redux@npm:^9.1.2":
version: 9.2.0
resolution: "react-redux@npm:9.2.0"
Expand Down Expand Up @@ -32809,15 +32721,6 @@ __metadata:
languageName: node
linkType: hard

"redux@npm:^4.0.0, redux@npm:^4.0.4":
version: 4.2.1
resolution: "redux@npm:4.2.1"
dependencies:
"@babel/runtime": "npm:^7.9.2"
checksum: 10/371e4833b671193303a7dea7803c8fdc8e0d566740c78f580e0a3b77b4161da25037626900a2205a5d616117fa6ad09a4232e5a110bd437186b5c6355a041750
languageName: node
linkType: hard

"redux@npm:^5.0.1":
version: 5.0.1
resolution: "redux@npm:5.0.1"
Expand Down Expand Up @@ -36938,7 +36841,7 @@ __metadata:
languageName: node
linkType: hard

"use-memo-one@npm:^1.1.1, use-memo-one@npm:^1.1.3":
"use-memo-one@npm:^1.1.3":
version: 1.1.3
resolution: "use-memo-one@npm:1.1.3"
peerDependencies:
Expand Down
Loading