Skip to content

Commit

Permalink
refactor(theme): switch to rhdh-plugins theme which also incl. some m…
Browse files Browse the repository at this point in the history 
…ui v5 fixes

Signed-off-by: Christoph Jerolimov <[email protected]>
  • Loading branch information
@christoph-jerolimov
christoph-jerolimov committed Dec 6, 2024
1 parent d3c2916 commit 5a56eea
Show file tree
Hide file tree
Showing 4 changed files with 140 additions and 14 deletions.
2 changes: 1 addition & 1 deletion packages/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@mui/icons-material": "5.16.7",
"@mui/material": "5.16.7",
"@mui/styled-engine": "5.16.6",
"@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
"@red-hat-developer-hub/backstage-plugin-theme": "0.4.6",
"@scalprum/core": "0.8.1",
"@scalprum/react-core": "0.9.3",
"lodash": "4.17.21",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/DynamicRoot/DynamicRoot.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { createApp } from '@backstage/app-defaults';
import { BackstageApp } from '@backstage/core-app-api';
import { AnyApiFactory, BackstagePlugin } from '@backstage/core-plugin-api';

import { useThemes } from '@redhat-developer/red-hat-developer-hub-theme';
import { useThemes } from '@red-hat-developer-hub/backstage-plugin-theme';
import { AppsConfig } from '@scalprum/core';
import { useScalprum } from '@scalprum/react-core';

Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/DynamicRoot/Loader.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Box from '@mui/material/Box';
import CircularProgress from '@mui/material/CircularProgress';
import CssBaseline from '@mui/material/CssBaseline';
import { ThemeProvider } from '@mui/material/styles';
import { useLoaderTheme } from '@redhat-developer/red-hat-developer-hub-theme';
import { useLoaderTheme } from '@red-hat-developer-hub/backstage-plugin-theme';

const Loader = () => {
// Access theme context before Backstage App is instantiated
Expand Down
148 changes: 137 additions & 11 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12487,6 +12487,13 @@ __metadata:
languageName: node
linkType: hard

"@mui/core-downloads-tracker@npm:^5.16.8":
version: 5.16.8
resolution: "@mui/core-downloads-tracker@npm:5.16.8"
checksum: 1d099442aabf0a17ae0045d370565fca9c8654a654f88a08595542e6566d159aa632cc7d73aefa247f2ae3ab853709ea2e37118a080891bfbd200c58212202ca
languageName: node
linkType: hard

"@mui/icons-material@npm:5.15.17":
version: 5.15.17
resolution: "@mui/icons-material@npm:5.15.17"
Expand Down Expand Up @@ -12613,6 +12620,39 @@ __metadata:
languageName: node
linkType: hard

"@mui/material@npm:^5.0.0":
version: 5.16.8
resolution: "@mui/material@npm:5.16.8"
dependencies:
"@babel/runtime": ^7.23.9
"@mui/core-downloads-tracker": ^5.16.8
"@mui/system": ^5.16.8
"@mui/types": ^7.2.15
"@mui/utils": ^5.16.8
"@popperjs/core": ^2.11.8
"@types/react-transition-group": ^4.4.10
clsx: ^2.1.0
csstype: ^3.1.3
prop-types: ^15.8.1
react-is: ^18.3.1
react-transition-group: ^4.4.5
peerDependencies:
"@emotion/react": ^11.5.0
"@emotion/styled": ^11.3.0
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta:
"@emotion/react":
optional: true
"@emotion/styled":
optional: true
"@types/react":
optional: true
checksum: 37aa0bba0d64feb46b6c7ef71ed44010c0799c5ebb57b345cf364e43be748a5229abfe3f4b573de225369b9cac13b35f6d32ad9e3015ad152645296f52096584
languageName: node
linkType: hard

"@mui/private-theming@npm:^5.16.6":
version: 5.16.6
resolution: "@mui/private-theming@npm:5.16.6"
Expand All @@ -12630,6 +12670,23 @@ __metadata:
languageName: node
linkType: hard

"@mui/private-theming@npm:^5.16.8":
version: 5.16.8
resolution: "@mui/private-theming@npm:5.16.8"
dependencies:
"@babel/runtime": ^7.23.9
"@mui/utils": ^5.16.8
prop-types: ^15.8.1
peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta:
"@types/react":
optional: true
checksum: 576cf19188c236482a8a698978d3061c7e8d76ba9d891d323ce96d92d6b80d88e1aa2a67fe4698d76b8a43221ef0f8ed21be74971fc684ce1279dc73fd34316b
languageName: node
linkType: hard

"@mui/private-theming@npm:^6.1.9":
version: 6.1.9
resolution: "@mui/private-theming@npm:6.1.9"
Expand Down Expand Up @@ -12668,6 +12725,27 @@ __metadata:
languageName: node
linkType: hard

"@mui/styled-engine@npm:^5.16.8":
version: 5.16.8
resolution: "@mui/styled-engine@npm:5.16.8"
dependencies:
"@babel/runtime": ^7.23.9
"@emotion/cache": ^11.11.0
csstype: ^3.1.3
prop-types: ^15.8.1
peerDependencies:
"@emotion/react": ^11.4.1
"@emotion/styled": ^11.3.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta:
"@emotion/react":
optional: true
"@emotion/styled":
optional: true
checksum: 8eab246e985bbe2707af4620a3193166bacefb029df65ac846cfc0ac5d7996fcb72c50327241f60913538f58a2ad9aa6de3ef12b72eb7750c71f8d3c284a420b
languageName: node
linkType: hard

"@mui/styles@npm:5.16.7, @mui/styles@npm:^5.16.7":
version: 5.16.7
resolution: "@mui/styles@npm:5.16.7"
Expand Down Expand Up @@ -12758,6 +12836,34 @@ __metadata:
languageName: node
linkType: hard

"@mui/system@npm:^5.16.8":
version: 5.16.8
resolution: "@mui/system@npm:5.16.8"
dependencies:
"@babel/runtime": ^7.23.9
"@mui/private-theming": ^5.16.8
"@mui/styled-engine": ^5.16.8
"@mui/types": ^7.2.15
"@mui/utils": ^5.16.8
clsx: ^2.1.0
csstype: ^3.1.3
prop-types: ^15.8.1
peerDependencies:
"@emotion/react": ^11.5.0
"@emotion/styled": ^11.3.0
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta:
"@emotion/react":
optional: true
"@emotion/styled":
optional: true
"@types/react":
optional: true
checksum: 8082b176009fa907cdb0391db59db6cd3589659ad92497caec998c01e1683978ab2eda4ece4d12e523d233b062aa5946d4a438d9a22bf172f0568be1db773e9c
languageName: node
linkType: hard

"@mui/types@npm:^7.2.14, @mui/types@npm:^7.2.15, @mui/types@npm:^7.2.19":
version: 7.2.19
resolution: "@mui/types@npm:7.2.19"
Expand Down Expand Up @@ -12790,6 +12896,26 @@ __metadata:
languageName: node
linkType: hard

"@mui/utils@npm:^5.16.8":
version: 5.16.8
resolution: "@mui/utils@npm:5.16.8"
dependencies:
"@babel/runtime": ^7.23.9
"@mui/types": ^7.2.15
"@types/prop-types": ^15.7.12
clsx: ^2.1.1
prop-types: ^15.8.1
react-is: ^18.3.1
peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta:
"@types/react":
optional: true
checksum: ed714c6aa583bdf17af9f523c9b9ba3789a47677aa6408bc2afd842fa9eaa6d111361c1309435d481ea03b8c695e22ead98c43dc13239c63a3da481c95e5ad72
languageName: node
linkType: hard

"@mui/utils@npm:^6.1.9":
version: 6.1.9
resolution: "@mui/utils@npm:6.1.9"
Expand Down Expand Up @@ -16181,18 +16307,18 @@ __metadata:
languageName: node
linkType: hard

"@redhat-developer/red-hat-developer-hub-theme@npm:0.4.0":
version: 0.4.0
resolution: "@redhat-developer/red-hat-developer-hub-theme@npm:0.4.0"
"@red-hat-developer-hub/backstage-plugin-theme@npm:0.4.6":
version: 0.4.6
resolution: "@red-hat-developer-hub/backstage-plugin-theme@npm:0.4.6"
dependencies:
"@mui/material": ^5.0.0
peerDependencies:
"@backstage/theme": ^0.5.2
"@emotion/react": ^11.11.1
"@emotion/styled": ^11.11.0
"@material-ui/core": ^4.12.4
"@backstage/core-components": ^0.15.1
"@backstage/core-plugin-api": ^1.10.0
"@backstage/theme": ^0.6.0
"@material-ui/icons": ^4.11.3
"@mui/icons-material": ^5.14.19
"@mui/material": ^5.14.20
checksum: 8684f8faa2fe87100dba2c19f1e1a306e808cf98bc65da829c3203a325ea6520a93e54c174e25a220ccf8280ecc2750a178a0d18b12f5ba354c7c415e8a9dc7b
react: ^16.13.1 || ^17.0.0 || ^18.0.0
checksum: eb3e8617dd54f225cd78530c1c38a180f41dd297b8db1c98eaa02f5bdc881912e1f047932db92cd0254aff62d7ee00b6ff202978680038c598bb661d0858a082
languageName: node
linkType: hard

Expand Down Expand Up @@ -21599,7 +21725,7 @@ __metadata:
"@mui/icons-material": 5.16.7
"@mui/material": 5.16.7
"@mui/styled-engine": 5.16.6
"@redhat-developer/red-hat-developer-hub-theme": 0.4.0
"@red-hat-developer-hub/backstage-plugin-theme": 0.4.6
"@scalprum/core": 0.8.1
"@scalprum/react-core": 0.9.3
"@scalprum/react-test-utils": 0.2.4
Expand Down

0 comments on commit 5a56eea

Please sign in to comment.