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.

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

[release-1.4] refactor(theme): switch to rhdh-plugins theme which also incl. some mui v5 fixes #2122

Draft
wants to merge 1 commit into
base: release-1.4
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 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.9",
"@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.9":
version: 0.4.9
resolution: "@red-hat-developer-hub/backstage-plugin-theme@npm:0.4.9"
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: ff0859c1245b301cce228db05e81f4ec393073504fa75f1dcfa002136ebe5b8067935aa01427020ff875640d10be4bb475569c4231773b95a548da10700302e7
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.9
"@scalprum/core": 0.8.1
"@scalprum/react-core": 0.9.3
"@scalprum/react-test-utils": 0.2.4
Expand Down
Loading