Skip to content

Commit

Permalink
feat(deps): update to backstage 1.29 (#1900)
Browse files Browse the repository at this point in the history
* feat(deps): update to backstage 1.29

Signed-off-by: Paul Schultz <[email protected]>

* finish update to 1.29

Signed-off-by: Paul Schultz <[email protected]>

* update to backstage 1.29.2

Signed-off-by: Paul Schultz <[email protected]>

* fix dist-dynamic file

Signed-off-by: Paul Schultz <[email protected]>

* run versions:bump

Signed-off-by: Paul Schultz <[email protected]>

---------

Signed-off-by: Paul Schultz <[email protected]>
  • Loading branch information
schultzp2020 authored Jul 25, 2024
1 parent 52cf13a commit f53677f
Show file tree
Hide file tree
Showing 162 changed files with 1,824 additions and 11,261 deletions.
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.28.4"
"version": "1.29.2"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
]
},
"devDependencies": {
"@backstage/cli": "0.26.10",
"@backstage/cli": "0.26.11",
"@ianvs/prettier-plugin-sort-imports": "4.2.1",
"@janus-idp/cli": "*",
"@semantic-release/changelog": "6.0.3",
Expand Down
42 changes: 21 additions & 21 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@
"lint": "backstage-cli package lint"
},
"dependencies": {
"@backstage/app-defaults": "^1.5.7",
"@backstage/app-defaults": "^1.5.9",
"@backstage/catalog-model": "^1.5.0",
"@backstage/core-app-api": "^1.13.0",
"@backstage/core-components": "^0.14.8",
"@backstage/core-app-api": "^1.14.1",
"@backstage/core-components": "^0.14.9",
"@backstage/core-plugin-api": "^1.9.3",
"@backstage/integration-react": "^1.1.28",
"@backstage/plugin-api-docs": "^0.11.6",
"@backstage/plugin-catalog": "^1.21.0",
"@backstage/plugin-catalog-common": "^1.0.24",
"@backstage/plugin-catalog-graph": "^0.4.6",
"@backstage/plugin-catalog-import": "^0.12.0",
"@backstage/plugin-catalog-react": "^1.12.1",
"@backstage/plugin-org": "^0.6.26",
"@backstage/plugin-permission-react": "^0.4.23",
"@backstage/plugin-scaffolder": "^1.22.0",
"@backstage/plugin-search": "^1.4.13",
"@backstage/plugin-search-react": "^1.7.12",
"@backstage/plugin-techdocs": "^1.10.6",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.11",
"@backstage/plugin-techdocs-react": "^1.2.5",
"@backstage/plugin-user-settings": "^0.8.8",
"@backstage/integration-react": "^1.1.29",
"@backstage/plugin-api-docs": "^0.11.7",
"@backstage/plugin-catalog": "^1.21.1",
"@backstage/plugin-catalog-common": "^1.0.25",
"@backstage/plugin-catalog-graph": "^0.4.7",
"@backstage/plugin-catalog-import": "^0.12.1",
"@backstage/plugin-catalog-react": "^1.12.2",
"@backstage/plugin-org": "^0.6.27",
"@backstage/plugin-permission-react": "^0.4.24",
"@backstage/plugin-scaffolder": "^1.23.0",
"@backstage/plugin-search": "^1.4.14",
"@backstage/plugin-search-react": "^1.7.13",
"@backstage/plugin-techdocs": "^1.10.7",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.12",
"@backstage/plugin-techdocs-react": "^1.2.6",
"@backstage/plugin-user-settings": "^0.8.10",
"@emotion/react": "^11.11.4",
"@mui/icons-material": "^5.15.16",
"@mui/material": "^5.15.16",
Expand All @@ -56,8 +56,8 @@
"tss-react": "^4.9.10"
},
"devDependencies": {
"@backstage/cli": "0.26.10",
"@backstage/test-utils": "1.5.7",
"@backstage/cli": "0.26.11",
"@backstage/test-utils": "1.5.9",
"@testing-library/dom": "9.3.4",
"@testing-library/jest-dom": "6.4.8",
"@testing-library/react": "14.3.1",
Expand Down
7 changes: 7 additions & 0 deletions packages/app/src/components/Root/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
useSidebarOpenState,
} from '@backstage/core-components';
import { IconComponent } from '@backstage/core-plugin-api';
import { MyGroupsSidebarItem } from '@backstage/plugin-org';
import { SidebarSearchModal } from '@backstage/plugin-search';
import {
Settings as SidebarSettings,
Expand All @@ -22,6 +23,7 @@ import ExtensionIcon from '@mui/icons-material/Extension';
import HomeIcon from '@mui/icons-material/Home';
import LibraryBooks from '@mui/icons-material/LibraryBooks';
import MenuIcon from '@mui/icons-material/Menu';
import GroupIcon from '@mui/icons-material/People';
import SearchIcon from '@mui/icons-material/Search';
import { makeStyles } from 'tss-react/mui';

Expand Down Expand Up @@ -73,6 +75,11 @@ export const Root = ({
to="catalog"
text="Home"
/>
<MyGroupsSidebarItem
icon={GroupIcon as IconComponent}
singularTitle="My Group"
pluralTitle="My Groups"
/>
<SidebarItem
icon={ExtensionIcon as IconComponent}
to="api-docs"
Expand Down
42 changes: 22 additions & 20 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,32 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-defaults": "^0.3.3",
"@backstage/backend-plugin-api": "^0.6.21",
"@backstage/plugin-app-backend": "^0.3.70",
"@backstage/plugin-auth-backend": "^0.22.8",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.1.7",
"@backstage/plugin-catalog-backend": "^1.23.2",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.19",
"@backstage/plugin-proxy-backend": "^0.5.2",
"@backstage/plugin-scaffolder-backend": "^1.22.11",
"@backstage/plugin-search-backend": "^1.5.13",
"@backstage/plugin-search-backend-module-catalog": "^0.1.27",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.26",
"@backstage/plugin-techdocs-backend": "^1.10.8",
"@manypkg/get-packages": "^1.1.3",
"@backstage/backend-app-api": "^0.8.0",
"@backstage/backend-defaults": "^0.4.1",
"@backstage/backend-dynamic-feature-service": "^0.2.15",
"@backstage/backend-plugin-api": "^0.7.0",
"@backstage/cli-node": "^0.2.7",
"@backstage/config-loader": "^1.8.1",
"winston": "^3.11.0",
"@backstage/backend-app-api": "^0.7.9",
"@backstage/backend-dynamic-feature-service": "^0.2.14",
"@backstage/cli-node": "^0.2.6",
"@backstage/plugin-app-backend": "^0.3.71",
"@backstage/plugin-auth-backend": "^0.22.9",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.1.8",
"@backstage/plugin-catalog-backend": "^1.24.0",
"@backstage/plugin-catalog-backend-module-logs": "^0.0.1",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.20",
"@backstage/plugin-proxy-backend": "^0.5.3",
"@backstage/plugin-scaffolder-backend": "^1.23.0",
"@backstage/plugin-search-backend": "^1.5.14",
"@backstage/plugin-search-backend-module-catalog": "^0.1.28",
"@backstage/plugin-search-backend-module-pg": "^0.5.32",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.27",
"@backstage/plugin-techdocs-backend": "^1.10.9",
"@janus-idp/backstage-plugin-rbac-backend": "*",
"app": "*"
"@manypkg/get-packages": "^1.1.3",
"app": "*",
"winston": "^3.11.0"
},
"devDependencies": {
"@backstage/cli": "0.26.10"
"@backstage/cli": "0.26.11"
},
"files": [
"dist"
Expand Down
9 changes: 9 additions & 0 deletions packages/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ backend.add(import('@backstage/plugin-proxy-backend/alpha'));
backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
backend.add(import('@backstage/plugin-techdocs-backend/alpha'));

// See https://backstage.io/docs/features/software-catalog/configuration#subscribing-to-catalog-errors
backend.add(import('@backstage/plugin-catalog-backend-module-logs'));

// auth plugin
backend.add(import('@backstage/plugin-auth-backend'));
// See https://backstage.io/docs/backend-system/building-backends/migrating#the-auth-plugin
Expand All @@ -45,6 +48,12 @@ backend.add(import('@janus-idp/backstage-plugin-rbac-backend'));

// search plugin
backend.add(import('@backstage/plugin-search-backend/alpha'));

// search engine
// See https://backstage.io/docs/features/search/search-engines
backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));

// search collators
backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));

Expand Down
22 changes: 11 additions & 11 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"dependencies": {
"@backstage/cli-common": "^0.1.14",
"@backstage/cli-node": "^0.2.6",
"@backstage/cli-node": "^0.2.7",
"@backstage/config": "^1.2.0",
"@backstage/config-loader": "^1.8.1",
"@backstage/errors": "^1.2.4",
Expand Down Expand Up @@ -89,17 +89,17 @@
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/backend-common": "0.23.2",
"@backstage/backend-plugin-api": "0.6.21",
"@backstage/backend-test-utils": "0.4.3",
"@backstage/cli": "0.26.10",
"@backstage/core-app-api": "1.13.0",
"@backstage/core-components": "0.14.8",
"@backstage/backend-common": "0.23.3",
"@backstage/backend-plugin-api": "0.7.0",
"@backstage/backend-test-utils": "0.4.4",
"@backstage/cli": "0.26.11",
"@backstage/core-app-api": "1.14.1",
"@backstage/core-components": "0.14.9",
"@backstage/core-plugin-api": "1.9.3",
"@backstage/dev-utils": "1.0.34",
"@backstage/plugin-scaffolder-backend": "1.22.11",
"@backstage/plugin-scaffolder-node": "0.4.7",
"@backstage/test-utils": "1.5.7",
"@backstage/dev-utils": "1.0.36",
"@backstage/plugin-scaffolder-backend": "1.23.0",
"@backstage/plugin-scaffolder-node": "0.4.8",
"@backstage/test-utils": "1.5.9",
"@backstage/theme": "0.5.6",
"@ianvs/prettier-plugin-sort-imports": "4.2.1",
"@spotify/prettier-config": "15.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
"storybook-dark-mode": "^3.0.1"
},
"peerDependencies": {
"@backstage/cli": "^0.26.10",
"@backstage/core-app-api": "^1.13.0",
"@backstage/core-components": "^0.14.8",
"@backstage/cli": "^0.26.11",
"@backstage/core-app-api": "^1.14.1",
"@backstage/core-components": "^0.14.9",
"@backstage/core-plugin-api": "^1.9.3",
"@backstage/test-utils": "^1.5.7",
"@backstage/test-utils": "^1.5.9",
"@backstage/theme": "^0.5.6"
}
}
18 changes: 8 additions & 10 deletions plugins/3scale-backend/dist-dynamic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
"name": "@janus-idp/backstage-plugin-3scale-backend-dynamic",
"version": "1.7.1",
"license": "Apache-2.0",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts",
"main": "./dist/index.cjs.js",
"types": "src/index.ts",
"publishConfig": {
"access": "public",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts"
"access": "public"
},
"backstage": {
"role": "backend-plugin-module",
Expand Down Expand Up @@ -55,13 +53,13 @@
"author": "Red Hat",
"bundleDependencies": true,
"peerDependencies": {
"@backstage/backend-common": "^0.23.2",
"@backstage/backend-plugin-api": "^0.6.21",
"@backstage/backend-tasks": "^0.5.26",
"@backstage/backend-common": "^0.23.3",
"@backstage/backend-plugin-api": "^0.7.0",
"@backstage/backend-tasks": "^0.5.27",
"@backstage/catalog-model": "^1.5.0",
"@backstage/config": "^1.2.0",
"@backstage/plugin-catalog-node": "^1.12.3",
"@backstage/backend-dynamic-feature-service": "^0.2.14"
"@backstage/plugin-catalog-node": "^1.12.4",
"@backstage/backend-dynamic-feature-service": "^0.2.15"
},
"overrides": {
"@aws-sdk/util-utf8-browser": {
Expand Down
12 changes: 6 additions & 6 deletions plugins/3scale-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@
"tsc": "tsc"
},
"dependencies": {
"@backstage/backend-common": "^0.23.2",
"@backstage/backend-plugin-api": "^0.6.21",
"@backstage/backend-tasks": "^0.5.26",
"@backstage/backend-common": "^0.23.3",
"@backstage/backend-plugin-api": "^0.7.0",
"@backstage/backend-tasks": "^0.5.27",
"@backstage/catalog-model": "^1.5.0",
"@backstage/config": "^1.2.0",
"@backstage/plugin-catalog-node": "^1.12.3",
"@backstage/backend-dynamic-feature-service": "^0.2.14"
"@backstage/plugin-catalog-node": "^1.12.4",
"@backstage/backend-dynamic-feature-service": "^0.2.15"
},
"devDependencies": {
"@backstage/cli": "0.26.10",
"@backstage/cli": "0.26.11",
"@janus-idp/cli": "1.12.0",
"@types/supertest": "2.0.16",
"msw": "1.3.3",
Expand Down
18 changes: 8 additions & 10 deletions plugins/aap-backend/dist-dynamic/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"name": "@janus-idp/backstage-plugin-aap-backend-dynamic",
"version": "1.8.1",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts",
"main": "./dist/index.cjs.js",
"types": "src/index.ts",
"license": "Apache-2.0",
"publishConfig": {
"access": "public",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts"
"access": "public"
},
"backstage": {
"role": "backend-plugin-module",
Expand Down Expand Up @@ -55,13 +53,13 @@
"author": "Red Hat",
"bundleDependencies": true,
"peerDependencies": {
"@backstage/backend-common": "^0.23.2",
"@backstage/backend-plugin-api": "^0.6.21",
"@backstage/backend-tasks": "^0.5.26",
"@backstage/backend-common": "^0.23.3",
"@backstage/backend-plugin-api": "^0.7.0",
"@backstage/backend-tasks": "^0.5.27",
"@backstage/catalog-model": "^1.5.0",
"@backstage/config": "^1.2.0",
"@backstage/plugin-catalog-node": "^1.12.3",
"@backstage/backend-dynamic-feature-service": "^0.2.14"
"@backstage/plugin-catalog-node": "^1.12.4",
"@backstage/backend-dynamic-feature-service": "^0.2.15"
},
"overrides": {
"@aws-sdk/util-utf8-browser": {
Expand Down
12 changes: 6 additions & 6 deletions plugins/aap-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@
"tsc": "tsc"
},
"dependencies": {
"@backstage/backend-common": "^0.23.2",
"@backstage/backend-plugin-api": "^0.6.21",
"@backstage/backend-tasks": "^0.5.26",
"@backstage/backend-common": "^0.23.3",
"@backstage/backend-plugin-api": "^0.7.0",
"@backstage/backend-tasks": "^0.5.27",
"@backstage/catalog-model": "^1.5.0",
"@backstage/config": "^1.2.0",
"@backstage/plugin-catalog-node": "^1.12.3",
"@backstage/backend-dynamic-feature-service": "^0.2.14"
"@backstage/plugin-catalog-node": "^1.12.4",
"@backstage/backend-dynamic-feature-service": "^0.2.15"
},
"devDependencies": {
"@backstage/cli": "0.26.10",
"@backstage/cli": "0.26.11",
"@janus-idp/cli": "1.12.0",
"@types/supertest": "2.0.16",
"msw": "1.3.3",
Expand Down
12 changes: 6 additions & 6 deletions plugins/acr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
},
"dependencies": {
"@backstage/catalog-model": "^1.5.0",
"@backstage/core-components": "^0.14.8",
"@backstage/core-components": "^0.14.9",
"@backstage/core-plugin-api": "^1.9.3",
"@backstage/plugin-catalog-react": "^1.12.1",
"@backstage/plugin-catalog-react": "^1.12.2",
"@backstage/theme": "^0.5.6",
"@janus-idp/shared-react": "2.8.0",
"@material-ui/core": "^4.9.13",
Expand All @@ -47,10 +47,10 @@
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
},
"devDependencies": {
"@backstage/cli": "0.26.10",
"@backstage/core-app-api": "1.13.0",
"@backstage/dev-utils": "1.0.34",
"@backstage/test-utils": "1.5.7",
"@backstage/cli": "0.26.11",
"@backstage/core-app-api": "1.14.1",
"@backstage/dev-utils": "1.0.36",
"@backstage/test-utils": "1.5.9",
"@janus-idp/cli": "1.12.0",
"@redhat-developer/red-hat-developer-hub-theme": "0.0.54",
"@testing-library/jest-dom": "6.4.8",
Expand Down
8 changes: 4 additions & 4 deletions plugins/analytics-module-matomo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
"react": "^16.13.1 || ^17.0.0 || ^18.0.0"
},
"devDependencies": {
"@backstage/cli": "0.26.10",
"@backstage/core-app-api": "1.13.0",
"@backstage/dev-utils": "1.0.34",
"@backstage/test-utils": "1.5.7",
"@backstage/cli": "0.26.11",
"@backstage/core-app-api": "1.14.1",
"@backstage/dev-utils": "1.0.36",
"@backstage/test-utils": "1.5.9",
"@janus-idp/cli": "1.12.0",
"@redhat-developer/red-hat-developer-hub-theme": "0.0.54",
"@testing-library/jest-dom": "6.4.8",
Expand Down
Loading

0 comments on commit f53677f

Please sign in to comment.