From c32587dbd21937e94873ca54a5ac68096c570558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20W=C3=BCrbach?= Date: Mon, 22 Apr 2024 23:35:43 +0200 Subject: [PATCH] feat: backstage v1.26.3 --- app-config.production.yaml | 4 + app-config.yaml | 3 +- backstage.json | 2 +- package.json | 2 +- packages/app/e2e-tests/app.test.ts | 6 + packages/app/package.json | 59 +- packages/app/public/index.html | 2 +- packages/app/src/App.tsx | 11 +- .../app/src/components/catalog/EntityPage.tsx | 2 +- packages/backend/package.json | 49 +- packages/backend/src/index.ts | 147 +- packages/backend/src/plugins/app.ts | 14 - packages/backend/src/plugins/auth.ts | 54 - packages/backend/src/plugins/catalog.ts | 14 - packages/backend/src/plugins/proxy.ts | 13 - packages/backend/src/plugins/scaffolder.ts | 54 - packages/backend/src/plugins/search.ts | 66 - packages/backend/src/plugins/techdocs.ts | 51 - playwright.config.ts | 14 +- score.yaml | 1 + yarn.lock | 10174 ++++++++-------- 21 files changed, 5374 insertions(+), 5368 deletions(-) delete mode 100644 packages/backend/src/plugins/app.ts delete mode 100644 packages/backend/src/plugins/auth.ts delete mode 100644 packages/backend/src/plugins/catalog.ts delete mode 100644 packages/backend/src/plugins/proxy.ts delete mode 100644 packages/backend/src/plugins/scaffolder.ts delete mode 100644 packages/backend/src/plugins/search.ts delete mode 100644 packages/backend/src/plugins/techdocs.ts diff --git a/app-config.production.yaml b/app-config.production.yaml index 579400e..be0476b 100644 --- a/app-config.production.yaml +++ b/app-config.production.yaml @@ -13,6 +13,10 @@ backend: user: ${POSTGRES_USER} password: ${POSTGRES_PASSWORD} +auth: + providers: + guest: + dangerouslyAllowOutsideDevelopment: true catalog: rules: diff --git a/app-config.yaml b/app-config.yaml index fcf9bbc..78ba2de 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -35,7 +35,8 @@ techdocs: type: 'local' auth: - providers: {} + providers: + guest: {} scaffolder: diff --git a/backstage.json b/backstage.json index 06d58f6..ae8b9e9 100644 --- a/backstage.json +++ b/backstage.json @@ -1,3 +1,3 @@ { - "version": "1.23.3" + "version": "1.26.3" } diff --git a/package.json b/package.json index 68af32a..be38f9e 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ ] }, "devDependencies": { - "@backstage/cli": "^0.25.2", + "@backstage/cli": "^0.26.4", "@backstage/e2e-test-utils": "^0.1.1", "@playwright/test": "^1.32.3", "@spotify/prettier-config": "^12.0.0", diff --git a/packages/app/e2e-tests/app.test.ts b/packages/app/e2e-tests/app.test.ts index b02ff3e..839ff88 100644 --- a/packages/app/e2e-tests/app.test.ts +++ b/packages/app/e2e-tests/app.test.ts @@ -13,9 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + 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 3c137e9..09c7bf0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -14,36 +14,37 @@ "lint": "backstage-cli package lint" }, "dependencies": { - "@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-github-actions": "^0.6.11", - "@backstage/plugin-org": "^0.6.20", - "@backstage/plugin-permission-react": "^0.4.20", - "@backstage/plugin-scaffolder": "^1.18.0", - "@backstage/plugin-scaffolder-react": "^1.8.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-user-settings": "^0.8.1", - "@backstage/theme": "^0.5.1", - "@frontside/backstage-plugin-humanitec": "^0.3.14", + "@backstage-community/plugin-github-actions": "^0.6.15", + "@backstage-community/plugin-tech-radar": "^0.7.4", + "@backstage/app-defaults": "^1.5.4", + "@backstage/catalog-model": "^1.4.5", + "@backstage/cli": "^0.26.3", + "@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.4", + "@backstage/plugin-catalog-import": "^0.10.10", + "@backstage/plugin-catalog-react": "^1.11.3", + "@backstage/plugin-org": "^0.6.24", + "@backstage/plugin-permission-react": "^0.4.22", + "@backstage/plugin-scaffolder": "^1.19.3", + "@backstage/plugin-scaffolder-react": "^1.8.4", + "@backstage/plugin-search": "^1.4.10", + "@backstage/plugin-search-react": "^1.7.10", + "@backstage/plugin-tech-radar": "^0.7.3", + "@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", + "@frontside/backstage-plugin-humanitec": "^0.3.15", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", - "@rjsf/utils": "^5.14.2", + "backstage-plugin-techdocs-addon-mermaid": "^0.11.0", "history": "^5.0.0", "react": "^18.0.2", "react-dom": "^18.0.2", @@ -52,7 +53,7 @@ "react-use": "^17.2.4" }, "devDependencies": { - "@backstage/test-utils": "^1.5.0", + "@backstage/test-utils": "^1.5.4", "@playwright/test": "^1.32.3", "@testing-library/dom": "^9.0.0", "@testing-library/jest-dom": "^6.0.0", 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 @@