Skip to content

Commit 4526035

Browse files
chore(adoption-insights): version:bump to v1.49.3 (#2753)
* chore(adoption-insights): version:bump to v1.49.3 * fix publish check * fix publich check
1 parent 06c72e9 commit 4526035

File tree

15 files changed

+4236
-3691
lines changed

15 files changed

+4236
-3691
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights': minor
3+
'@red-hat-developer-hub/backstage-plugin-adoption-insights-backend': minor
4+
'@red-hat-developer-hub/backstage-plugin-adoption-insights-common': minor
5+
'@red-hat-developer-hub/backstage-plugin-adoption-insights': minor
6+
---
7+
8+
Backstage version bump to v1.49.3
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/adoption-insights/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,17 @@
4444
"directory": "workspaces/adoption-insights"
4545
},
4646
"devDependencies": {
47-
"@backstage/cli": "^0.35.3",
48-
"@backstage/e2e-test-utils": "^0.1.1",
49-
"@backstage/repo-tools": "^0.16.3",
47+
"@backstage/cli": "^0.36.0",
48+
"@backstage/cli-defaults": "^0.1.0",
49+
"@backstage/e2e-test-utils": "^0.1.2",
50+
"@backstage/repo-tools": "^0.17.0",
5051
"@changesets/cli": "^2.27.1",
5152
"@playwright/test": "1.58.2",
5253
"@spotify/prettier-config": "^15.0.0",
5354
"knip": "^5.27.4",
5455
"node-gyp": "^9.0.0",
5556
"prettier": "^2.3.2",
56-
"typescript": "~5.3.0"
57+
"typescript": "~5.8.0"
5758
},
5859
"resolutions": {
5960
"@types/react": "^18",

workspaces/adoption-insights/packages/app-legacy/package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@
1919
"lint": "backstage-cli package lint"
2020
},
2121
"dependencies": {
22-
"@backstage/app-defaults": "^1.7.4",
23-
"@backstage/catalog-model": "^1.7.6",
24-
"@backstage/cli": "^0.35.3",
25-
"@backstage/core-app-api": "^1.19.4",
26-
"@backstage/core-components": "^0.18.6",
27-
"@backstage/core-plugin-api": "^1.12.2",
28-
"@backstage/integration-react": "^1.2.14",
29-
"@backstage/plugin-api-docs": "^0.13.3",
30-
"@backstage/plugin-catalog": "^1.32.2",
31-
"@backstage/plugin-catalog-common": "^1.1.7",
32-
"@backstage/plugin-catalog-graph": "^0.5.6",
33-
"@backstage/plugin-catalog-import": "^0.13.9",
34-
"@backstage/plugin-catalog-react": "^1.21.6",
35-
"@backstage/plugin-kubernetes": "^0.12.15",
36-
"@backstage/plugin-org": "^0.6.48",
37-
"@backstage/plugin-permission-react": "^0.4.39",
38-
"@backstage/plugin-scaffolder": "^1.35.2",
39-
"@backstage/plugin-search": "^1.5.3",
40-
"@backstage/plugin-search-react": "^1.10.2",
41-
"@backstage/plugin-techdocs": "^1.16.2",
42-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.32",
43-
"@backstage/plugin-techdocs-react": "^1.3.7",
44-
"@backstage/plugin-user-settings": "^0.8.31",
45-
"@backstage/theme": "^0.7.1",
46-
"@backstage/ui": "^0.11.2",
22+
"@backstage/app-defaults": "^1.7.6",
23+
"@backstage/catalog-model": "^1.7.7",
24+
"@backstage/cli": "^0.36.0",
25+
"@backstage/core-app-api": "^1.19.6",
26+
"@backstage/core-components": "^0.18.8",
27+
"@backstage/core-plugin-api": "^1.12.4",
28+
"@backstage/integration-react": "^1.2.16",
29+
"@backstage/plugin-api-docs": "^0.13.5",
30+
"@backstage/plugin-catalog": "^2.0.1",
31+
"@backstage/plugin-catalog-common": "^1.1.8",
32+
"@backstage/plugin-catalog-graph": "^0.6.0",
33+
"@backstage/plugin-catalog-import": "^0.13.11",
34+
"@backstage/plugin-catalog-react": "^2.1.1",
35+
"@backstage/plugin-kubernetes": "^0.12.17",
36+
"@backstage/plugin-org": "^0.7.0",
37+
"@backstage/plugin-permission-react": "^0.4.41",
38+
"@backstage/plugin-scaffolder": "^1.36.1",
39+
"@backstage/plugin-search": "^1.7.0",
40+
"@backstage/plugin-search-react": "^1.11.0",
41+
"@backstage/plugin-techdocs": "^1.17.2",
42+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
43+
"@backstage/plugin-techdocs-react": "^1.3.9",
44+
"@backstage/plugin-user-settings": "^0.9.1",
45+
"@backstage/theme": "^0.7.2",
46+
"@backstage/ui": "^0.13.2",
4747
"@material-ui/core": "^4.12.2",
4848
"@material-ui/icons": "^4.9.1",
4949
"@mui/icons-material": "5.18.0",
@@ -56,7 +56,7 @@
5656
},
5757
"devDependencies": {
5858
"@axe-core/playwright": "^4.10.0",
59-
"@backstage/test-utils": "^1.7.14",
59+
"@backstage/test-utils": "^1.7.16",
6060
"@playwright/test": "1.58.2",
6161
"@testing-library/dom": "^9.0.0",
6262
"@testing-library/jest-dom": "^6.0.0",

workspaces/adoption-insights/packages/app-legacy/src/components/catalog/EntityPage.tsx

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ const overviewContent = (
144144
<Grid container spacing={3} alignItems="stretch">
145145
{entityWarningContent}
146146
<Grid item md={6}>
147-
<EntityAboutCard variant="gridItem" />
147+
<EntityAboutCard />
148148
</Grid>
149149
<Grid item md={6} xs={12}>
150-
<EntityCatalogGraphCard variant="gridItem" height={400} />
150+
<EntityCatalogGraphCard height={400} />
151151
</Grid>
152152

153153
<Grid item md={4} xs={12}>
154154
<EntityLinksCard />
155155
</Grid>
156156
<Grid item md={8} xs={12}>
157-
<EntityHasSubcomponentsCard variant="gridItem" />
157+
<EntityHasSubcomponentsCard />
158158
</Grid>
159159
</Grid>
160160
);
@@ -191,10 +191,10 @@ const serviceEntityPage = (
191191
<EntityLayout.Route path="/dependencies" title="Dependencies">
192192
<Grid container spacing={3} alignItems="stretch">
193193
<Grid item md={6}>
194-
<EntityDependsOnComponentsCard variant="gridItem" />
194+
<EntityDependsOnComponentsCard />
195195
</Grid>
196196
<Grid item md={6}>
197-
<EntityDependsOnResourcesCard variant="gridItem" />
197+
<EntityDependsOnResourcesCard />
198198
</Grid>
199199
</Grid>
200200
</EntityLayout.Route>
@@ -226,10 +226,10 @@ const websiteEntityPage = (
226226
<EntityLayout.Route path="/dependencies" title="Dependencies">
227227
<Grid container spacing={3} alignItems="stretch">
228228
<Grid item md={6}>
229-
<EntityDependsOnComponentsCard variant="gridItem" />
229+
<EntityDependsOnComponentsCard />
230230
</Grid>
231231
<Grid item md={6}>
232-
<EntityDependsOnResourcesCard variant="gridItem" />
232+
<EntityDependsOnResourcesCard />
233233
</Grid>
234234
</Grid>
235235
</EntityLayout.Route>
@@ -282,7 +282,7 @@ const apiPage = (
282282
<EntityAboutCard />
283283
</Grid>
284284
<Grid item md={6} xs={12}>
285-
<EntityCatalogGraphCard variant="gridItem" height={400} />
285+
<EntityCatalogGraphCard height={400} />
286286
</Grid>
287287
<Grid item md={4} xs={12}>
288288
<EntityLinksCard />
@@ -314,10 +314,10 @@ const userPage = (
314314
<Grid container spacing={3}>
315315
{entityWarningContent}
316316
<Grid item xs={12} md={6}>
317-
<EntityUserProfileCard variant="gridItem" />
317+
<EntityUserProfileCard />
318318
</Grid>
319319
<Grid item xs={12} md={6}>
320-
<EntityOwnershipCard variant="gridItem" />
320+
<EntityOwnershipCard />
321321
</Grid>
322322
</Grid>
323323
</EntityLayout.Route>
@@ -330,10 +330,10 @@ const groupPage = (
330330
<Grid container spacing={3}>
331331
{entityWarningContent}
332332
<Grid item xs={12} md={6}>
333-
<EntityGroupProfileCard variant="gridItem" />
333+
<EntityGroupProfileCard />
334334
</Grid>
335335
<Grid item xs={12} md={6}>
336-
<EntityOwnershipCard variant="gridItem" />
336+
<EntityOwnershipCard />
337337
</Grid>
338338
<Grid item xs={12} md={6}>
339339
<EntityMembersListCard />
@@ -352,28 +352,27 @@ const systemPage = (
352352
<Grid container spacing={3} alignItems="stretch">
353353
{entityWarningContent}
354354
<Grid item md={6}>
355-
<EntityAboutCard variant="gridItem" />
355+
<EntityAboutCard />
356356
</Grid>
357357
<Grid item md={6} xs={12}>
358-
<EntityCatalogGraphCard variant="gridItem" height={400} />
358+
<EntityCatalogGraphCard height={400} />
359359
</Grid>
360360
<Grid item md={4} xs={12}>
361361
<EntityLinksCard />
362362
</Grid>
363363
<Grid item md={8}>
364-
<EntityHasComponentsCard variant="gridItem" />
364+
<EntityHasComponentsCard />
365365
</Grid>
366366
<Grid item md={6}>
367-
<EntityHasApisCard variant="gridItem" />
367+
<EntityHasApisCard />
368368
</Grid>
369369
<Grid item md={6}>
370-
<EntityHasResourcesCard variant="gridItem" />
370+
<EntityHasResourcesCard />
371371
</Grid>
372372
</Grid>
373373
</EntityLayout.Route>
374374
<EntityLayout.Route path="/diagram" title="Diagram">
375375
<EntityCatalogGraphCard
376-
variant="gridItem"
377376
direction={Direction.TOP_BOTTOM}
378377
title="System Diagram"
379378
height={700}
@@ -399,13 +398,13 @@ const domainPage = (
399398
<Grid container spacing={3} alignItems="stretch">
400399
{entityWarningContent}
401400
<Grid item md={6}>
402-
<EntityAboutCard variant="gridItem" />
401+
<EntityAboutCard />
403402
</Grid>
404403
<Grid item md={6} xs={12}>
405-
<EntityCatalogGraphCard variant="gridItem" height={400} />
404+
<EntityCatalogGraphCard height={400} />
406405
</Grid>
407406
<Grid item md={6}>
408-
<EntityHasSystemsCard variant="gridItem" />
407+
<EntityHasSystemsCard />
409408
</Grid>
410409
</Grid>
411410
</EntityLayout.Route>

workspaces/adoption-insights/packages/app/package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
"lint": "backstage-cli package lint"
2020
},
2121
"dependencies": {
22-
"@backstage/cli": "^0.35.3",
23-
"@backstage/core-compat-api": "^0.5.6",
24-
"@backstage/core-components": "^0.18.6",
25-
"@backstage/core-plugin-api": "^1.12.2",
26-
"@backstage/frontend-defaults": "^0.3.5",
27-
"@backstage/frontend-plugin-api": "^0.13.4",
28-
"@backstage/integration-react": "^1.2.14",
29-
"@backstage/plugin-app-visualizer": "^0.1.27",
30-
"@backstage/plugin-catalog": "^1.32.2",
31-
"@backstage/plugin-search": "^1.5.3",
32-
"@backstage/plugin-user-settings": "^0.8.31",
33-
"@backstage/ui": "^0.11.2",
22+
"@backstage/cli": "^0.36.0",
23+
"@backstage/core-components": "^0.18.8",
24+
"@backstage/core-plugin-api": "^1.12.4",
25+
"@backstage/frontend-defaults": "^0.5.0",
26+
"@backstage/frontend-plugin-api": "^0.15.1",
27+
"@backstage/integration-react": "^1.2.16",
28+
"@backstage/plugin-app-react": "^0.2.1",
29+
"@backstage/plugin-app-visualizer": "^0.2.1",
30+
"@backstage/plugin-catalog": "^2.0.1",
31+
"@backstage/plugin-search": "^1.7.0",
32+
"@backstage/plugin-user-settings": "^0.9.1",
33+
"@backstage/ui": "^0.13.2",
3434
"@material-ui/core": "^4.12.2",
3535
"@material-ui/icons": "^4.9.1",
3636
"@red-hat-developer-hub/backstage-plugin-adoption-insights": "workspace:^",
@@ -41,7 +41,7 @@
4141
"react-router-dom": "^6.3.0"
4242
},
4343
"devDependencies": {
44-
"@backstage/frontend-test-utils": "^0.4.3",
44+
"@backstage/frontend-test-utils": "^0.5.1",
4545
"@playwright/test": "1.58.2",
4646
"@testing-library/dom": "^9.0.0",
4747
"@testing-library/jest-dom": "^6.0.0",

workspaces/adoption-insights/packages/app/src/modules/nav/Sidebar.tsx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,35 @@
1414
* limitations under the License.
1515
*/
1616
import {
17+
Sidebar,
1718
SidebarDivider,
1819
SidebarGroup,
1920
SidebarItem,
2021
SidebarScrollWrapper,
2122
SidebarSpace,
2223
} from '@backstage/core-components';
23-
import { compatWrapper } from '@backstage/core-compat-api';
24-
import { Sidebar } from '@backstage/core-components';
25-
import { NavContentBlueprint } from '@backstage/frontend-plugin-api';
24+
import { NavContentBlueprint } from '@backstage/plugin-app-react';
2625
import { SidebarLogo } from './SidebarLogo';
2726
import MenuIcon from '@material-ui/icons/Menu';
2827

2928
export const SidebarContent = NavContentBlueprint.make({
3029
params: {
31-
component: ({ items }) =>
32-
compatWrapper(
30+
component: ({ navItems }) => {
31+
const nav = navItems.withComponent(item => (
32+
<SidebarItem icon={() => item.icon} to={item.href} text={item.title} />
33+
));
34+
return (
3335
<Sidebar>
3436
<SidebarLogo />
3537
<SidebarDivider />
3638
<SidebarGroup label="Menu" icon={<MenuIcon />}>
3739
<SidebarScrollWrapper>
38-
{items.map((item, index) => (
39-
<SidebarItem {...item} key={index} />
40-
))}
40+
{nav.rest({ sortBy: 'title' })}
4141
</SidebarScrollWrapper>
4242
</SidebarGroup>
4343
<SidebarSpace />
44-
</Sidebar>,
45-
),
44+
</Sidebar>
45+
);
46+
},
4647
},
4748
});

workspaces/adoption-insights/packages/backend/package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,31 @@
2121
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
2222
},
2323
"dependencies": {
24-
"@backstage/backend-defaults": "^0.15.1",
25-
"@backstage/backend-plugin-api": "^1.6.2",
24+
"@backstage/backend-defaults": "^0.16.0",
25+
"@backstage/backend-plugin-api": "^1.8.0",
2626
"@backstage/config": "^1.3.6",
27-
"@backstage/plugin-app-backend": "^0.5.10",
28-
"@backstage/plugin-auth-backend": "^0.26.0",
29-
"@backstage/plugin-auth-backend-module-github-provider": "^0.4.1",
30-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.15",
31-
"@backstage/plugin-auth-node": "^0.6.12",
32-
"@backstage/plugin-catalog-backend": "^3.3.2",
33-
"@backstage/plugin-catalog-backend-module-logs": "^0.1.18",
34-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.16",
35-
"@backstage/plugin-kubernetes-backend": "^0.21.0",
36-
"@backstage/plugin-permission-backend": "^0.7.8",
37-
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.15",
38-
"@backstage/plugin-permission-common": "^0.9.5",
39-
"@backstage/plugin-permission-node": "^0.10.9",
40-
"@backstage/plugin-proxy-backend": "^0.6.9",
41-
"@backstage/plugin-scaffolder-backend": "^3.1.2",
42-
"@backstage/plugin-scaffolder-backend-module-github": "^0.9.5",
43-
"@backstage/plugin-search-backend": "^2.0.11",
44-
"@backstage/plugin-search-backend-module-catalog": "^0.3.11",
45-
"@backstage/plugin-search-backend-module-pg": "^0.5.51",
46-
"@backstage/plugin-search-backend-module-techdocs": "^0.4.10",
47-
"@backstage/plugin-search-backend-node": "^1.4.0",
48-
"@backstage/plugin-techdocs-backend": "^2.1.4",
27+
"@backstage/plugin-app-backend": "^0.5.12",
28+
"@backstage/plugin-auth-backend": "^0.27.3",
29+
"@backstage/plugin-auth-backend-module-github-provider": "^0.5.1",
30+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.17",
31+
"@backstage/plugin-auth-node": "^0.6.14",
32+
"@backstage/plugin-catalog-backend": "^3.5.0",
33+
"@backstage/plugin-catalog-backend-module-logs": "^0.1.20",
34+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.18",
35+
"@backstage/plugin-kubernetes-backend": "^0.21.2",
36+
"@backstage/plugin-permission-backend": "^0.7.10",
37+
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.17",
38+
"@backstage/plugin-permission-common": "^0.9.7",
39+
"@backstage/plugin-permission-node": "^0.10.11",
40+
"@backstage/plugin-proxy-backend": "^0.6.11",
41+
"@backstage/plugin-scaffolder-backend": "^3.2.0",
42+
"@backstage/plugin-scaffolder-backend-module-github": "^0.9.7",
43+
"@backstage/plugin-search-backend": "^2.1.0",
44+
"@backstage/plugin-search-backend-module-catalog": "^0.3.13",
45+
"@backstage/plugin-search-backend-module-pg": "^0.5.53",
46+
"@backstage/plugin-search-backend-module-techdocs": "^0.4.12",
47+
"@backstage/plugin-search-backend-node": "^1.4.2",
48+
"@backstage/plugin-techdocs-backend": "^2.1.6",
4949
"@red-hat-developer-hub/backstage-plugin-adoption-insights-backend": "workspace:^",
5050
"@red-hat-developer-hub/backstage-plugin-adoption-insights-common": "workspace:^",
5151
"app": "link:../app",
@@ -54,7 +54,7 @@
5454
"pg": "^8.11.3"
5555
},
5656
"devDependencies": {
57-
"@backstage/cli": "^0.35.3"
57+
"@backstage/cli": "^0.36.0"
5858
},
5959
"files": [
6060
"dist"

0 commit comments

Comments
 (0)