Skip to content

Commit 2820dc2

Browse files
ciiayciiay
authored
chore(extensions): update backstage version to 1.49.2 (#2672)
* chore(extensions): update backstage version to 1.49.2 Signed-off-by: Yi Cai <yicai@redhat.com> * resolved tsc erros Signed-off-by: Yi Cai <yicai@redhat.com> * fixed yarn build:api-reports issue Signed-off-by: Yi Cai <yicai@redhat.com> * fix failed e2e tests Signed-off-by: Yi Cai <yicai@redhat.com> * resolved a review comment Signed-off-by: Yi Cai <yicai@redhat.com> * addressed review comments Signed-off-by: Yi Cai <yicai@redhat.com> * reverted extra type changes Signed-off-by: Yi Cai <yicai@redhat.com> --------- Signed-off-by: Yi Cai <yicai@redhat.com>
1 parent 82a9ee8 commit 2820dc2

52 files changed

Lines changed: 4539 additions & 6981 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎workspaces/extensions/.changeset/version-bump-1-49-2.md‎

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

‎workspaces/extensions/backstage.json‎

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

‎workspaces/extensions/e2e-tests/extensions.test.ts‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ const LOCALE_DISPLAY_NAMES: Record<string, string> = {
3232
ja: '日本語',
3333
};
3434

35+
function escapeRegExp(value: string): string {
36+
return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
37+
}
38+
3539
/**
3640
* Get the display name for a locale code
3741
*/
@@ -44,18 +48,26 @@ test.describe('Admin > Extensions', () => {
4448
let extensions: Extensions;
4549
let extensionHelper: ExtensionHelper;
4650
let translations: ExtensionsMessages;
47-
let sharedPage: Page;
48-
let sharedContext: BrowserContext;
51+
let sharedPage!: Page;
52+
let sharedContext!: BrowserContext;
4953

5054
async function switchToLocale(page: Page, locale: string): Promise<void> {
5155
const baseLocale = locale.split('-')[0];
5256
if (baseLocale === 'en') return;
5357

5458
const displayName = getLocaleDisplayName(locale);
55-
await page.getByRole('link', { name: 'Settings' }).click();
56-
await page.getByRole('button', { name: 'English' }).click();
59+
const localeDisplayPattern = new RegExp(
60+
`^(${Object.values(LOCALE_DISPLAY_NAMES).map(escapeRegExp).join('|')})$`,
61+
);
62+
63+
// Navigating directly avoids flaky duplicate "Settings" links in sidebar.
64+
await page.goto('/settings');
65+
await page
66+
.getByRole('button', { name: localeDisplayPattern })
67+
.first()
68+
.click();
5769
await page.getByRole('option', { name: displayName }).click();
58-
await page.locator('a').filter({ hasText: 'Home' }).click();
70+
await page.goto('/');
5971
}
6072

6173
test.beforeAll(async ({ browser }) => {
@@ -74,7 +86,9 @@ test.describe('Admin > Extensions', () => {
7486
});
7587

7688
test.afterAll(async () => {
77-
await sharedContext.close();
89+
if (sharedContext) {
90+
await sharedContext.close();
91+
}
7892
});
7993

8094
test.describe('Extensions > Catalog', () => {

‎workspaces/extensions/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"tsc": "tsc",
1414
"tsc:full": "tsc --skipLibCheck true --incremental false",
1515
"build:all": "backstage-cli repo build --all",
16-
"build:api-reports": "yarn build:api-reports:only --tsc",
16+
"build:api-reports": "yarn tsc:full && yarn build:api-reports:only",
1717
"build:api-reports:only": "backstage-repo-tools api-reports -o ae-wrong-input-file-type,ae-undocumented --validate-release-tags",
1818
"build-image": "yarn workspace backend build-image",
1919
"build:knip-reports": "backstage-repo-tools knip-reports",
@@ -44,17 +44,17 @@
4444
"directory": "workspaces/extensions"
4545
},
4646
"devDependencies": {
47-
"@backstage/cli": "^0.34.5",
48-
"@backstage/e2e-test-utils": "^0.1.1",
49-
"@backstage/repo-tools": "^0.16.0",
47+
"@backstage/cli": "^0.36.0",
48+
"@backstage/e2e-test-utils": "^0.1.2",
49+
"@backstage/repo-tools": "^0.17.0",
5050
"@changesets/cli": "^2.27.1",
5151
"@playwright/test": "1.58.2",
5252
"@spotify/prettier-config": "^12.0.0",
5353
"knip": "^5.27.4",
5454
"minimatch": "3",
5555
"node-gyp": "^9.0.0",
5656
"prettier": "^3.4.2",
57-
"typescript": "~5.3.0"
57+
"typescript": "~5.8.0"
5858
},
5959
"resolutions": {
6060
"@types/react": "^18",

‎workspaces/extensions/packages/app-legacy/package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@
1919
"lint": "backstage-cli package lint"
2020
},
2121
"dependencies": {
22-
"@backstage-community/plugin-rbac": "^1.45.0",
23-
"@backstage/app-defaults": "^1.7.2",
24-
"@backstage/catalog-model": "^1.7.6",
25-
"@backstage/cli": "^0.34.5",
26-
"@backstage/core-app-api": "^1.19.2",
27-
"@backstage/core-components": "^0.18.3",
28-
"@backstage/core-plugin-api": "^1.12.0",
29-
"@backstage/integration-react": "^1.2.12",
30-
"@backstage/plugin-api-docs": "^0.13.1",
31-
"@backstage/plugin-catalog": "^1.32.0",
32-
"@backstage/plugin-catalog-common": "^1.1.7",
33-
"@backstage/plugin-catalog-graph": "^0.5.3",
34-
"@backstage/plugin-catalog-import": "^0.13.7",
35-
"@backstage/plugin-catalog-react": "^1.21.3",
36-
"@backstage/plugin-kubernetes": "^0.12.13",
37-
"@backstage/plugin-org": "^0.6.46",
38-
"@backstage/plugin-permission-react": "^0.4.38",
39-
"@backstage/plugin-scaffolder": "^1.34.3",
40-
"@backstage/plugin-search": "^1.5.0",
41-
"@backstage/plugin-search-react": "^1.10.0",
42-
"@backstage/plugin-techdocs": "^1.16.0",
43-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.30",
44-
"@backstage/plugin-techdocs-react": "^1.3.5",
45-
"@backstage/plugin-user-settings": "^0.8.29",
46-
"@backstage/theme": "^0.7.0",
47-
"@backstage/ui": "^0.9.1",
22+
"@backstage-community/plugin-rbac": "^1.52.0",
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.0",
36+
"@backstage/plugin-kubernetes": "^0.12.17",
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-techdocs": "^1.17.2",
43+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
44+
"@backstage/plugin-techdocs-react": "^1.3.9",
45+
"@backstage/plugin-user-settings": "^0.9.1",
46+
"@backstage/theme": "^0.7.2",
47+
"@backstage/ui": "^0.13.1",
4848
"@material-ui/core": "^4.12.2",
4949
"@material-ui/icons": "^4.9.1",
5050
"@red-hat-developer-hub/backstage-plugin-extensions": "workspace:^",

‎workspaces/extensions/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/extensions/packages/app/.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);

‎workspaces/extensions/packages/app/package.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@
1919
"lint": "backstage-cli package lint"
2020
},
2121
"dependencies": {
22-
"@backstage/cli": "^0.35.4",
23-
"@backstage/core-compat-api": "^0.5.8",
24-
"@backstage/core-components": "^0.18.7",
25-
"@backstage/core-plugin-api": "^1.12.3",
26-
"@backstage/frontend-defaults": "^0.4.0",
27-
"@backstage/frontend-plugin-api": "^0.14.0",
28-
"@backstage/integration-react": "^1.2.15",
29-
"@backstage/plugin-api-docs": "^0.13.4",
30-
"@backstage/plugin-app-react": "^0.2.0",
31-
"@backstage/plugin-app-visualizer": "^0.2.0",
32-
"@backstage/plugin-catalog": "^1.33.0",
33-
"@backstage/plugin-catalog-graph": "^0.5.7",
34-
"@backstage/plugin-catalog-import": "^0.13.10",
35-
"@backstage/plugin-home": "^0.9.2",
36-
"@backstage/plugin-kubernetes": "^0.12.16",
37-
"@backstage/plugin-notifications": "^0.5.14",
38-
"@backstage/plugin-org": "^0.6.49",
39-
"@backstage/plugin-scaffolder": "^1.35.3",
40-
"@backstage/plugin-search": "^1.6.0",
41-
"@backstage/plugin-signals": "^0.0.28",
42-
"@backstage/plugin-techdocs": "^1.17.0",
43-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.33",
44-
"@backstage/plugin-user-settings": "^0.9.0",
45-
"@backstage/ui": "^0.12.0",
22+
"@backstage/cli": "^0.36.0",
23+
"@backstage/core-compat-api": "^0.5.9",
24+
"@backstage/core-components": "^0.18.8",
25+
"@backstage/core-plugin-api": "^1.12.4",
26+
"@backstage/frontend-defaults": "^0.5.0",
27+
"@backstage/frontend-plugin-api": "^0.15.1",
28+
"@backstage/integration-react": "^1.2.16",
29+
"@backstage/plugin-api-docs": "^0.13.5",
30+
"@backstage/plugin-app-react": "^0.2.1",
31+
"@backstage/plugin-app-visualizer": "^0.2.1",
32+
"@backstage/plugin-catalog": "^2.0.1",
33+
"@backstage/plugin-catalog-graph": "^0.6.0",
34+
"@backstage/plugin-catalog-import": "^0.13.11",
35+
"@backstage/plugin-home": "^0.9.3",
36+
"@backstage/plugin-kubernetes": "^0.12.17",
37+
"@backstage/plugin-notifications": "^0.5.15",
38+
"@backstage/plugin-org": "^0.7.0",
39+
"@backstage/plugin-scaffolder": "^1.36.1",
40+
"@backstage/plugin-search": "^1.7.0",
41+
"@backstage/plugin-signals": "^0.0.29",
42+
"@backstage/plugin-techdocs": "^1.17.2",
43+
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.34",
44+
"@backstage/plugin-user-settings": "^0.9.1",
45+
"@backstage/ui": "^0.13.1",
4646
"@material-ui/core": "^4.12.2",
4747
"@material-ui/icons": "^4.9.1",
4848
"@red-hat-developer-hub/backstage-plugin-extensions": "workspace:^",

‎workspaces/extensions/packages/app/src/modules/signIn/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import { createFrontendModule } from '@backstage/frontend-plugin-api';
1818
import { SignInPageBlueprint } from '@backstage/plugin-app-react';
19+
1920
export const signInModule = createFrontendModule({
2021
pluginId: 'app',
2122
extensions: [

0 commit comments

Comments
 (0)