From df419984bc69ca08727823267ef56a584363572a Mon Sep 17 00:00:00 2001 From: Lucas Date: Wed, 20 Mar 2024 21:04:01 +0100 Subject: [PATCH] feat: Backstage 1.26.4 --- .dockerignore | 1 - Dockerfile | 3 +- app-config.yaml | 2 +- backstage.json | 2 +- packages/app/e2e-tests/app.test.ts | 5 + packages/app/package.json | 64 +- packages/app/public/index.html | 2 +- packages/app/src/App.tsx | 1 + .../app/src/components/catalog/EntityPage.tsx | 6 +- packages/backend/package.json | 63 +- packages/backend/src/index.ts | 29 +- packages/backend/src/plugins/permission.ts | 87 - packages/backend/src/plugins/scaffolder.ts | 35 - playwright.config.ts | 2 +- .../.eslintrc.js | 1 + .../permission-backend-module-rabe/README.md | 5 + .../package.json | 38 + .../src/index.ts | 8 + .../src/module.ts | 19 + .../src/policy.ts | 36 + yarn.lock | 9159 ++++++++++++----- 21 files changed, 6590 insertions(+), 2978 deletions(-) delete mode 100644 packages/backend/src/plugins/permission.ts delete mode 100644 packages/backend/src/plugins/scaffolder.ts create mode 100644 plugins/permission-backend-module-rabe/.eslintrc.js create mode 100644 plugins/permission-backend-module-rabe/README.md create mode 100644 plugins/permission-backend-module-rabe/package.json create mode 100644 plugins/permission-backend-module-rabe/src/index.ts create mode 100644 plugins/permission-backend-module-rabe/src/module.ts create mode 100644 plugins/permission-backend-module-rabe/src/policy.ts diff --git a/.dockerignore b/.dockerignore index ab0b67d..9b46c19 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,7 +2,6 @@ .yarn/install-state.gz node_modules packages/*/node_modules -plugins *.local.yaml trivy.* eslint_report.json diff --git a/Dockerfile b/Dockerfile index d6bfe2d..8bc124f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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" diff --git a/app-config.yaml b/app-config.yaml index a79c0ad..e9768b1 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -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: diff --git a/backstage.json b/backstage.json index dd15498..ce16faf 100644 --- a/backstage.json +++ b/backstage.json @@ -1,3 +1,3 @@ { - "version": "1.23.4" + "version": "1.26.4" } diff --git a/packages/app/e2e-tests/app.test.ts b/packages/app/e2e-tests/app.test.ts index b02ff3e..f5af45c 100644 --- a/packages/app/e2e-tests/app.test.ts +++ b/packages/app/e2e-tests/app.test.ts @@ -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(); }); diff --git a/packages/app/package.json b/packages/app/package.json index 24bd1d5..090dcb2 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -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", @@ -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" }, diff --git a/packages/app/public/index.html b/packages/app/public/index.html index 3337729..18da7c4 100644 --- a/packages/app/public/index.html +++ b/packages/app/public/index.html @@ -6,7 +6,7 @@