Skip to content

Commit

Permalink
feat: Backstage 1.26.4
Browse files Browse the repository at this point in the history
  • Loading branch information
hairmare committed Dec 23, 2024
1 parent 930508b commit df41998
Show file tree
Hide file tree
Showing 21 changed files with 6,590 additions and 2,978 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.yarn/install-state.gz
node_modules
packages/*/node_modules
plugins
*.local.yaml
trivy.*
eslint_report.json
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ RUN curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/

COPY ./package.json ./yarn.lock ./
COPY ./packages ./packages
COPY ./plugins ./plugins
COPY .yarnrc.yml ./
COPY .yarn/ ./.yarn

# Remove all files except package.json
RUN find packages -mindepth 2 -maxdepth 2 \! -name "package.json" -exec rm -rf {} \+
RUN find packages plugins -mindepth 2 -maxdepth 2 \! -name "package.json" -exec rm -rf {} \+

RUN yarn install --immutable --network-timeout 600000
RUN chown 1001:0 ".yarn/install-state.gz"
Expand Down
2 changes: 1 addition & 1 deletion app-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ integrations:
github:
- host: github.com
# This is a Personal Access Token or PAT from GitHub. You can find out how to generate this token, and more information
# about setting up the GitHub integration here: https://backstage.io/docs/getting-started/configuration#setting-up-a-github-integration
# about setting up the GitHub integration here: https://backstage.io/docs/integrations/github/locations#configuration
token: ${GITHUB_TOKEN}

proxy:
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.23.4"
"version": "1.26.4"
}
5 changes: 5 additions & 0 deletions packages/app/e2e-tests/app.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,10 @@ import { test, expect } from '@playwright/test';

test('App should render the welcome page', async ({ page }) => {
await page.goto('/');

const enterButton = page.getByRole('button', { name: 'Enter' });
await expect(enterButton).toBeVisible();
await enterButton.click();

await expect(page.getByText('My Company Catalog')).toBeVisible();
});
64 changes: 32 additions & 32 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,39 @@
"lint": "backstage-cli package lint"
},
"dependencies": {
"@backstage/app-defaults": "^1.5.0",
"@backstage/catalog-model": "^1.4.4",
"@backstage-community/plugin-github-actions": "^0.6.16",
"@backstage-community/plugin-github-pull-requests-board": "^0.2.1",
"@backstage-community/plugin-todo": "^0.2.39",
"@backstage/app-defaults": "^1.5.4",
"@backstage/catalog-model": "^1.4.5",
"@backstage/cli": "^0.29.4",
"@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.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",
"@backstage/core-app-api": "^1.12.4",
"@backstage/core-components": "^0.14.5",
"@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.4",
"@backstage/plugin-catalog-import": "^0.10.10",
"@backstage/plugin-catalog-react": "^1.11.3",
"@backstage/plugin-catalog-unprocessed-entities": "^0.2.3",
"@backstage/plugin-devtools": "^0.1.13",
"@backstage/plugin-devtools-common": "^0.1.9",
"@backstage/plugin-home": "^0.7.3",
"@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",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@roadiehq/backstage-plugin-github-insights": "^2.3.27",
"@roadiehq/backstage-plugin-github-insights": "^2.3.28",
"history": "^5.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -56,13 +55,14 @@
"react-use": "^17.5.0"
},
"devDependencies": {
"@backstage/test-utils": "^1.5.0",
"@backstage/test-utils": "^1.5.4",
"@playwright/test": "^1.41.2",
"@testing-library/dom": "^10.0.0",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"cross-env": "^7.0.3"
},
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 @@ -6,7 +6,7 @@
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Backstage is an open platform for building developer portals"
content="Backstage is an open source framework for building developer portals"
/>
<!--
manifest.json provides metadata used when your web app is installed on a
Expand Down
1 change: 1 addition & 0 deletions packages/app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ const app = createApp({
SignInPage: props => (
<SignInPage
{...props}
auto
provider={{
id: 'keycloak-auth-provider',
title: 'Keycloak',
Expand Down
6 changes: 3 additions & 3 deletions packages/app/src/components/catalog/EntityPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
import {
EntityGithubActionsContent,
isGithubActionsAvailable,
} from '@backstage/plugin-github-actions';
} from '@backstage-community/plugin-github-actions';
import {
EntityUserProfileCard,
EntityGroupProfileCard,
Expand All @@ -58,9 +58,9 @@ import {

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 { EntityTeamPullRequestsContent } from '@backstage-community/plugin-github-pull-requests-board';
import { EntityGithubInsightsContent } from '@roadiehq/backstage-plugin-github-insights';
import { EntityTodoContent } from '@backstage/plugin-todo';
import { EntityTodoContent } from '@backstage-community/plugin-todo';

const techdocsContent = (
<EntityTechdocsContent>
Expand Down
63 changes: 31 additions & 32 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,44 +16,43 @@
"build-image": "docker build ../.. -f ../../Dockerfile --tag backstage"
},
"dependencies": {
"@backstage/backend-common": "^0.21.3",
"@backstage/backend-defaults": "^0.2.13",
"@backstage/backend-plugin-api": "^0.6.13",
"@backstage/backend-tasks": "^0.5.18",
"@backstage/catalog-client": "^1.6.0",
"@backstage/catalog-model": "^1.4.4",
"@backstage/config": "^1.1.1",
"@backstage/integration": "^1.9.0",
"@backstage/plugin-app-backend": "^0.3.61",
"@backstage/plugin-auth-backend": "^0.21.3",
"@backstage/plugin-auth-node": "^0.4.8",
"@backstage/plugin-catalog-backend": "^1.17.3",
"@backstage/plugin-catalog-backend-module-github": "^0.5.3",
"@backstage/plugin-catalog-backend-module-github-org": "^0.1.7",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.10",
"@backstage/plugin-catalog-backend-module-unprocessed": "^0.3.10",
"@backstage/plugin-devtools-backend": "^0.2.10",
"@backstage/plugin-devtools-common": "^0.1.8",
"@backstage/plugin-permission-backend": "^0.5.36",
"@backstage/plugin-permission-common": "^0.7.12",
"@backstage/plugin-permission-node": "^0.7.24",
"@backstage/plugin-proxy-backend": "^0.4.11",
"@backstage/plugin-scaffolder-backend": "^1.21.3",
"@backstage/plugin-search-backend": "^1.5.3",
"@backstage/plugin-search-backend-module-catalog": "^0.1.17",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.17",
"@backstage/plugin-search-backend-node": "^1.2.17",
"@backstage/plugin-techdocs-backend": "^1.9.6",
"@backstage/plugin-todo-backend": "^0.3.11",
"@janus-idp/backstage-plugin-keycloak-backend": "^1.8.4",
"@roadiehq/scaffolder-backend-module-http-request": "^4.1.8",
"@backstage-community/plugin-todo-backend": "^0.3.17",
"@backstage/backend-common": "^0.21.7",
"@backstage/backend-defaults": "^0.2.17",
"@backstage/backend-plugin-api": "^0.6.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/plugin-app-backend": "^0.3.65",
"@backstage/plugin-auth-backend": "^0.22.4",
"@backstage/plugin-auth-node": "^0.4.12",
"@backstage/plugin-catalog-backend": "^1.21.1",
"@backstage/plugin-catalog-backend-module-github": "^0.6.0",
"@backstage/plugin-catalog-backend-module-github-org": "^0.1.12",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.15",
"@backstage/plugin-catalog-backend-module-unprocessed": "^0.4.4",
"@backstage/plugin-devtools-backend": "^0.3.3",
"@backstage/plugin-permission-backend": "^0.5.41",
"@backstage/plugin-permission-common": "^0.7.13",
"@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.23",
"@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/backstage-plugin-permission-backend-module-rabe": "../../plugins/permission-backend-module-rabe/",
"@janus-idp/backstage-plugin-keycloak-backend": "^1.9.1",
"@roadiehq/scaffolder-backend-module-http-request": "^4.3.1",
"app": "link:../app",
"better-sqlite3": "^9.4.3",
"dockerode": "^4.0.2",
"express": "^4.18.2",
"express-promise-router": "^4.1.1",
"node-gyp": "^10.0.1",
"pg": "^8.11.3",
"pg": "^8.11.4",
"winston": "^3.11.0"
},
"devDependencies": {
Expand Down
29 changes: 17 additions & 12 deletions packages/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,35 @@ import { legacyPlugin } from '@backstage/backend-common';

const backend = createBackend();

// spa
backend.add(import('@backstage/plugin-app-backend/alpha'));
backend.add(import('@backstage/plugin-proxy-backend/alpha'))
backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
backend.add(
import('@roadiehq/scaffolder-backend-module-http-request/new-backend'),
);

// auth and perms
// auth plugin
// TODO: switch to new backend together with perms when ready
backend.add(legacyPlugin('auth', import('./plugins/auth')));
// TODO: switch to new catalog backend once docs for @backstage/plugin-permission-backend are available
backend.add(legacyPlugin('permission', import('./plugins/permission')));

// catalog and templates
// catalog plugin
// TODO switch to new catalog backend once @janus-idp/backstage-plugin-keycloak-backend supports transformers
backend.add(legacyPlugin('catalog', import('./plugins/catalog')));
// TODO switch to new catalog backend once @roadiehq/scaffolder-backend-module-http-request supports it
backend.add(legacyPlugin('scaffolder', import('./plugins/scaffolder')));
backend.add(import('@backstage/plugin-proxy-backend/alpha'))

// docs and search
backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
// permission plugin
backend.add(import('@backstage/plugin-permission-backend/alpha'));
backend.add(import('@internal/backstage-plugin-permission-backend-module-rabe'));

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

// dev
// todo plugin
backend.add(import('@backstage-community/plugin-todo-backend'));

// dev plugin
backend.add(import('@backstage/plugin-devtools-backend'));

backend.start();
87 changes: 0 additions & 87 deletions packages/backend/src/plugins/permission.ts

This file was deleted.

Loading

0 comments on commit df41998

Please sign in to comment.