Skip to content

Commit 5a734ba

Browse files
ciiayciiay
authored
chore: replaced old theme package with the plugin theme (#761)
* chore: replaced old theme package with the plugin theme Signed-off-by: Yi Cai <yicai@redhat.com> * resolved failed ci checks Signed-off-by: Yi Cai <yicai@redhat.com> * restore bulk-import updates Signed-off-by: Yi Cai <yicai@redhat.com> * restore bulk-import updates Signed-off-by: Yi Cai <yicai@redhat.com> * yarn dedupe Signed-off-by: Yi Cai <yicai@redhat.com> * resolved merge conflicts Signed-off-by: Yi Cai <yicai@redhat.com> --------- Signed-off-by: Yi Cai <yicai@redhat.com>
1 parent d9f647b commit 5a734ba

24 files changed

Lines changed: 171 additions & 99 deletions

File tree

‎workspaces/adoption-insights/plugins/adoption-insights/dev/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import React from 'react';
1717

1818
import { createDevApp } from '@backstage/dev-utils';
19-
import { getAllThemes } from '@redhat-developer/red-hat-developer-hub-theme';
19+
import { getAllThemes } from '@red-hat-developer-hub/backstage-plugin-theme';
2020
import { TestApiProvider } from '@backstage/test-utils';
2121

2222
import { adoptionInsightsPlugin, AdoptionInsightsPage } from '../src/plugin';

‎workspaces/adoption-insights/plugins/adoption-insights/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@backstage/core-app-api": "^1.15.4",
6262
"@backstage/dev-utils": "^1.1.7",
6363
"@backstage/test-utils": "^1.7.4",
64-
"@redhat-developer/red-hat-developer-hub-theme": "^0.5.0",
64+
"@red-hat-developer-hub/backstage-plugin-theme": "^0.6.0",
6565
"@testing-library/jest-dom": "^6.0.0",
6666
"@testing-library/react": "^14.0.0",
6767
"@testing-library/user-event": "^14.0.0",

‎workspaces/adoption-insights/yarn.lock‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8822,6 +8822,22 @@ __metadata:
88228822
languageName: node
88238823
linkType: hard
88248824

8825+
"@mui/icons-material@npm:^5.17.1":
8826+
version: 5.17.1
8827+
resolution: "@mui/icons-material@npm:5.17.1"
8828+
dependencies:
8829+
"@babel/runtime": ^7.23.9
8830+
peerDependencies:
8831+
"@mui/material": ^5.0.0
8832+
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
8833+
react: ^17.0.0 || ^18.0.0 || ^19.0.0
8834+
peerDependenciesMeta:
8835+
"@types/react":
8836+
optional: true
8837+
checksum: 015149e65add85ab0c669829fabf2cfb9c0a95e33a527716f05f8bdc48247a1f0db5e4c83406d70e22600f7c8e54c339a7237e5d8223b73caa724d7b87ce2b0a
8838+
languageName: node
8839+
linkType: hard
8840+
88258841
"@mui/lab@npm:5.0.0-alpha.176":
88268842
version: 5.0.0-alpha.176
88278843
resolution: "@mui/lab@npm:5.0.0-alpha.176"
@@ -10661,7 +10677,7 @@ __metadata:
1066110677
"@mui/material": 5.16.14
1066210678
"@mui/x-date-pickers": 5.0.20
1066310679
"@red-hat-developer-hub/backstage-plugin-adoption-insights-common": "workspace:^"
10664-
"@redhat-developer/red-hat-developer-hub-theme": ^0.5.0
10680+
"@red-hat-developer-hub/backstage-plugin-theme": ^0.6.0
1066510681
"@testing-library/jest-dom": ^6.0.0
1066610682
"@testing-library/react": ^14.0.0
1066710683
"@testing-library/user-event": ^14.0.0
@@ -10700,18 +10716,19 @@ __metadata:
1070010716
languageName: unknown
1070110717
linkType: soft
1070210718

10703-
"@redhat-developer/red-hat-developer-hub-theme@npm:^0.5.0":
10704-
version: 0.5.0
10705-
resolution: "@redhat-developer/red-hat-developer-hub-theme@npm:0.5.0"
10719+
"@red-hat-developer-hub/backstage-plugin-theme@npm:^0.6.0":
10720+
version: 0.6.0
10721+
resolution: "@red-hat-developer-hub/backstage-plugin-theme@npm:0.6.0"
10722+
dependencies:
10723+
"@mui/icons-material": ^5.17.1
1070610724
peerDependencies:
10707-
"@backstage/theme": ^0.5.2
10708-
"@emotion/react": ^11.11.1
10709-
"@emotion/styled": ^11.11.0
10710-
"@material-ui/core": ^4.12.4
10725+
"@backstage/core-plugin-api": ^1.10.4
10726+
"@backstage/theme": ^0.6.4
1071110727
"@material-ui/icons": ^4.11.3
10712-
"@mui/icons-material": ^5.14.19
10713-
"@mui/material": ^5.14.20
10714-
checksum: 158667ac33e7b926fec2c7ed9d26c3bd81deafe8b0026316ab171e66dd2f3a36474225e42b7ac8527d0e357c1c11432fe767f0cd46b2cd86464e53e4c146a09c
10728+
"@mui/icons-material": ^5.17.1
10729+
"@mui/material": ^5.0.0
10730+
react: ^16.13.1 || ^17.0.0 || ^18.0.0
10731+
checksum: 37b868436f32ac08f6fd465d3a14caf636731e299a8407dc07970681b0e6327d61f12616820ff57b103a3ef8c51d37092dd6e972363d914cecd7c0f3231a760b
1071510732
languageName: node
1071610733
linkType: hard
1071710734

‎workspaces/ai-integrations/packages/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@material-ui/icons": "^4.9.1",
4949
"@red-hat-developer-hub/backstage-plugin-ai-experience": "workspace:^",
5050
"@red-hat-developer-hub/backstage-plugin-global-header": "^1.4.0",
51-
"@redhat-developer/red-hat-developer-hub-theme": "^0.5.0",
51+
"@red-hat-developer-hub/backstage-plugin-theme": "^0.6.0",
5252
"react": "^18.0.2",
5353
"react-dom": "^18.0.2",
5454
"react-router": "^6.3.0",

‎workspaces/ai-integrations/packages/app/src/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { apis } from './apis';
4040
import { entityPage } from './components/catalog/EntityPage';
4141
import { searchPage } from './components/search/SearchPage';
4242
import { Root } from './components/Root';
43-
import { getThemes } from '@redhat-developer/red-hat-developer-hub-theme';
43+
import { getThemes } from '@red-hat-developer-hub/backstage-plugin-theme';
4444

4545
import {
4646
AlertDisplay,

‎workspaces/ai-integrations/plugins/ai-experience/dev/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import React from 'react';
1717
import NewspaperOutlinedIcon from '@mui/icons-material/NewspaperOutlined';
1818
import { createDevApp } from '@backstage/dev-utils';
19-
import { getAllThemes } from '@redhat-developer/red-hat-developer-hub-theme';
19+
import { getAllThemes } from '@red-hat-developer-hub/backstage-plugin-theme';
2020
import {
2121
aiExperiencePlugin,
2222
AiExperiencePage,

‎workspaces/ai-integrations/plugins/ai-experience/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@backstage/core-app-api": "^1.16.0",
6060
"@backstage/dev-utils": "^1.1.8",
6161
"@backstage/test-utils": "^1.7.6",
62-
"@redhat-developer/red-hat-developer-hub-theme": "0.5.1",
62+
"@red-hat-developer-hub/backstage-plugin-theme": "^0.6.0",
6363
"@testing-library/jest-dom": "^6.0.0",
6464
"@testing-library/react": "^14.0.0",
6565
"@testing-library/user-event": "^14.0.0",

‎workspaces/ai-integrations/yarn.lock‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8675,6 +8675,22 @@ __metadata:
86758675
languageName: node
86768676
linkType: hard
86778677

8678+
"@mui/icons-material@npm:^5.17.1":
8679+
version: 5.17.1
8680+
resolution: "@mui/icons-material@npm:5.17.1"
8681+
dependencies:
8682+
"@babel/runtime": ^7.23.9
8683+
peerDependencies:
8684+
"@mui/material": ^5.0.0
8685+
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
8686+
react: ^17.0.0 || ^18.0.0 || ^19.0.0
8687+
peerDependenciesMeta:
8688+
"@types/react":
8689+
optional: true
8690+
checksum: 015149e65add85ab0c669829fabf2cfb9c0a95e33a527716f05f8bdc48247a1f0db5e4c83406d70e22600f7c8e54c339a7237e5d8223b73caa724d7b87ce2b0a
8691+
languageName: node
8692+
linkType: hard
8693+
86788694
"@mui/material@npm:5.16.14":
86798695
version: 5.16.14
86808696
resolution: "@mui/material@npm:5.16.14"
@@ -10673,7 +10689,7 @@ __metadata:
1067310689
"@mui/material": 5.16.14
1067410690
"@red-hat-developer-hub/backstage-plugin-ai-experience-backend": "workspace:^"
1067510691
"@red-hat-developer-hub/backstage-plugin-ai-experience-common": "workspace:^"
10676-
"@redhat-developer/red-hat-developer-hub-theme": 0.5.1
10692+
"@red-hat-developer-hub/backstage-plugin-theme": ^0.6.0
1067710693
"@tanstack/react-query": ^5.71.0
1067810694
"@testing-library/jest-dom": ^6.0.0
1067910695
"@testing-library/react": ^14.0.0
@@ -10740,28 +10756,29 @@ __metadata:
1074010756
languageName: node
1074110757
linkType: hard
1074210758

10759+
"@red-hat-developer-hub/backstage-plugin-theme@npm:^0.6.0":
10760+
version: 0.6.0
10761+
resolution: "@red-hat-developer-hub/backstage-plugin-theme@npm:0.6.0"
10762+
dependencies:
10763+
"@mui/icons-material": ^5.17.1
10764+
peerDependencies:
10765+
"@backstage/core-plugin-api": ^1.10.4
10766+
"@backstage/theme": ^0.6.4
10767+
"@material-ui/icons": ^4.11.3
10768+
"@mui/icons-material": ^5.17.1
10769+
"@mui/material": ^5.0.0
10770+
react: ^16.13.1 || ^17.0.0 || ^18.0.0
10771+
checksum: 37b868436f32ac08f6fd465d3a14caf636731e299a8407dc07970681b0e6327d61f12616820ff57b103a3ef8c51d37092dd6e972363d914cecd7c0f3231a760b
10772+
languageName: node
10773+
linkType: hard
10774+
1074310775
"@redhat-ai-dev/model-catalog-types@npm:^1.1.0":
1074410776
version: 1.1.0
1074510777
resolution: "@redhat-ai-dev/model-catalog-types@npm:1.1.0"
1074610778
checksum: 1974a2b6a3cc7cc1ef9da13e2794482bc00404f70aa6bfaf349992a7df4ad4ae7d8fe856bcd814595fcfef9f6a16c72967e0e6cf3d3d4a4d22398a355ae00b41
1074710779
languageName: node
1074810780
linkType: hard
1074910781

10750-
"@redhat-developer/red-hat-developer-hub-theme@npm:0.5.1, @redhat-developer/red-hat-developer-hub-theme@npm:^0.5.0":
10751-
version: 0.5.1
10752-
resolution: "@redhat-developer/red-hat-developer-hub-theme@npm:0.5.1"
10753-
peerDependencies:
10754-
"@backstage/theme": ^0.5.2
10755-
"@emotion/react": ^11.11.1
10756-
"@emotion/styled": ^11.11.0
10757-
"@material-ui/core": ^4.12.4
10758-
"@material-ui/icons": ^4.11.3
10759-
"@mui/icons-material": ^5.14.19
10760-
"@mui/material": ^5.14.20
10761-
checksum: 4de9e62b9de390c7de82fcf123a03135366952ab39d423be51c3afb242c316e3deb78ecaa3e038d6bcc12695f8f03223b9efb45a689a40ea2c11139f4e3fc06d
10762-
languageName: node
10763-
linkType: hard
10764-
1076510782
"@redis/bloom@npm:1.2.0":
1076610783
version: 1.2.0
1076710784
resolution: "@redis/bloom@npm:1.2.0"
@@ -15281,7 +15298,7 @@ __metadata:
1528115298
"@playwright/test": ^1.32.3
1528215299
"@red-hat-developer-hub/backstage-plugin-ai-experience": "workspace:^"
1528315300
"@red-hat-developer-hub/backstage-plugin-global-header": ^1.4.0
15284-
"@redhat-developer/red-hat-developer-hub-theme": ^0.5.0
15301+
"@red-hat-developer-hub/backstage-plugin-theme": ^0.6.0
1528515302
"@testing-library/dom": ^9.0.0
1528615303
"@testing-library/jest-dom": ^6.0.0
1528715304
"@testing-library/react": ^14.0.0

‎workspaces/global-floating-action-button/packages/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@mui/material": "5.16.14",
4747
"@mui/styles": "5.16.14",
4848
"@red-hat-developer-hub/backstage-plugin-global-floating-action-button": "workspace:^",
49-
"@redhat-developer/red-hat-developer-hub-theme": "^0.5.0",
49+
"@red-hat-developer-hub/backstage-plugin-theme": "^0.6.0",
5050
"react": "^18.0.2",
5151
"react-dom": "^18.0.2",
5252
"react-router-dom": "^6.3.0"

‎workspaces/global-floating-action-button/packages/app/src/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import {
4646
import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
4747
import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
4848
import { UserSettingsPage } from '@backstage/plugin-user-settings';
49-
import { getThemes } from '@redhat-developer/red-hat-developer-hub-theme';
49+
import { getThemes } from '@red-hat-developer-hub/backstage-plugin-theme';
5050
import React from 'react';
5151
import { Navigate, Route } from 'react-router-dom';
5252
import { apis } from './apis';

0 commit comments

Comments
 (0)