Skip to content

Commit 5adec44

Browse files
chore(mta): bump Backstage dependencies to 1.49.4 for RHDH 1.10 (#8964)
* chore(mta): bump Backstage dependencies to 1.49.4 Update MTA workspace from Backstage 1.42.5 to 1.49.4 for RHDH 1.10 compatibility. Updated packages across all 4 plugins: - mta-frontend - mta-backend - catalog-backend-module-mta-entity-provider - scaffolder-backend-module-mta Key version bumps: - @backstage/cli: ^0.34.1 -> ^0.36.0 - @backstage/backend-plugin-api: ^1.4.2 -> ^1.8.0 - @backstage/core-components: ^0.17.5 -> ^0.18.8 - @backstage/plugin-catalog-react: ^1.20.1 -> ^2.1.1 - @backstage/plugin-catalog-node: ^1.18.0 -> ^2.1.0 - @backstage/theme: ^0.6.8 -> ^0.7.2 - typescript: ~5.3.0 -> ~5.7.0 - Plus all other @backstage/* deps updated to 1.49.4 release versions Signed-off-by: ibolton336 <ibolton@redhat.com> * chore: add changeset and update yarn.lock Signed-off-by: ibolton336 <ibolton@redhat.com> * fix: update imports for catalog-node/scaffolder-node 2.x, add skipLibCheck, dedupe yarn.lock - Import catalogProcessingExtensionPoint from @backstage/plugin-catalog-node (moved from /alpha in 2.0) - Import scaffolderActionsExtensionPoint from @backstage/plugin-scaffolder-node (moved from /alpha) - Add skipLibCheck: true to tsconfig to resolve @mui/material type conflict with @backstage/theme 0.7.x - Deduplicate yarn.lock Signed-off-by: ibolton336 <ibolton@redhat.com> * fix: resolve @mui/material type conflict with skipLibCheck true The TS2320 error is caused by duplicate copies of @backstage/core-components in transitive deps (plugin-tech-radar, plugin-catalog-graph) having different FiltersContainerClassKey type definitions. This is not an MTA code issue. Changed tsc:full to use --skipLibCheck true (matching what the acr workspace and Backstage 1.49.4 itself use). Removed unnecessary @mui/material and @backstage/core-components resolutions. Signed-off-by: ibolton336 <ibolton@redhat.com> * chore: regenerate API reports for updated Backstage deps Signed-off-by: ibolton336 <ibolton@redhat.com> * chore: bump @backstage/* deps in app and backend packages, add cli-defaults The app and backend example packages were still on Backstage 1.42.5 deps, causing duplicate transitive dependencies and the @protobufjs/inquire build error (dynamic require treated as error when CI=true). - Bumped all @backstage/* deps in packages/app/package.json - Bumped all @backstage/* deps in packages/backend/package.json - Added @backstage/cli-defaults ^0.1.0 to root devDependencies - Regenerated yarn.lock Signed-off-by: ibolton336 <ibolton@redhat.com> * chore: fix tsc errors Signed-off-by: Hope Hadfield <hhadfiel@redhat.com> * fix: pin @asyncapi/protobuf-schema-parser to 3.4.0 Version 3.5.1 pulls in a newer protobufjs that uses dynamic require() in @protobufjs/inquire, which webpack treats as an error when CI=true. Pin to 3.4.0 (same version used by other passing workspaces like 3scale). Signed-off-by: ibolton336 <ibolton@redhat.com> * fix: pin protobufjs to 7.5.4 and @protobufjs/inquire to 1.1.0 @protobufjs/inquire 1.1.1 introduced a dynamic require() that webpack treats as error in CI. Pin to 1.1.0 (same versions used by the passing 3scale workspace on Backstage 1.49.2). Signed-off-by: ibolton336 <ibolton@redhat.com> * fix: update mta-frontend peerDependencies to include React 18 Backstage 1.49.x requires React 18. Update the peerDependencies range to include ^18.0.0 for consistency with the workspace app and other plugins in this repo. Signed-off-by: ibolton336 <ibolton@redhat.com> --------- Signed-off-by: ibolton336 <ibolton@redhat.com> Signed-off-by: Hope Hadfield <hhadfiel@redhat.com> Co-authored-by: Hope Hadfield <hhadfiel@redhat.com>
1 parent df45a21 commit 5adec44

16 files changed

Lines changed: 7512 additions & 6029 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@backstage-community/backstage-plugin-mta-frontend': patch
3+
'@backstage-community/backstage-plugin-mta-backend': patch
4+
'@backstage-community/backstage-plugin-catalog-backend-module-mta-entity-provider': patch
5+
'@backstage-community/backstage-plugin-scaffolder-backend-module-mta': patch
6+
---
7+
8+
Bumped Backstage dependencies to 1.49.4 for RHDH 1.10 compatibility.

workspaces/mta/backstage.json

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

workspaces/mta/package.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"private": true,
55
"engines": {
6-
"node": "20 || 22"
6+
"node": "22 || 24"
77
},
88
"scripts": {
99
"dev": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
@@ -16,7 +16,7 @@
1616
"build:knip-reports": "backstage-repo-tools knip-reports",
1717
"build-image": "yarn workspace backend build-image",
1818
"tsc": "tsc",
19-
"tsc:full": "tsc --skipLibCheck false --incremental false",
19+
"tsc:full": "tsc --skipLibCheck true --incremental false",
2020
"clean": "backstage-cli repo clean",
2121
"test": "backstage-cli repo test",
2222
"test:all": "backstage-cli repo test --coverage",
@@ -41,19 +41,23 @@
4141
"directory": "workspaces/mta"
4242
},
4343
"devDependencies": {
44-
"@backstage/cli": "^0.34.1",
45-
"@backstage/e2e-test-utils": "^0.1.1",
46-
"@backstage/repo-tools": "^0.15.1",
44+
"@backstage/cli": "^0.36.0",
45+
"@backstage/cli-defaults": "^0.1.0",
46+
"@backstage/e2e-test-utils": "^0.1.2",
47+
"@backstage/repo-tools": "^0.17.0",
4748
"@changesets/cli": "^2.27.7",
4849
"@playwright/test": "^1.32.3",
4950
"knip": "^5.27.4",
5051
"node-gyp": "^9.0.0",
5152
"prettier": "^3.3.3",
52-
"typescript": "~5.3.0"
53+
"typescript": "~5.7.0"
5354
},
5455
"resolutions": {
5556
"@types/react": "^18",
56-
"@types/react-dom": "^18"
57+
"@types/react-dom": "^18",
58+
"@asyncapi/protobuf-schema-parser": "3.4.0",
59+
"protobufjs": "7.5.4",
60+
"@protobufjs/inquire": "1.1.0"
5761
},
5862
"prettier": "@backstage/cli/config/prettier",
5963
"lint-staged": {

workspaces/mta/packages/app/package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@
2020
},
2121
"dependencies": {
2222
"@backstage-community/backstage-plugin-mta-frontend": "workspace:^",
23-
"@backstage/app-defaults": "^1.6.5",
24-
"@backstage/catalog-model": "^1.7.5",
25-
"@backstage/cli": "^0.34.1",
26-
"@backstage/core-app-api": "^1.18.0",
27-
"@backstage/core-components": "^0.17.5",
28-
"@backstage/core-plugin-api": "^1.10.9",
29-
"@backstage/integration-react": "^1.2.9",
30-
"@backstage/plugin-api-docs": "^0.12.10",
31-
"@backstage/plugin-catalog": "^1.31.2",
32-
"@backstage/plugin-catalog-common": "^1.1.5",
33-
"@backstage/plugin-catalog-graph": "^0.4.22",
34-
"@backstage/plugin-catalog-import": "^0.13.4",
35-
"@backstage/plugin-catalog-react": "^1.20.1",
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",
3636
"@backstage/plugin-github-actions": "^0.6.15",
37-
"@backstage/plugin-org": "^0.6.43",
38-
"@backstage/plugin-permission-react": "^0.4.36",
39-
"@backstage/plugin-scaffolder": "^1.34.0",
40-
"@backstage/plugin-search": "^1.4.29",
41-
"@backstage/plugin-search-react": "^1.9.3",
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",
4242
"@backstage/plugin-tech-radar": "^0.7.3",
43-
"@backstage/plugin-techdocs": "^1.14.1",
44-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.27",
45-
"@backstage/plugin-techdocs-react": "^1.3.2",
46-
"@backstage/plugin-user-settings": "^0.8.25",
47-
"@backstage/theme": "^0.6.8",
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",
4848
"@material-ui/core": "^4.12.2",
4949
"@material-ui/icons": "^4.9.1",
5050
"history": "^5.0.0",
@@ -55,7 +55,7 @@
5555
"react-use": "^17.2.4"
5656
},
5757
"devDependencies": {
58-
"@backstage/test-utils": "^1.7.11",
58+
"@backstage/test-utils": "^1.7.16",
5959
"@playwright/test": "^1.32.3",
6060
"@testing-library/dom": "^9.0.0",
6161
"@testing-library/jest-dom": "^6.0.0",

workspaces/mta/packages/app/src/components/catalog/EntityPage.tsx

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,17 @@ const overviewContent = (
126126
<Grid container spacing={3} alignItems="stretch">
127127
{entityWarningContent}
128128
<Grid item md={6}>
129-
<EntityAboutCard variant="gridItem" />
129+
<EntityAboutCard />
130130
</Grid>
131131
<Grid item md={6} xs={12}>
132-
<EntityCatalogGraphCard variant="gridItem" height={400} />
132+
<EntityCatalogGraphCard height={400} />
133133
</Grid>
134134

135135
<Grid item md={4} xs={12}>
136136
<EntityLinksCard />
137137
</Grid>
138138
<Grid item md={8} xs={12}>
139-
<EntityHasSubcomponentsCard variant="gridItem" />
139+
<EntityHasSubcomponentsCard />
140140
</Grid>
141141
</Grid>
142142
);
@@ -165,10 +165,10 @@ const serviceEntityPage = (
165165
<EntityLayout.Route path="/dependencies" title="Dependencies">
166166
<Grid container spacing={3} alignItems="stretch">
167167
<Grid item md={6}>
168-
<EntityDependsOnComponentsCard variant="gridItem" />
168+
<EntityDependsOnComponentsCard />
169169
</Grid>
170170
<Grid item md={6}>
171-
<EntityDependsOnResourcesCard variant="gridItem" />
171+
<EntityDependsOnResourcesCard />
172172
</Grid>
173173
</Grid>
174174
</EntityLayout.Route>
@@ -195,10 +195,10 @@ const websiteEntityPage = (
195195
<EntityLayout.Route path="/dependencies" title="Dependencies">
196196
<Grid container spacing={3} alignItems="stretch">
197197
<Grid item md={6}>
198-
<EntityDependsOnComponentsCard variant="gridItem" />
198+
<EntityDependsOnComponentsCard />
199199
</Grid>
200200
<Grid item md={6}>
201-
<EntityDependsOnResourcesCard variant="gridItem" />
201+
<EntityDependsOnResourcesCard />
202202
</Grid>
203203
</Grid>
204204
</EntityLayout.Route>
@@ -254,7 +254,7 @@ const apiPage = (
254254
<EntityAboutCard />
255255
</Grid>
256256
<Grid item md={6} xs={12}>
257-
<EntityCatalogGraphCard variant="gridItem" height={400} />
257+
<EntityCatalogGraphCard height={400} />
258258
</Grid>
259259
<Grid item md={4} xs={12}>
260260
<EntityLinksCard />
@@ -286,10 +286,10 @@ const userPage = (
286286
<Grid container spacing={3}>
287287
{entityWarningContent}
288288
<Grid item xs={12} md={6}>
289-
<EntityUserProfileCard variant="gridItem" />
289+
<EntityUserProfileCard />
290290
</Grid>
291291
<Grid item xs={12} md={6}>
292-
<EntityOwnershipCard variant="gridItem" />
292+
<EntityOwnershipCard />
293293
</Grid>
294294
</Grid>
295295
</EntityLayout.Route>
@@ -302,10 +302,10 @@ const groupPage = (
302302
<Grid container spacing={3}>
303303
{entityWarningContent}
304304
<Grid item xs={12} md={6}>
305-
<EntityGroupProfileCard variant="gridItem" />
305+
<EntityGroupProfileCard />
306306
</Grid>
307307
<Grid item xs={12} md={6}>
308-
<EntityOwnershipCard variant="gridItem" />
308+
<EntityOwnershipCard />
309309
</Grid>
310310
<Grid item xs={12} md={6}>
311311
<EntityMembersListCard />
@@ -324,28 +324,27 @@ const systemPage = (
324324
<Grid container spacing={3} alignItems="stretch">
325325
{entityWarningContent}
326326
<Grid item md={6}>
327-
<EntityAboutCard variant="gridItem" />
327+
<EntityAboutCard />
328328
</Grid>
329329
<Grid item md={6} xs={12}>
330-
<EntityCatalogGraphCard variant="gridItem" height={400} />
330+
<EntityCatalogGraphCard height={400} />
331331
</Grid>
332332
<Grid item md={4} xs={12}>
333333
<EntityLinksCard />
334334
</Grid>
335335
<Grid item md={8}>
336-
<EntityHasComponentsCard variant="gridItem" />
336+
<EntityHasComponentsCard />
337337
</Grid>
338338
<Grid item md={6}>
339-
<EntityHasApisCard variant="gridItem" />
339+
<EntityHasApisCard />
340340
</Grid>
341341
<Grid item md={6}>
342-
<EntityHasResourcesCard variant="gridItem" />
342+
<EntityHasResourcesCard />
343343
</Grid>
344344
</Grid>
345345
</EntityLayout.Route>
346346
<EntityLayout.Route path="/diagram" title="Diagram">
347347
<EntityCatalogGraphCard
348-
variant="gridItem"
349348
direction={Direction.TOP_BOTTOM}
350349
title="System Diagram"
351350
height={700}
@@ -371,13 +370,13 @@ const domainPage = (
371370
<Grid container spacing={3} alignItems="stretch">
372371
{entityWarningContent}
373372
<Grid item md={6}>
374-
<EntityAboutCard variant="gridItem" />
373+
<EntityAboutCard />
375374
</Grid>
376375
<Grid item md={6} xs={12}>
377-
<EntityCatalogGraphCard variant="gridItem" height={400} />
376+
<EntityCatalogGraphCard height={400} />
378377
</Grid>
379378
<Grid item md={6}>
380-
<EntityHasSystemsCard variant="gridItem" />
379+
<EntityHasSystemsCard />
381380
</Grid>
382381
</Grid>
383382
</EntityLayout.Route>

workspaces/mta/packages/backend/package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,35 @@
2424
"@backstage-community/backstage-plugin-catalog-backend-module-mta-entity-provider": "workspace:^",
2525
"@backstage-community/backstage-plugin-mta-backend": "workspace:^",
2626
"@backstage-community/backstage-plugin-scaffolder-backend-module-mta": "workspace:^",
27-
"@backstage/backend-defaults": "^0.12.0",
28-
"@backstage/backend-dynamic-feature-service": "^0.7.3",
29-
"@backstage/config": "^1.3.3",
30-
"@backstage/plugin-app-backend": "^0.5.5",
31-
"@backstage/plugin-auth-backend": "^0.25.3",
32-
"@backstage/plugin-auth-backend-module-github-provider": "^0.3.6",
33-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.11",
34-
"@backstage/plugin-auth-node": "^0.6.6",
35-
"@backstage/plugin-catalog-backend": "^3.0.1",
36-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.11",
37-
"@backstage/plugin-permission-backend": "^0.7.3",
38-
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.11",
39-
"@backstage/plugin-permission-common": "^0.9.1",
40-
"@backstage/plugin-permission-node": "^0.10.3",
41-
"@backstage/plugin-proxy-backend": "^0.6.5",
42-
"@backstage/plugin-scaffolder-backend": "^2.2.0",
43-
"@backstage/plugin-search-backend": "^2.0.5",
44-
"@backstage/plugin-search-backend-module-catalog": "^0.3.7",
45-
"@backstage/plugin-search-backend-module-techdocs": "^0.4.5",
46-
"@backstage/plugin-search-backend-node": "^1.3.14",
47-
"@backstage/plugin-techdocs-backend": "^2.0.5",
27+
"@backstage/backend-defaults": "^0.16.0",
28+
"@backstage/backend-dynamic-feature-service": "^0.8.0",
29+
"@backstage/config": "^1.3.6",
30+
"@backstage/plugin-app-backend": "^0.5.12",
31+
"@backstage/plugin-auth-backend": "^0.27.3",
32+
"@backstage/plugin-auth-backend-module-github-provider": "^0.5.1",
33+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.17",
34+
"@backstage/plugin-auth-node": "^0.6.14",
35+
"@backstage/plugin-catalog-backend": "^3.5.0",
36+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.18",
37+
"@backstage/plugin-permission-backend": "^0.7.10",
38+
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.18",
39+
"@backstage/plugin-permission-common": "^0.9.7",
40+
"@backstage/plugin-permission-node": "^0.10.11",
41+
"@backstage/plugin-proxy-backend": "^0.6.11",
42+
"@backstage/plugin-scaffolder-backend": "^3.3.0",
43+
"@backstage/plugin-search-backend": "^2.1.0",
44+
"@backstage/plugin-search-backend-module-catalog": "^0.3.13",
45+
"@backstage/plugin-search-backend-module-techdocs": "^0.4.12",
46+
"@backstage/plugin-search-backend-node": "^1.4.2",
47+
"@backstage/plugin-techdocs-backend": "^2.1.6",
4848
"app": "link:../app",
49-
"better-sqlite3": "^9.0.0",
49+
"better-sqlite3": "^12.0.0",
5050
"node-gyp": "^9.0.0",
5151
"pg": "^8.11.3",
5252
"winston": "^3.2.1"
5353
},
5454
"devDependencies": {
55-
"@backstage/cli": "^0.34.1",
55+
"@backstage/cli": "^0.36.0",
5656
"@types/express": "^4.17.6",
5757
"@types/express-serve-static-core": "^5.0.0",
5858
"@types/luxon": "^3.0.0"

workspaces/mta/plugins/catalog-backend-module-mta-entity-provider/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@
3131
"tsc": "tsc"
3232
},
3333
"dependencies": {
34-
"@backstage/backend-dynamic-feature-service": "^0.7.3",
35-
"@backstage/backend-plugin-api": "^1.4.2",
36-
"@backstage/catalog-model": "^1.7.5",
37-
"@backstage/config": "^1.3.3",
38-
"@backstage/plugin-catalog-common": "^1.1.5",
39-
"@backstage/plugin-catalog-node": "^1.18.0",
34+
"@backstage/backend-dynamic-feature-service": "^0.8.0",
35+
"@backstage/backend-plugin-api": "^1.8.0",
36+
"@backstage/catalog-model": "^1.7.7",
37+
"@backstage/config": "^1.3.6",
38+
"@backstage/plugin-catalog-common": "^1.1.8",
39+
"@backstage/plugin-catalog-node": "^2.1.0",
4040
"openid-client": "^5.6.5",
4141
"winston": "^3.13.0"
4242
},
4343
"devDependencies": {
44-
"@backstage/backend-test-utils": "^1.8.0",
45-
"@backstage/cli": "^0.34.1"
44+
"@backstage/backend-test-utils": "^1.11.1",
45+
"@backstage/cli": "^0.36.0"
4646
},
4747
"files": [
4848
"dist"

workspaces/mta/plugins/catalog-backend-module-mta-entity-provider/src/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
coreServices,
33
createBackendModule,
44
} from '@backstage/backend-plugin-api';
5-
import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
5+
import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
66
import { MTAProvider } from './provider/MTAEntityProvider';
77
/**
88
* A backend module that integrates with the catalog to provide MTA entities.

workspaces/mta/plugins/mta-backend/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
"tsc": "tsc"
3333
},
3434
"dependencies": {
35-
"@backstage/backend-dynamic-feature-service": "^0.7.3",
36-
"@backstage/backend-plugin-api": "^1.4.2",
37-
"@backstage/config": "^1.3.3",
38-
"@backstage/plugin-auth-node": "^0.6.6",
39-
"@backstage/plugin-catalog-node": "^1.18.0",
35+
"@backstage/backend-dynamic-feature-service": "^0.8.0",
36+
"@backstage/backend-plugin-api": "^1.8.0",
37+
"@backstage/config": "^1.3.6",
38+
"@backstage/plugin-auth-node": "^0.6.14",
39+
"@backstage/plugin-catalog-node": "^2.1.0",
4040
"@types/express": "*",
4141
"dotenv": "^17.0.0",
4242
"express": "^4.17.1",
@@ -49,10 +49,10 @@
4949
"yn": "^4.0.0"
5050
},
5151
"devDependencies": {
52-
"@backstage/backend-defaults": "^0.12.0",
53-
"@backstage/cli": "^0.34.1",
54-
"@backstage/plugin-auth-backend": "^0.25.3",
55-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.11",
52+
"@backstage/backend-defaults": "^0.16.0",
53+
"@backstage/cli": "^0.36.0",
54+
"@backstage/plugin-auth-backend": "^0.27.3",
55+
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.17",
5656
"@types/supertest": "^7.0.0",
5757
"msw": "^1.3.3",
5858
"supertest": "^7.0.0"

0 commit comments

Comments
 (0)