Skip to content

Commit 328508c

Browse files
rhdh-botgithub-actions[bot]its-mitesh-kumar
authored
bulk-import - version:bump to v1.49.3 (#2687)
* v1.49.3 version bump * updating yarn.lock Signed-off-by: its-mitesh-kumar <itsmiteshkumar98@gmail.com> * fix(bulk-import): update resolutions and fix SignInPageBlueprint import for v1.49.3 - Update workspace resolutions to v1.49.3-compatible versions to fix dual @backstage/frontend-plugin-api install caused by stale pins - Fix App.tsx to import SignInPageBlueprint from @backstage/plugin-app-react (moved from @backstage/frontend-plugin-api in v0.15.x) - Add SignInPageProps type annotation to fix TS7006 implicit any - Regenerate yarn.lock with updated dependencies Made-with: Cursor * updating the packages Signed-off-by: its-mitesh-kumar <itsmiteshkumar98@gmail.com> * updating packages Signed-off-by: its-mitesh-kumar <itsmiteshkumar98@gmail.com> * updating api report Signed-off-by: its-mitesh-kumar <itsmiteshkumar98@gmail.com> * updating the snapshots Signed-off-by: its-mitesh-kumar <itsmiteshkumar98@gmail.com> --------- Signed-off-by: its-mitesh-kumar <itsmiteshkumar98@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: its-mitesh-kumar <itsmiteshkumar98@gmail.com>
1 parent 0c0e14e commit 328508c

16 files changed

Lines changed: 2345 additions & 3487 deletions

File tree

‎workspaces/bulk-import/.changeset/version-bump-1-49-3.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@red-hat-developer-hub/backstage-plugin-bulk-import': minor
3+
'@red-hat-developer-hub/backstage-plugin-bulk-import-backend': minor
4+
'@red-hat-developer-hub/backstage-plugin-bulk-import-common': minor
5+
---
6+
7+
Backstage version bump to v1.49.3

‎workspaces/bulk-import/backstage.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "1.47.3"
2+
"version": "1.49.3"
33
}

‎workspaces/bulk-import/e2e-tests/utils/ariaSnapshots.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ export function getPreviewSidebarSnapshots(t: BulkImportMessages) {
142142
- text: This pull request adds a
143143
- strong: Backstage entity metadata file
144144
- text: to this repository so that the component can be added to the
145-
- link "software catalog":
145+
- link "software catalog , Opens in a new window":
146146
- /url: /http:\\/\\/localhost:300\\d\\/catalog/
147147
- text: . After this pull request is merged, the component will become available. For more information, read an
148-
- link "overview of the Backstage software catalog":
148+
- link "overview of the Backstage software catalog , Opens in a new window":
149149
- /url: https://backstage.io/docs/features/software-catalog/
150150
- text: . View the import job in your app
151-
- link "here":
151+
- link "here , Opens in a new window":
152152
- /url: /http:\\/\\/localhost:300\\d\\/bulk-import\\?repository=https:\\/\\/github\\.com\\/test-org\\/backend-service&defaultBranch=main/
153153
- text: .
154154
`,

‎workspaces/bulk-import/package.json‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,45 @@
4242
},
4343
"devDependencies": {
4444
"@axe-core/playwright": "^4.11.0",
45-
"@backstage/cli": "^0.35.3",
46-
"@backstage/e2e-test-utils": "^0.1.1",
47-
"@backstage/repo-tools": "^0.16.3",
45+
"@backstage/cli": "^0.36.0",
46+
"@backstage/e2e-test-utils": "^0.1.2",
47+
"@backstage/repo-tools": "^0.17.0",
4848
"@changesets/cli": "^2.27.1",
4949
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
5050
"@playwright/test": "1.58.2",
5151
"@spotify/prettier-config": "^12.0.0",
5252
"knip": "^5.27.4",
5353
"node-gyp": "^9.0.0",
5454
"prettier": "^3.4.2",
55-
"typescript": "~5.3.0"
55+
"typescript": "~5.8.0"
5656
},
5757
"resolutions": {
5858
"@types/react": "^18",
5959
"@types/react-dom": "^18",
6060
"refractor@npm:3.6.0/prismjs": "^1.30.0",
61-
"@backstage/plugin-catalog-backend": "3.3.2",
62-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "0.2.16",
63-
"@backstage/plugin-catalog": "1.32.2",
64-
"@backstage/plugin-scaffolder": "1.35.2",
65-
"@backstage/plugin-api-docs": "0.13.3",
66-
"@backstage/plugin-catalog-graph": "0.5.6",
67-
"@backstage/plugin-catalog-import": "0.13.9",
68-
"@backstage/plugin-org": "0.6.48",
69-
"@backstage/plugin-search": "1.5.3",
70-
"@backstage/plugin-search-react": "1.10.2",
71-
"@backstage/plugin-techdocs": "1.16.2",
72-
"@backstage/plugin-techdocs-react": "1.3.7",
73-
"@backstage/plugin-notifications": "0.5.13",
74-
"@backstage/plugin-scaffolder-react": "1.19.6",
75-
"@backstage/core-plugin-api": "1.12.2"
61+
"@backstage/frontend-plugin-api": "0.15.1",
62+
"@backstage/plugin-catalog": "2.0.1",
63+
"@backstage/plugin-scaffolder": "1.36.1",
64+
"@backstage/ui": "0.14.3",
65+
"@backstage/plugin-catalog-backend": "3.5.0",
66+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "0.2.18",
67+
"@backstage/backend-plugin-api": "1.8.0",
68+
"@backstage/backend-openapi-utils": "0.6.7",
69+
"@backstage/plugin-catalog-node": "2.1.0",
70+
"@backstage/plugin-events-node": "0.4.20",
71+
"@backstage/plugin-permission-node": "0.10.11",
72+
"@backstage/core-compat-api": "0.5.9",
73+
"@backstage/core-plugin-api": "1.12.4",
74+
"@backstage/plugin-app-react": "0.2.1",
75+
"@backstage/plugin-catalog-react": "2.1.0",
76+
"@backstage/plugin-scaffolder-react": "1.20.0",
77+
"@backstage/plugin-catalog-graph": "0.6.0",
78+
"@backstage/plugin-catalog-import": "0.13.11",
79+
"@backstage/plugin-org": "0.7.0",
80+
"@backstage/plugin-search-react": "1.11.0",
81+
"@backstage/plugin-search": "1.7.0",
82+
"@backstage/plugin-techdocs-react": "1.3.9",
83+
"@backstage/plugin-techdocs": "1.17.2"
7684
},
7785
"prettier": "@spotify/prettier-config",
7886
"lint-staged": {

‎workspaces/bulk-import/packages/app-legacy/package.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,32 @@
2020
},
2121
"dependencies": {
2222
"@backstage-community/plugin-rbac": "^1.33.2",
23-
"@backstage/app-defaults": "^1.7.4",
24-
"@backstage/catalog-model": "^1.7.6",
25-
"@backstage/cli": "^0.35.3",
26-
"@backstage/core-app-api": "^1.19.4",
27-
"@backstage/core-components": "^0.18.6",
28-
"@backstage/core-plugin-api": "^1.12.2",
29-
"@backstage/integration-react": "^1.2.14",
30-
"@backstage/plugin-api-docs": "^0.13.3",
31-
"@backstage/plugin-catalog": "^1.32.2",
32-
"@backstage/plugin-catalog-common": "^1.1.7",
33-
"@backstage/plugin-catalog-graph": "^0.5.6",
34-
"@backstage/plugin-catalog-import": "^0.13.9",
35-
"@backstage/plugin-catalog-react": "^1.21.6",
36-
"@backstage/plugin-notifications": "^0.5.13",
37-
"@backstage/plugin-org": "^0.6.48",
38-
"@backstage/plugin-permission-react": "^0.4.39",
39-
"@backstage/plugin-scaffolder": "^1.35.2",
40-
"@backstage/plugin-search": "^1.5.3",
41-
"@backstage/plugin-search-react": "^1.10.2",
42-
"@backstage/plugin-signals": "^0.0.27",
43-
"@backstage/plugin-techdocs": "^1.16.2",
44-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.32",
45-
"@backstage/plugin-techdocs-react": "^1.3.7",
46-
"@backstage/plugin-user-settings": "^0.8.31",
47-
"@backstage/theme": "^0.7.1",
48-
"@backstage/ui": "^0.11.2",
23+
"@backstage/app-defaults": "^1.7.6",
24+
"@backstage/catalog-model": "^1.7.7",
25+
"@backstage/cli": "^0.36.0",
26+
"@backstage/core-app-api": "^1.19.6",
27+
"@backstage/core-components": "^0.18.8",
28+
"@backstage/core-plugin-api": "^1.12.4",
29+
"@backstage/integration-react": "^1.2.16",
30+
"@backstage/plugin-api-docs": "^0.13.5",
31+
"@backstage/plugin-catalog": "^2.0.1",
32+
"@backstage/plugin-catalog-common": "^1.1.8",
33+
"@backstage/plugin-catalog-graph": "^0.6.0",
34+
"@backstage/plugin-catalog-import": "^0.13.11",
35+
"@backstage/plugin-catalog-react": "^2.1.1",
36+
"@backstage/plugin-notifications": "^0.5.15",
37+
"@backstage/plugin-org": "^0.7.0",
38+
"@backstage/plugin-permission-react": "^0.4.41",
39+
"@backstage/plugin-scaffolder": "^1.36.1",
40+
"@backstage/plugin-search": "^1.7.0",
41+
"@backstage/plugin-search-react": "^1.11.0",
42+
"@backstage/plugin-signals": "^0.0.29",
43+
"@backstage/plugin-techdocs": "^1.17.2",
44+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
45+
"@backstage/plugin-techdocs-react": "^1.3.9",
46+
"@backstage/plugin-user-settings": "^0.9.1",
47+
"@backstage/theme": "^0.7.2",
48+
"@backstage/ui": "^0.13.2",
4949
"@mui/icons-material": "5.18.0",
5050
"@mui/lab": "5.0.0-alpha.177",
5151
"@mui/material": "5.18.0",
@@ -74,10 +74,10 @@
7474
},
7575
"devDependencies": {
7676
"@axe-core/playwright": "^4.11.0",
77-
"@backstage/cli": "^0.35.3",
78-
"@backstage/core-app-api": "^1.19.4",
79-
"@backstage/dev-utils": "^1.1.19",
80-
"@backstage/test-utils": "^1.7.14",
77+
"@backstage/cli": "^0.36.0",
78+
"@backstage/core-app-api": "^1.19.6",
79+
"@backstage/dev-utils": "^1.1.21",
80+
"@backstage/test-utils": "^1.7.16",
8181
"@playwright/test": "1.57.0",
8282
"@red-hat-developer-hub/backstage-plugin-theme": "^0.11.0",
8383
"@spotify/prettier-config": "^15.0.0",

‎workspaces/bulk-import/packages/app-legacy/src/App.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import {
5252
} from '@red-hat-developer-hub/backstage-plugin-orchestrator';
5353
import { BulkImportPage } from '@red-hat-developer-hub/backstage-plugin-bulk-import';
5454
import { getThemes } from '@red-hat-developer-hub/backstage-plugin-theme';
55-
import { NotificationsPage } from '@backstage/plugin-notifications';
5655
import { SignalsDisplay } from '@backstage/plugin-signals';
5756
import { RbacPage } from '@backstage-community/plugin-rbac';
5857
import { Navigate, Route } from 'react-router-dom';
@@ -146,7 +145,6 @@ const routes = (
146145
<Route path="/settings" element={<UserSettingsPage />} />
147146
<Route path="/catalog-graph" element={<CatalogGraphPage />} />
148147
<Route path="/bulk-import/*" element={<BulkImportPage />} />
149-
<Route path="/notifications" element={<NotificationsPage />} />
150148
<Route path="/orchestrator" element={<OrchestratorPage />} />
151149
<Route path="/rbac" element={<RbacPage />} />
152150
</FlatRoutes>

‎workspaces/bulk-import/packages/app-legacy/src/components/Root/Root.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import { BulkImportSidebarItem } from '@red-hat-developer-hub/backstage-plugin-b
4444
import { PropsWithChildren } from 'react';
4545
import LogoFull from './LogoFull';
4646
import LogoIcon from './LogoIcon';
47-
import { NotificationsSidebarItem } from '@backstage/plugin-notifications';
4847

4948
const useSidebarLogoStyles = makeStyles({
5049
root: {
@@ -118,7 +117,6 @@ export const Root = ({ children }: PropsWithChildren<{}>) => {
118117
icon={<UserSettingsSignInAvatar />}
119118
to="/settings"
120119
>
121-
<NotificationsSidebarItem />
122120
<SidebarSettings />
123121
</SidebarGroup>
124122
</Sidebar>

‎workspaces/bulk-import/packages/app-legacy/src/components/catalog/EntityPage.tsx‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -139,17 +139,17 @@ const overviewContent = (
139139
<Grid container spacing={3} alignItems="stretch">
140140
{entityWarningContent}
141141
<Grid item md={6}>
142-
<EntityAboutCard variant="gridItem" />
142+
<EntityAboutCard />
143143
</Grid>
144144
<Grid item md={6} xs={12}>
145-
<EntityCatalogGraphCard variant="gridItem" height={400} />
145+
<EntityCatalogGraphCard height={400} />
146146
</Grid>
147147

148148
<Grid item md={4} xs={12}>
149149
<EntityLinksCard />
150150
</Grid>
151151
<Grid item md={8} xs={12}>
152-
<EntityHasSubcomponentsCard variant="gridItem" />
152+
<EntityHasSubcomponentsCard />
153153
</Grid>
154154
</Grid>
155155
);
@@ -178,10 +178,10 @@ const serviceEntityPage = (
178178
<EntityLayout.Route path="/dependencies" title="Dependencies">
179179
<Grid container spacing={3} alignItems="stretch">
180180
<Grid item md={6}>
181-
<EntityDependsOnComponentsCard variant="gridItem" />
181+
<EntityDependsOnComponentsCard />
182182
</Grid>
183183
<Grid item md={6}>
184-
<EntityDependsOnResourcesCard variant="gridItem" />
184+
<EntityDependsOnResourcesCard />
185185
</Grid>
186186
</Grid>
187187
</EntityLayout.Route>
@@ -205,10 +205,10 @@ const websiteEntityPage = (
205205
<EntityLayout.Route path="/dependencies" title="Dependencies">
206206
<Grid container spacing={3} alignItems="stretch">
207207
<Grid item md={6}>
208-
<EntityDependsOnComponentsCard variant="gridItem" />
208+
<EntityDependsOnComponentsCard />
209209
</Grid>
210210
<Grid item md={6}>
211-
<EntityDependsOnResourcesCard variant="gridItem" />
211+
<EntityDependsOnResourcesCard />
212212
</Grid>
213213
</Grid>
214214
</EntityLayout.Route>
@@ -261,7 +261,7 @@ const apiPage = (
261261
<EntityAboutCard />
262262
</Grid>
263263
<Grid item md={6} xs={12}>
264-
<EntityCatalogGraphCard variant="gridItem" height={400} />
264+
<EntityCatalogGraphCard height={400} />
265265
</Grid>
266266
<Grid item md={4} xs={12}>
267267
<EntityLinksCard />
@@ -293,10 +293,10 @@ const userPage = (
293293
<Grid container spacing={3}>
294294
{entityWarningContent}
295295
<Grid item xs={12} md={6}>
296-
<EntityUserProfileCard variant="gridItem" />
296+
<EntityUserProfileCard />
297297
</Grid>
298298
<Grid item xs={12} md={6}>
299-
<EntityOwnershipCard variant="gridItem" />
299+
<EntityOwnershipCard />
300300
</Grid>
301301
</Grid>
302302
</EntityLayout.Route>
@@ -309,10 +309,10 @@ const groupPage = (
309309
<Grid container spacing={3}>
310310
{entityWarningContent}
311311
<Grid item xs={12} md={6}>
312-
<EntityGroupProfileCard variant="gridItem" />
312+
<EntityGroupProfileCard />
313313
</Grid>
314314
<Grid item xs={12} md={6}>
315-
<EntityOwnershipCard variant="gridItem" />
315+
<EntityOwnershipCard />
316316
</Grid>
317317
<Grid item xs={12} md={6}>
318318
<EntityMembersListCard />
@@ -331,28 +331,27 @@ const systemPage = (
331331
<Grid container spacing={3} alignItems="stretch">
332332
{entityWarningContent}
333333
<Grid item md={6}>
334-
<EntityAboutCard variant="gridItem" />
334+
<EntityAboutCard />
335335
</Grid>
336336
<Grid item md={6} xs={12}>
337-
<EntityCatalogGraphCard variant="gridItem" height={400} />
337+
<EntityCatalogGraphCard height={400} />
338338
</Grid>
339339
<Grid item md={4} xs={12}>
340340
<EntityLinksCard />
341341
</Grid>
342342
<Grid item md={8}>
343-
<EntityHasComponentsCard variant="gridItem" />
343+
<EntityHasComponentsCard />
344344
</Grid>
345345
<Grid item md={6}>
346-
<EntityHasApisCard variant="gridItem" />
346+
<EntityHasApisCard />
347347
</Grid>
348348
<Grid item md={6}>
349-
<EntityHasResourcesCard variant="gridItem" />
349+
<EntityHasResourcesCard />
350350
</Grid>
351351
</Grid>
352352
</EntityLayout.Route>
353353
<EntityLayout.Route path="/diagram" title="Diagram">
354354
<EntityCatalogGraphCard
355-
variant="gridItem"
356355
direction={Direction.TOP_BOTTOM}
357356
title="System Diagram"
358357
height={700}
@@ -378,13 +377,13 @@ const domainPage = (
378377
<Grid container spacing={3} alignItems="stretch">
379378
{entityWarningContent}
380379
<Grid item md={6}>
381-
<EntityAboutCard variant="gridItem" />
380+
<EntityAboutCard />
382381
</Grid>
383382
<Grid item md={6} xs={12}>
384-
<EntityCatalogGraphCard variant="gridItem" height={400} />
383+
<EntityCatalogGraphCard height={400} />
385384
</Grid>
386385
<Grid item md={6}>
387-
<EntityHasSystemsCard variant="gridItem" />
386+
<EntityHasSystemsCard />
388387
</Grid>
389388
</Grid>
390389
</EntityLayout.Route>

0 commit comments

Comments
 (0)