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 committed Dec 19, 2024
1 parent 72d5be9 commit 77429f6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion packages/app/package.json
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.8",
"@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
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
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
20 changes: 9 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16131,18 +16131,16 @@ __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.8":
version: 0.4.8
resolution: "@red-hat-developer-hub/backstage-plugin-theme@npm:0.4.8"
peerDependencies:
"@backstage/theme": ^0.5.2
"@emotion/react": ^11.11.1
"@emotion/styled": ^11.11.0
"@material-ui/core": ^4.12.4
"@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
"@mui/material": ^5.0.0
react: ^16.13.1 || ^17.0.0 || ^18.0.0
checksum: bfc463884d0392b50c1de0ffefc0e55db8d95393704438b74d97e63cd7d9e415196543400c6b77314bcdd3666ca99b3ac1f719ffc47e0f25f39db5ba27d4a97c
languageName: node
linkType: hard

Expand Down Expand Up @@ -21549,7 +21547,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.8
"@scalprum/core": 0.8.1
"@scalprum/react-core": 0.9.3
"@scalprum/react-test-utils": 0.2.4
Expand Down

0 comments on commit 77429f6

Please sign in to comment.