Skip to content
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

Jump to bottom

refactor: Upgrade Fuselage and remove unnecessary FieldError styling #33205

Merged
merged 6 commits into from
Sep 11, 2024
Merged

refactor: Upgrade Fuselage and remove unnecessary FieldError styling #33205

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42be897
chore: :lipstick: Remove unnecessary style from email FieldError
rique223 Sep 3, 2024
22c174d
build: :arrow_up: Upgrade fuselage to latest version
rique223 Sep 6, 2024
f2faf91
Merge branch 'develop' into chore/remove-incongruent-style
rique223 Sep 6, 2024
0ef990f
build: :pushpin: Change peerDependencies to *
rique223 Sep 6, 2024
994bb4b
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into chor…
tassoevan Sep 11, 2024
522021c
Merge branch 'develop' into chore/remove-incongruent-style
kodiakhq[bot] Sep 11, 2024
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/client/views/admin/users/AdminUserForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
/>
</FieldRow>
{errors?.email && (
<FieldError aria-live='assertive' id={`${emailId}-error`} fontScale='c1' mbs={12}>
<FieldError aria-live='assertive' id={`${emailId}-error`}>
{errors.email.message}
</FieldError>
)}
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 @@ -241,7 +241,7 @@
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-toastbar": "^0.33.0",
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 @@ -4,7 +4,7 @@
"private": true,
"devDependencies": {
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/icons": "~0.38.0",
"@rocket.chat/ui-contexts": "workspace:~",
Expand Down
10 changes: 5 additions & 5 deletions packages/fuselage-ui-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
"@rocket.chat/icons": "*",
"@rocket.chat/prettier-config": "*",
"@rocket.chat/styled": "*",
"@rocket.chat/ui-avatar": "6.0.0",
"@rocket.chat/ui-contexts": "10.0.0",
"@rocket.chat/ui-kit": "0.36.1",
"@rocket.chat/ui-video-conf": "10.0.0",
"@rocket.chat/ui-avatar": "*",
"@rocket.chat/ui-contexts": "*",
"@rocket.chat/ui-kit": "*",
"@rocket.chat/ui-video-conf": "*",
"@tanstack/react-query": "*",
"react": "*",
"react-dom": "*"
Expand All @@ -66,7 +66,7 @@
"@rocket.chat/apps-engine": "1.45.0-alpha.868",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/icons": "~0.38.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/gazzodown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@babel/core": "~7.22.20",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/fuselage-tokens": "^0.33.1",
"@rocket.chat/jest-presets": "workspace:~",
"@rocket.chat/message-parser": "workspace:^",
Expand Down Expand Up @@ -66,8 +66,8 @@
"@rocket.chat/fuselage-tokens": "*",
"@rocket.chat/message-parser": "0.31.29",
"@rocket.chat/styled": "*",
"@rocket.chat/ui-client": "10.0.0",
"@rocket.chat/ui-contexts": "10.0.0",
"@rocket.chat/ui-client": "*",
"@rocket.chat/ui-contexts": "*",
"katex": "*",
"react": "*"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-avatar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"devDependencies": {
"@babel/core": "~7.22.20",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/ui-contexts": "workspace:^",
"@types/babel__core": "~7.20.3",
"@types/react": "~17.0.69",
Expand All @@ -31,7 +31,7 @@
],
"peerDependencies": {
"@rocket.chat/fuselage": "*",
"@rocket.chat/ui-contexts": "10.0.0",
"@rocket.chat/ui-contexts": "*",
"react": "~17.0.2"
},
"volta": {
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@babel/core": "~7.22.20",
"@react-aria/toolbar": "^3.0.0-beta.1",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/icons": "~0.38.0",
"@rocket.chat/jest-presets": "workspace:~",
Expand Down Expand Up @@ -60,7 +60,7 @@
"@rocket.chat/fuselage": "*",
"@rocket.chat/fuselage-hooks": "*",
"@rocket.chat/icons": "*",
"@rocket.chat/ui-contexts": "10.0.0",
"@rocket.chat/ui-contexts": "*",
"react": "~17.0.2"
},
"volta": {
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 @@ -19,7 +19,7 @@
"@babel/core": "~7.22.20",
"@react-aria/toolbar": "^3.0.0-beta.1",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/icons": "~0.38.0",
"@storybook/addon-actions": "~6.5.16",
"@storybook/addon-docs": "~6.5.16",
Expand Down
6 changes: 3 additions & 3 deletions packages/ui-video-conf/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@babel/core": "~7.22.20",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/icons": "~0.38.0",
"@rocket.chat/jest-presets": "workspace:~",
Expand Down Expand Up @@ -40,8 +40,8 @@
"@rocket.chat/fuselage-hooks": "*",
"@rocket.chat/icons": "*",
"@rocket.chat/styled": "*",
"@rocket.chat/ui-avatar": "6.0.0",
"@rocket.chat/ui-contexts": "10.0.0",
"@rocket.chat/ui-avatar": "*",
"@rocket.chat/ui-contexts": "*",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/uikit-playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@codemirror/tooltip": "^0.19.16",
"@lezer/highlight": "^1.1.6",
"@rocket.chat/css-in-js": "~0.31.25",
"@rocket.chat/fuselage": "^0.57.1",
"@rocket.chat/fuselage": "^0.59.0",
"@rocket.chat/fuselage-hooks": "^0.33.1",
"@rocket.chat/fuselage-polyfills": "~0.31.25",
"@rocket.chat/fuselage-toastbar": "^0.33.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 @@ -47,7 +47,7 @@
"peerDependencies": {
"@rocket.chat/layout": "*",
"@rocket.chat/tools": "0.2.2",
"@rocket.chat/ui-contexts": "10.0.0",
"@rocket.chat/ui-contexts": "*",
"@tanstack/react-query": "*",
"react": "*",
"react-hook-form": "*",
Expand Down
48 changes: 24 additions & 24 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8883,7 +8883,7 @@ __metadata:
"@rocket.chat/apps-engine": 1.45.0-alpha.868
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/fuselage-hooks": ^0.33.1
"@rocket.chat/fuselage-polyfills": ~0.31.25
"@rocket.chat/gazzodown": "workspace:^"
Expand Down Expand Up @@ -8934,19 +8934,19 @@ __metadata:
"@rocket.chat/icons": "*"
"@rocket.chat/prettier-config": "*"
"@rocket.chat/styled": "*"
"@rocket.chat/ui-avatar": 6.0.0
"@rocket.chat/ui-contexts": 10.0.0
"@rocket.chat/ui-kit": 0.36.1
"@rocket.chat/ui-video-conf": 10.0.0
"@rocket.chat/ui-avatar": "*"
"@rocket.chat/ui-contexts": "*"
"@rocket.chat/ui-kit": "*"
"@rocket.chat/ui-video-conf": "*"
"@tanstack/react-query": "*"
react: "*"
react-dom: "*"
languageName: unknown
linkType: soft

"@rocket.chat/fuselage@npm:^0.57.1":
version: 0.57.1
resolution: "@rocket.chat/fuselage@npm:0.57.1"
"@rocket.chat/fuselage@npm:^0.59.0":
version: 0.59.0
resolution: "@rocket.chat/fuselage@npm:0.59.0"
dependencies:
"@rocket.chat/css-in-js": ^0.31.25
"@rocket.chat/css-supports": ^0.31.25
Expand All @@ -8964,7 +8964,7 @@ __metadata:
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: ed40c4e9ec6f6294e0e7c7a3912ae7c9eca026455506f3f1983483010d3d0c41169f9e38d173e5e63ed0e9824979edd607dda3c881202bf797a97b5b76e83a34
checksum: 259dce5381a3c3e0d7c7f3dc7ab51346cb65a9f4906a5ca5d6a976627d05e01e7f8a3a940604d0ad1b2b4ed89c250a871ef3fb253f6bbb69d35bc931e193898d
languageName: node
linkType: hard

Expand All @@ -8975,7 +8975,7 @@ __metadata:
"@babel/core": ~7.22.20
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/css-in-js": ~0.31.25
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/fuselage-tokens": ^0.33.1
"@rocket.chat/jest-presets": "workspace:~"
"@rocket.chat/message-parser": "workspace:^"
Expand Down Expand Up @@ -9021,8 +9021,8 @@ __metadata:
"@rocket.chat/fuselage-tokens": "*"
"@rocket.chat/message-parser": 0.31.29
"@rocket.chat/styled": "*"
"@rocket.chat/ui-client": 10.0.0
"@rocket.chat/ui-contexts": 10.0.0
"@rocket.chat/ui-client": "*"
"@rocket.chat/ui-contexts": "*"
katex: "*"
react: "*"
languageName: unknown
Expand Down Expand Up @@ -9342,7 +9342,7 @@ __metadata:
"@rocket.chat/favicon": "workspace:^"
"@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2
"@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/fuselage-hooks": ^0.33.1
"@rocket.chat/fuselage-polyfills": ~0.31.25
"@rocket.chat/fuselage-toastbar": ^0.33.0
Expand Down Expand Up @@ -10214,7 +10214,7 @@ __metadata:
resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
dependencies:
"@babel/core": ~7.22.20
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/ui-contexts": "workspace:^"
"@types/babel__core": ~7.20.3
"@types/react": ~17.0.69
Expand All @@ -10228,7 +10228,7 @@ __metadata:
typescript: ~5.5.4
peerDependencies:
"@rocket.chat/fuselage": "*"
"@rocket.chat/ui-contexts": 10.0.0
"@rocket.chat/ui-contexts": "*"
react: ~17.0.2
languageName: unknown
linkType: soft
Expand All @@ -10240,7 +10240,7 @@ __metadata:
"@babel/core": ~7.22.20
"@react-aria/toolbar": ^3.0.0-beta.1
"@rocket.chat/css-in-js": ~0.31.25
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/fuselage-hooks": ^0.33.1
"@rocket.chat/icons": ~0.38.0
"@rocket.chat/jest-presets": "workspace:~"
Expand Down Expand Up @@ -10278,7 +10278,7 @@ __metadata:
"@rocket.chat/fuselage": "*"
"@rocket.chat/fuselage-hooks": "*"
"@rocket.chat/icons": "*"
"@rocket.chat/ui-contexts": 10.0.0
"@rocket.chat/ui-contexts": "*"
react: ~17.0.2
languageName: unknown
linkType: soft
Expand All @@ -10290,7 +10290,7 @@ __metadata:
"@babel/core": ~7.22.20
"@react-aria/toolbar": ^3.0.0-beta.1
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/icons": ~0.38.0
"@storybook/addon-actions": ~6.5.16
"@storybook/addon-docs": ~6.5.16
Expand Down Expand Up @@ -10385,7 +10385,7 @@ __metadata:
resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming"
dependencies:
"@rocket.chat/css-in-js": ~0.31.25
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/fuselage-hooks": ^0.33.1
"@rocket.chat/icons": ~0.38.0
"@rocket.chat/ui-contexts": "workspace:~"
Expand Down Expand Up @@ -10415,7 +10415,7 @@ __metadata:
"@rocket.chat/css-in-js": ~0.31.25
"@rocket.chat/emitter": ~0.31.25
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/fuselage-hooks": ^0.33.1
"@rocket.chat/icons": ~0.38.0
"@rocket.chat/jest-presets": "workspace:~"
Expand Down Expand Up @@ -10448,8 +10448,8 @@ __metadata:
"@rocket.chat/fuselage-hooks": "*"
"@rocket.chat/icons": "*"
"@rocket.chat/styled": "*"
"@rocket.chat/ui-avatar": 6.0.0
"@rocket.chat/ui-contexts": 10.0.0
"@rocket.chat/ui-avatar": "*"
"@rocket.chat/ui-contexts": "*"
react: ^17.0.2
react-dom: ^17.0.2
languageName: unknown
Expand All @@ -10464,7 +10464,7 @@ __metadata:
"@codemirror/tooltip": ^0.19.16
"@lezer/highlight": ^1.1.6
"@rocket.chat/css-in-js": ~0.31.25
"@rocket.chat/fuselage": ^0.57.1
"@rocket.chat/fuselage": ^0.59.0
"@rocket.chat/fuselage-hooks": ^0.33.1
"@rocket.chat/fuselage-polyfills": ~0.31.25
"@rocket.chat/fuselage-toastbar": ^0.33.0
Expand Down Expand Up @@ -10536,7 +10536,7 @@ __metadata:
peerDependencies:
"@rocket.chat/layout": "*"
"@rocket.chat/tools": 0.2.2
"@rocket.chat/ui-contexts": 10.0.0
"@rocket.chat/ui-contexts": "*"
"@tanstack/react-query": "*"
react: "*"
react-hook-form: "*"
Expand Down
Loading