Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update backstage #42

Merged
merged 3 commits into from
May 13, 2024
Merged

update backstage #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bc6e47
update backstage
vladimirvshivkov Apr 23, 2024
eabb613
update
vladimirvshivkov Apr 23, 2024
74facb5
update
vladimirvshivkov Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion backstage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.24.2"
"version": "1.26.3"
}
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"clean": "backstage-cli repo clean",
"test": "backstage-cli repo test",
"test:all": "backstage-cli repo test --coverage",
"lint": "backstage-cli repo lint --since origin/main",
"lint": "backstage-cli package lint",
"lint:all": "backstage-cli repo lint",
"prettier:check": "prettier --check .",
"create-plugin": "backstage-cli create-plugin --scope internal",
Expand All @@ -31,8 +31,8 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.26.1",
"@janus-idp/cli": "^1.4.7",
"@backstage/cli": "^0.26.4",
"@janus-idp/cli": "^1.8.0",
"@spotify/prettier-config": "^12.0.0",
"concurrently": "^8.1.0",
"node-gyp": "^9.0.0",
Expand All @@ -54,8 +54,8 @@
]
},
"dependencies": {
"@backstage/backend-dynamic-feature-service": "0.1.0",
"@backstage/test-utils": "^1.5.3",
"@backstage/backend-dynamic-feature-service": "^0.2.9",
"@backstage/test-utils": "^1.5.4",
"@types/passport-oauth2": "^1.4.12",
"passport-oauth2": "^1.7.0"
},
Expand Down
74 changes: 37 additions & 37 deletions packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,56 +18,56 @@
"cy:run": "cypress run --browser chrome"
},
"dependencies": {
"@backstage/app-defaults": "^1.5.2",
"@backstage/app-defaults": "^1.5.4",
"@backstage/catalog-model": "^1.4.5",
"@backstage/cli": "^0.26.1",
"@backstage/core-app-api": "^1.12.2",
"@backstage/core-components": "^0.14.2",
"@backstage/core-plugin-api": "^1.9.1",
"@backstage/integration-react": "^1.1.25",
"@backstage/plugin-adr": "^0.6.15",
"@backstage/plugin-api-docs": "^0.11.2",
"@backstage/plugin-catalog": "^1.18.1",
"@backstage/cli": "^0.26.4",
"@backstage/core-app-api": "^1.12.4",
"@backstage/core-components": "^0.14.4",
"@backstage/core-plugin-api": "^1.9.2",
"@backstage/integration-react": "^1.1.26",
"@backstage/plugin-api-docs": "^0.11.4",
"@backstage/plugin-catalog": "^1.19.0",
"@backstage/plugin-catalog-common": "^1.0.22",
"@backstage/plugin-catalog-graph": "^0.4.2",
"@backstage/plugin-catalog-import": "^0.10.8",
"@backstage/plugin-catalog-react": "^1.11.1",
"@backstage/plugin-cicd-statistics": "^0.1.34",
"@backstage/plugin-explore": "^0.4.18",
"@backstage/plugin-gcalendar": "^0.3.25",
"@backstage/plugin-github-actions": "^0.6.13",
"@backstage/plugin-github-pull-requests-board": "^0.1.26",
"@backstage/plugin-home": "^0.7.1",
"@backstage/plugin-kubernetes": "^0.11.7",
"@backstage/plugin-org": "^0.6.22",
"@backstage/plugin-permission-react": "^0.4.21",
"@backstage/plugin-scaffolder": "^1.19.1",
"@backstage/plugin-search": "^1.4.8",
"@backstage/plugin-search-react": "^1.7.8",
"@backstage/plugin-tech-insights": "^0.3.24",
"@backstage/plugin-tech-radar": "^0.7.1",
"@backstage/plugin-techdocs": "^1.10.2",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.7",
"@backstage/plugin-techdocs-react": "^1.2.1",
"@backstage/plugin-user-settings": "^0.8.3",
"@backstage/theme": "^0.5.2",
"@backstage/plugin-catalog-graph": "^0.4.4",
"@backstage/plugin-catalog-import": "^0.10.10",
"@backstage/plugin-catalog-react": "^1.11.3",
"@backstage/plugin-home": "^0.7.3",
"@backstage/plugin-kubernetes": "^0.11.9",
"@backstage/plugin-org": "^0.6.24",
"@backstage/plugin-permission-react": "^0.4.22",
"@backstage/plugin-scaffolder": "^1.19.3",
"@backstage/plugin-search": "^1.4.10",
"@backstage/plugin-search-react": "^1.7.10",
"@backstage/plugin-techdocs": "^1.10.4",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.9",
"@backstage/plugin-techdocs-react": "^1.2.3",
"@backstage/plugin-user-settings": "^0.8.5",
"@backstage/theme": "^0.5.3",
"@internal/backstage-plugin-cicd-statistics-module-zuul": "^0.1.0",
"@janus-idp/backstage-plugin-quay": "^1.5.9",
"@janus-idp/backstage-plugin-topology": "^1.18.7",
"@janus-idp/backstage-plugin-quay": "^1.6.0",
"@janus-idp/backstage-plugin-topology": "^1.19.0",
"@k-phoen/backstage-plugin-grafana": "^0.1.22",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@roadiehq/backstage-plugin-github-insights": "^2.3.27",
"@roadiehq/backstage-plugin-github-pull-requests": "^2.5.24",
"@roadiehq/backstage-plugin-github-insights": "^2.3.28",
"@roadiehq/backstage-plugin-github-pull-requests": "^2.5.25",
"@trimm/plugin-dependencytrack": "^0.2.2",
"history": "^5.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4"
"react-use": "^17.2.4",
"@backstage-community/plugin-adr": "^0.6.18",
"@backstage-community/plugin-cicd-statistics": "^0.1.37",
"@backstage-community/plugin-explore": "^0.4.21",
"@backstage-community/plugin-gcalendar": "^0.3.28",
"@backstage-community/plugin-github-actions": "^0.6.16",
"@backstage-community/plugin-github-pull-requests-board": "^0.2.1",
"@backstage-community/plugin-tech-insights": "^0.3.27",
"@backstage-community/plugin-tech-radar": "^0.7.4"
},
"devDependencies": {
"@backstage/test-utils": "^1.5.2",
"@backstage/test-utils": "^1.5.4",
"@testing-library/jest-dom": "^5.10.1",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^14.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/app/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import {
import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
import { orgPlugin } from '@backstage/plugin-org';
import { SearchPage } from '@backstage/plugin-search';
import { TechRadarPage } from '@backstage/plugin-tech-radar';
import { TechRadarPage } from '@backstage-community/plugin-tech-radar';
import {
DefaultTechDocsHome,
TechDocsIndexPage,
/* techdocsPlugin,*/
TechDocsReaderPage,
} from '@backstage/plugin-techdocs';
/*import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';*/
/* import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib'; */
import { UserSettingsPage } from '@backstage/plugin-user-settings';
// import { UserSettingsPage } from '@internal/plugin-user-settings';
import { giteaOauth2AuthApiRef, apis } from './apis';
Expand All @@ -42,7 +42,7 @@ import {
useApi,
} from '@backstage/core-plugin-api';
import { SignInPage, ProxiedSignInPage } from '@backstage/core-components';
import { ExplorePage /* , explorePlugin */ } from '@backstage/plugin-explore';
import { ExplorePage /* , explorePlugin */ } from '@backstage-community/plugin-explore';

import { HomepageCompositionRoot } from '@backstage/plugin-home';
import { homePage } from './components/home/HomePage';
Expand Down
6 changes: 3 additions & 3 deletions packages/app/src/apis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import {
} from '@backstage/core-plugin-api';

import { TechRadarClient } from './lib/tech_radar';
import { techRadarApiRef } from '@backstage/plugin-tech-radar';
import { techRadarApiRef } from '@backstage-community/plugin-tech-radar';

import { cicdStatisticsApiRef } from '@backstage/plugin-cicd-statistics';
import { cicdStatisticsApiRef } from '@backstage-community/plugin-cicd-statistics';
import { CicdStatisticsApiZuul } from '@internal/backstage-plugin-cicd-statistics-module-zuul';

export const giteaOauth2AuthApiRef: ApiRef<
Expand All @@ -46,7 +46,7 @@ export const apis: AnyApiFactory[] = [
deps: { configApi: configApiRef },
factory: ({ configApi }) => ScmIntegrationsApi.fromConfig(configApi),
}),
//ScmAuth.createDefaultApiFactory(),
// ScmAuth.createDefaultApiFactory(),
createApiFactory({
api: scmAuthApiRef,
deps: {
Expand Down
8 changes: 4 additions & 4 deletions packages/app/src/components/catalog/EntityPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,21 @@ import {
RELATION_PROVIDES_API,
} from '@backstage/catalog-model';

import { EntityCicdStatisticsContent } from '@backstage/plugin-cicd-statistics';
import { EntityCicdStatisticsContent } from '@backstage-community/plugin-cicd-statistics';
import { isZuulAvailable } from '@internal/backstage-plugin-cicd-statistics-module-zuul';

import {
isDashboardSelectorAvailable,
EntityGrafanaDashboardsCard,
} from '@k-phoen/backstage-plugin-grafana';

import { EntityTechInsightsScorecardContent } from '@backstage/plugin-tech-insights';
import { EntityAdrContent, isAdrAvailable } from '@backstage/plugin-adr';
import { EntityTechInsightsScorecardContent } from '@backstage-community/plugin-tech-insights';
import { EntityAdrContent, isAdrAvailable } from '@backstage-community/plugin-adr';
import { EntityGithubPullRequestsContent } from '@roadiehq/backstage-plugin-github-pull-requests';
import { EntityGithubPullRequestsOverviewCard } from '@roadiehq/backstage-plugin-github-pull-requests';
import {
/* EntityTeamPullRequestsCard, */ EntityTeamPullRequestsContent,
} from '@backstage/plugin-github-pull-requests-board';
} from '@backstage-community/plugin-github-pull-requests-board';
import {
EntityGithubInsightsContent,
EntityGithubInsightsLanguagesCard,
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/components/home/HomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
} from '@backstage/plugin-home';
import { Content, Header, Page } from '@backstage/core-components';
import { HomePageSearchBar } from '@backstage/plugin-search';
import { HomePageCalendar } from '@backstage/plugin-gcalendar';
import { HomePageCalendar } from '@backstage-community/plugin-gcalendar';
import Grid from '@material-ui/core/Grid';
import React from 'react';

Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/lib/tech_radar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
RadarEntry,
TechRadarApi,
TechRadarLoaderResponse,
} from '@backstage/plugin-tech-radar';
} from '@backstage-community/plugin-tech-radar';

const rings = new Array<RadarRing>();
rings.push({ id: 'adopt', name: 'Use', color: '#93c47d' });
Expand Down
61 changes: 34 additions & 27 deletions packages/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,43 @@
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
},
"dependencies": {
"@backstage/backend-common": "^0.21.5",
"@backstage/backend-tasks": "^0.5.20",
"@backstage/catalog-client": "^1.6.2",
"@backstage-community/plugin-adr-backend": "^0.4.15",
"@backstage-community/plugin-explore-backend": "^0.0.28",
"@backstage-community/plugin-explore-common": "^0.0.3",
"@backstage-community/plugin-tech-insights-backend": "^0.5.32",
"@backstage-community/plugin-tech-insights-backend-module-jsonfc": "^0.1.50",
"@backstage-community/plugin-tech-insights-node": "^0.6.1",
"@backstage/backend-common": "^0.21.7",
"@backstage/backend-defaults": "^0.2.17",
"@backstage/backend-tasks": "^0.5.22",
"@backstage/catalog-client": "^1.6.4",
"@backstage/catalog-model": "^1.4.5",
"@backstage/config": "^1.2.0",
"@backstage/integration": "^1.9.1",
"@backstage/plugin-adr-backend": "^0.4.12",
"@backstage/plugin-app-backend": "^0.3.63",
"@backstage/plugin-auth-backend": "^0.22.2",
"@backstage/plugin-auth-node": "^0.4.10",
"@backstage/plugin-catalog-backend": "^1.20.0",
"@backstage/plugin-explore-backend": "^0.0.25",
"@backstage/plugin-explore-common": "^0.0.2",
"@backstage/plugin-kubernetes-backend": "^0.16.2",
"@backstage/integration": "^1.10.0",
"@backstage/plugin-app-backend": "^0.3.65",
"@backstage/plugin-auth-backend": "^0.22.4",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.1.3",
"@backstage/plugin-auth-node": "^0.4.12",
"@backstage/plugin-catalog-backend": "^1.21.1",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.15",
"@backstage/plugin-kubernetes-backend": "^0.17.0",
"@backstage/plugin-permission-backend": "^0.5.41",
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.14",
"@backstage/plugin-permission-common": "^0.7.13",
"@backstage/plugin-permission-node": "^0.7.26",
"@backstage/plugin-proxy-backend": "^0.4.13",
"@backstage/plugin-scaffolder-backend": "^1.22.2",
"@backstage/plugin-search-backend": "^1.5.5",
"@backstage/plugin-search-backend-module-pg": "^0.5.24",
"@backstage/plugin-search-backend-node": "^1.2.19",
"@backstage/plugin-tech-insights-backend": "^0.5.29",
"@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.47",
"@backstage/plugin-tech-insights-node": "^0.5.1",
"@backstage/plugin-techdocs-backend": "^1.10.2",
"@backstage/plugin-permission-node": "^0.7.28",
"@backstage/plugin-proxy-backend": "^0.4.15",
"@backstage/plugin-scaffolder-backend": "^1.22.4",
"@backstage/plugin-search-backend": "^1.5.7",
"@backstage/plugin-search-backend-module-catalog": "^0.1.22",
"@backstage/plugin-search-backend-module-pg": "^0.5.26",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.22",
"@backstage/plugin-search-backend-node": "^1.2.21",
"@backstage/plugin-techdocs-backend": "^1.10.4",
"@internal/scaffolder-backend-module-otc": "^0.1.0",
"@janus-idp/backstage-plugin-keycloak-backend": "^1.8.6",
"@roadiehq/scaffolder-backend-argocd": "^1.1.24",
"@roadiehq/scaffolder-backend-module-http-request": "^4.1.9",
"@roadiehq/scaffolder-backend-module-utils": "^1.14.0",
"@janus-idp/backstage-plugin-keycloak-backend": "^1.9.0",
"@roadiehq/scaffolder-backend-argocd": "^1.1.25",
"@roadiehq/scaffolder-backend-module-http-request": "^4.1.10",
"@roadiehq/scaffolder-backend-module-utils": "^1.14.1",
"app": "link:../app",
"better-sqlite3": "^7.5.0",
"dockerode": "^3.3.1",
Expand All @@ -56,7 +63,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.26.1",
"@backstage/cli": "^0.26.4",
"@types/dockerode": "^3.3.0",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
Expand Down