Skip to content

Commit

Permalink
feat: Update Backstage from 1.22.2 to 1.23.3 and new backend (#315)
Browse files Browse the repository at this point in the history
  • Loading branch information
hairmare authored Feb 26, 2024
1 parent 5f88082 commit d16a162
Show file tree
Hide file tree
Showing 17 changed files with 3,073 additions and 1,870 deletions.
7 changes: 4 additions & 3 deletions app-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ integrations:
token: ${GITHUB_TOKEN}

proxy:
### Allow calling github api from scaffolder-backend-module-http-request
'/api.github.com':
target: 'https://api.github.com'
endpoints:
### Allow calling github api from scaffolder-backend-module-http-request
'/api.github.com':
target: 'https://api.github.com'

# Reference documentation http://backstage.io/docs/features/techdocs/configuration
# Note: After experimenting with basic setup, use CI/CD to generate docs
Expand Down
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.22.2"
"version": "1.23.3"
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@backstage/e2e-test-utils": "^0.1.0",
"@playwright/test": "^1.32.3",
"@backstage/cli": "^0.25.2",
"@backstage/e2e-test-utils": "^0.1.1",
"@playwright/test": "^1.41.2",
"@spotify/prettier-config": "^15.0.0",
"@types/react": "^18",
"@types/react-dom": "^18",
"concurrently": "^8.2.0",
"lerna": "^8.0.2",
"concurrently": "^8.2.2",
"lerna": "^8.1.2",
"node-gyp": "^10.0.1",
"prettier": "^3.1.1",
"prettier": "^3.2.5",
"typescript": "~5.3.3"
},
"resolutions": {
Expand Down
90 changes: 45 additions & 45 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,57 +14,57 @@
"lint": "backstage-cli package lint"
},
"dependencies": {
"@backstage/app-defaults": "^1.4.7",
"@backstage/catalog-model": "^1.4.3",
"@backstage/cli": "^0.25.1",
"@backstage/core-app-api": "^1.11.3",
"@backstage/core-components": "^0.13.10",
"@backstage/core-plugin-api": "^1.8.2",
"@backstage/integration-react": "^1.1.23",
"@backstage/plugin-api-docs": "^0.10.3",
"@backstage/plugin-catalog": "^1.16.1",
"@backstage/plugin-catalog-common": "^1.0.20",
"@backstage/plugin-catalog-graph": "^0.3.3",
"@backstage/plugin-catalog-import": "^0.10.5",
"@backstage/plugin-catalog-react": "^1.9.3",
"@backstage/plugin-catalog-unprocessed-entities": "^0.1.7",
"@backstage/plugin-devtools": "^0.1.8",
"@backstage/app-defaults": "^1.5.0",
"@backstage/catalog-model": "^1.4.4",
"@backstage/cli": "^0.25.2",
"@backstage/core-app-api": "^1.12.0",
"@backstage/core-components": "^0.14.0",
"@backstage/core-plugin-api": "^1.9.0",
"@backstage/integration-react": "^1.1.24",
"@backstage/plugin-api-docs": "^0.11.0",
"@backstage/plugin-catalog": "^1.17.0",
"@backstage/plugin-catalog-common": "^1.0.21",
"@backstage/plugin-catalog-graph": "^0.4.0",
"@backstage/plugin-catalog-import": "^0.10.6",
"@backstage/plugin-catalog-react": "^1.10.0",
"@backstage/plugin-catalog-unprocessed-entities": "^0.1.8",
"@backstage/plugin-devtools": "^0.1.9",
"@backstage/plugin-devtools-common": "^0.1.8",
"@backstage/plugin-github-actions": "^0.6.10",
"@backstage/plugin-github-pull-requests-board": "^0.1.23",
"@backstage/plugin-home": "^0.6.1",
"@backstage/plugin-org": "^0.6.19",
"@backstage/plugin-permission-react": "^0.4.19",
"@backstage/plugin-scaffolder": "^1.17.1",
"@backstage/plugin-search": "^1.4.5",
"@backstage/plugin-search-react": "^1.7.5",
"@backstage/plugin-tech-insights": "^0.3.21",
"@backstage/plugin-tech-radar": "^0.6.12",
"@backstage/plugin-techdocs": "^1.9.3",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.4",
"@backstage/plugin-techdocs-react": "^1.1.15",
"@backstage/plugin-user-settings": "^0.8.0",
"@backstage/theme": "^0.5.0",
"@material-ui/core": "^4.12.2",
"@material-ui/icons": "^4.9.1",
"@backstage/plugin-github-actions": "^0.6.11",
"@backstage/plugin-github-pull-requests-board": "^0.1.24",
"@backstage/plugin-home": "^0.6.2",
"@backstage/plugin-org": "^0.6.20",
"@backstage/plugin-permission-react": "^0.4.20",
"@backstage/plugin-scaffolder": "^1.18.0",
"@backstage/plugin-search": "^1.4.6",
"@backstage/plugin-search-react": "^1.7.6",
"@backstage/plugin-tech-radar": "^0.6.13",
"@backstage/plugin-techdocs": "^1.10.0",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.5",
"@backstage/plugin-techdocs-react": "^1.1.16",
"@backstage/plugin-todo": "^0.2.34",
"@backstage/plugin-user-settings": "^0.8.1",
"@backstage/theme": "^0.5.1",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@roadiehq/backstage-plugin-github-insights": "^2.3.23",
"history": "^5.0.0",
"history": "^5.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4"
"react-router": "^6.22.1",
"react-router-dom": "^6.22.1",
"react-use": "^17.5.0"
},
"devDependencies": {
"@backstage/test-utils": "^1.4.7",
"@playwright/test": "^1.32.3",
"@testing-library/dom": "^9.3.1",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@types/node": "^20.3.1",
"@types/react-dom": "^18.2.5",
"cross-env": "^7.0.0"
"@backstage/test-utils": "^1.5.0",
"@playwright/test": "^1.41.2",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
"@types/node": "^20",
"@types/react-dom": "^18",
"cross-env": "^7.0.3"
},
"browserslist": {
"production": [
Expand Down
2 changes: 1 addition & 1 deletion packages/app/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
href="<%= publicPath %>/safari-pinned-tab.svg"
color="#5bbad5"
/>
<title><%= config.getString('app.title') %></title>
<title><%= config.getOptionalString('app.title') ?? 'Backstage' %></title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
18 changes: 4 additions & 14 deletions packages/app/src/components/catalog/EntityPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
import { EntityTeamPullRequestsContent } from '@backstage/plugin-github-pull-requests-board';
import { EntityGithubInsightsContent } from '@roadiehq/backstage-plugin-github-insights';
import { EntityTechInsightsScorecardContent } from '@backstage/plugin-tech-insights';
import { EntityTodoContent } from '@backstage/plugin-todo';

const techdocsContent = (
<EntityTechdocsContent>
Expand Down Expand Up @@ -145,15 +145,6 @@ const overviewContent = (
</Grid>
);

const techinsightsRoute = (
<EntityLayout.Route path="/tech-insights" title="Scorecards">
<EntityTechInsightsScorecardContent
title="Tech Insights Scorecard"
description="The Tech Insights Scorecard contains an overview of the status of Backstage integration of this component."
/>
</EntityLayout.Route>
)

const serviceEntityPage = (
<EntityLayout>
<EntityLayout.Route path="/" title="Overview">
Expand Down Expand Up @@ -202,9 +193,10 @@ const serviceEntityPage = (
<EntityLayout.Route path="/github-actions" title="GitHub Actions">
<EntityGithubActionsContent />
</EntityLayout.Route>
<EntityLayout.Route path="/todo" title="Todo">
<EntityTodoContent />
</EntityLayout.Route>
</FeatureFlagged>

{techinsightsRoute}
</EntityLayout>
);

Expand Down Expand Up @@ -265,8 +257,6 @@ const defaultEntityPage = (
<EntityGithubActionsContent />
</EntityLayout.Route>
</FeatureFlagged>

{techinsightsRoute}
</EntityLayout >
);

Expand Down
14 changes: 4 additions & 10 deletions packages/backend/README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
# example-backend
# RaBe Backstage Backend

This package is an EXAMPLE of a Backstage backend.
This is the main RaBe Backstage backend.

The main purpose of this package is to provide a test bed for Backstage plugins
that have a backend part. Feel free to experiment locally or within your fork by
adding dependencies and routes to this backend, to try things out.

Our goal is to eventually amend the create-app flow of the CLI, such that a
production ready version of a backend skeleton is made alongside the frontend
app. Until then, feel free to experiment here!
Starting with Backstage 1.23 it is being rewritten to the [new backend system](https://backstage.io/docs/plugins/new-backend-system/).

## Development

To run the example backend, first go to the project root and run
To run the backend, first go to the project root and run

```bash
yarn install
Expand Down
71 changes: 36 additions & 35 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,49 +16,50 @@
"build-image": "docker build ../.. -f ../../Dockerfile --tag backstage"
},
"dependencies": {
"@backstage/backend-common": "^0.20.1",
"@backstage/backend-tasks": "^0.5.14",
"@backstage/catalog-client": "^1.5.2",
"@backstage/catalog-model": "^1.4.3",
"@backstage/backend-common": "^0.21.2",
"@backstage/backend-defaults": "^0.2.12",
"@backstage/backend-plugin-api": "^0.6.12",
"@backstage/backend-tasks": "^0.5.17",
"@backstage/catalog-client": "^1.6.0",
"@backstage/catalog-model": "^1.4.4",
"@backstage/config": "^1.1.1",
"@backstage/plugin-app-backend": "^0.3.57",
"@backstage/plugin-auth-backend": "^0.20.3",
"@backstage/plugin-auth-node": "^0.4.3",
"@backstage/plugin-catalog-backend": "^1.16.2",
"@backstage/plugin-catalog-backend-module-github": "^0.4.7",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.6",
"@backstage/plugin-catalog-backend-module-unprocessed": "^0.3.6",
"@backstage/plugin-devtools-backend": "^0.2.6",
"@backstage/plugin-permission-backend": "^0.5.32",
"@backstage/plugin-app-backend": "^0.3.60",
"@backstage/plugin-auth-backend": "^0.21.2",
"@backstage/plugin-auth-node": "^0.4.7",
"@backstage/plugin-catalog-backend": "^1.17.2",
"@backstage/plugin-catalog-backend-module-github": "^0.5.2",
"@backstage/plugin-catalog-backend-module-github-org": "^0.1.6",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.9",
"@backstage/plugin-catalog-backend-module-unprocessed": "^0.3.9",
"@backstage/plugin-devtools-backend": "^0.2.9",
"@backstage/plugin-permission-backend": "^0.5.35",
"@backstage/plugin-permission-common": "^0.7.12",
"@backstage/plugin-permission-node": "^0.7.20",
"@backstage/plugin-proxy-backend": "^0.4.7",
"@backstage/plugin-scaffolder-backend": "^1.20.0",
"@backstage/plugin-search-backend": "^1.4.9",
"@backstage/plugin-search-backend-module-catalog": "^0.1.13",
"@backstage/plugin-search-backend-module-pg": "^0.5.18",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.13",
"@backstage/plugin-search-backend-node": "^1.2.13",
"@backstage/plugin-tech-insights-backend": "^0.5.23",
"@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.41",
"@backstage/plugin-techdocs-backend": "^1.9.2",
"@janus-idp/backstage-plugin-keycloak-backend": "^1.7.13",
"@roadiehq/scaffolder-backend-module-http-request": "^4.1.1",
"@backstage/plugin-permission-node": "^0.7.23",
"@backstage/plugin-proxy-backend": "^0.4.10",
"@backstage/plugin-scaffolder-backend": "^1.21.2",
"@backstage/plugin-search-backend": "^1.5.2",
"@backstage/plugin-search-backend-module-catalog": "^0.1.16",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.16",
"@backstage/plugin-search-backend-node": "^1.2.16",
"@backstage/plugin-techdocs-backend": "^1.9.5",
"@backstage/plugin-todo-backend": "^0.3.10",
"@janus-idp/backstage-plugin-keycloak-backend": "^1.8.3",
"@roadiehq/scaffolder-backend-module-http-request": "^4.1.4",
"app": "link:../app",
"better-sqlite3": "^9.0.0",
"better-sqlite3": "^9.4.3",
"dockerode": "^4.0.2",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"express": "^4.18.2",
"express-promise-router": "^4.1.1",
"node-gyp": "^10.0.1",
"pg": "^8.11.3",
"winston": "^3.2.1"
"winston": "^3.11.0"
},
"devDependencies": {
"@backstage/cli": "^0.25.1",
"@types/dockerode": "^3.3.19",
"@types/express": "^4.17.17",
"@types/express-serve-static-core": "^4.17.35",
"@types/luxon": "^3.3.0"
"@backstage/cli": "^0.25.2",
"@types/dockerode": "^3",
"@types/express": "^4",
"@types/express-serve-static-core": "^4",
"@types/luxon": "^3"
},
"files": [
"dist"
Expand Down
Loading

0 comments on commit d16a162

Please sign in to comment.