chore: bump backstage

humanitec · Jun 24, 2024 · 2788865 · 2788865
1 parent ab9c3b9
commit 2788865
Show file tree

Hide file tree

Showing 17 changed files with 4,435 additions and 5,055 deletions.
diff --git a/.changeset/calm-cobras-burn.md b/.changeset/calm-cobras-burn.md
@@ -0,0 +1,8 @@
+---
+'@humanitec/backstage-plugin-scaffolder-backend-module': patch
+'@humanitec/backstage-plugin-backend': patch
+'@humanitec/backstage-plugin-common': patch
+'@humanitec/backstage-plugin': patch
+---
+
+update dependencies
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,4 +24,5 @@ jobs:
       - run: yarn tsc
       - run: yarn test:all
       - run: yarn build:all
+      - run: yarn fix --check --publish
       - run: ./scripts/build-dynamic-plugins.sh
diff --git a/app-config.production.yaml b/app-config.production.yaml
@@ -13,7 +13,7 @@ backend:
   # all interfaces, the most permissive setting. The right value depends on your specific deployment.
   listen: ':7007'
 
-  # config options: https://node-postgres.com/api/client
+  # config options: https://node-postgres.com/apis/client
   database:
     client: pg
     connection:

diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.26.0"
+  "version": "1.28.2"
 }
diff --git a/package.json b/package.json
@@ -33,15 +33,15 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3",
+    "@backstage/cli": "^0.26.9",
     "@backstage/e2e-test-utils": "^0.1.1",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",
     "concurrently": "^8.0.0",
     "lerna": "^7.3.0",
-    "node-gyp": "^9.0.0",
+    "node-gyp": "^10.0.0",
     "prettier": "^2.3.2",
-    "typescript": "~5.3.0"
+    "typescript": "~5.4.0"
   },
   "resolutions": {
     "@types/react": "^18",
@@ -58,7 +58,8 @@
     ]
   },
   "dependencies": {
-    "@changesets/cli": "^2.27.1"
+    "@changesets/cli": "^2.27.1",
+    "@types/react": "^18"
   },
   "packageManager": "[email protected]+sha512.ca75da26c00327d26267ce33536e5790f18ebd53266796fbb664d2a4a5116308042dd8ee7003b276a20eace7d3c5561c3577bdd71bcb67071187af124779620a"
 }
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -14,32 +14,30 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@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-github-actions": "^0.6.15",
-    "@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.5",
-    "@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",
+    "@backstage/app-defaults": "^1.5.6",
+    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/cli": "^0.26.9",
+    "@backstage/core-app-api": "^1.12.6",
+    "@backstage/core-components": "^0.14.8",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/integration-react": "^1.1.28",
+    "@backstage/plugin-api-docs": "^0.11.6",
+    "@backstage/plugin-catalog": "^1.21.0",
+    "@backstage/plugin-catalog-common": "^1.0.24",
+    "@backstage/plugin-catalog-graph": "^0.4.6",
+    "@backstage/plugin-catalog-import": "^0.12.0",
+    "@backstage/plugin-catalog-react": "^1.12.1",
+    "@backstage/plugin-org": "^0.6.26",
+    "@backstage/plugin-permission-react": "^0.4.23",
+    "@backstage/plugin-scaffolder": "^1.21.0",
+    "@backstage/plugin-scaffolder-react": "^1.9.0",
+    "@backstage/plugin-search": "^1.4.12",
+    "@backstage/plugin-search-react": "^1.7.12",
+    "@backstage/plugin-techdocs": "^1.10.6",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.11",
+    "@backstage/plugin-techdocs-react": "^1.2.5",
+    "@backstage/plugin-user-settings": "^0.8.7",
+    "@backstage/theme": "^0.5.6",
     "@humanitec/backstage-plugin": "^0.7.0",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -51,7 +49,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/test-utils": "^1.5.6",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -14,7 +14,6 @@ import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder-react';
 import { orgPlugin } from '@backstage/plugin-org';
 import { SearchPage } from '@backstage/plugin-search';
-import { TechRadarPage } from '@backstage/plugin-tech-radar';
 import {
   TechDocsIndexPage,
   techdocsPlugin,
@@ -89,10 +88,6 @@ const routes = (
       </ScaffolderFieldExtensions>
     </Route>
     <Route path="/api-docs" element={<ApiExplorerPage />} />
-    <Route
-      path="/tech-radar"
-      element={<TechRadarPage width={1500} height={800} />}
-    />
     <Route
       path="/catalog-import"
       element={

diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx
@@ -2,7 +2,6 @@ import React, { PropsWithChildren } from 'react';
 import { makeStyles } from '@material-ui/core';
 import HomeIcon from '@material-ui/icons/Home';
 import ExtensionIcon from '@material-ui/icons/Extension';
-import MapIcon from '@material-ui/icons/MyLocation';
 import LibraryBooks from '@material-ui/icons/LibraryBooks';
 import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
 import LogoFull from './LogoFull';
@@ -72,7 +71,7 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
         {/* End global nav */}
         <SidebarDivider />
         <SidebarScrollWrapper>
-          <SidebarItem icon={MapIcon} to="tech-radar" text="Tech Radar" />
+          {/* Items in this group will be scrollable if they run out of space */}
         </SidebarScrollWrapper>
       </SidebarGroup>
       <SidebarSpace />

diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
@@ -28,10 +28,6 @@ import {
   hasRelationWarnings,
   EntityRelationWarning,
 } from '@backstage/plugin-catalog';
-import {
-  isGithubActionsAvailable,
-  EntityGithubActionsContent,
-} from '@backstage/plugin-github-actions';
 import {
   EntityUserProfileCard,
   EntityGroupProfileCard,
@@ -74,9 +70,13 @@ const cicdContent = (
   // This is an example of how you can implement your company's logic in entity page.
   // You can for example enforce that all components of type 'service' should use GitHubActions
   <EntitySwitch>
-    <EntitySwitch.Case if={isGithubActionsAvailable}>
-      <EntityGithubActionsContent />
-    </EntitySwitch.Case>
+    {/*
+      Here you can add support for different CI/CD services, for example
+      using @backstage-community/plugin-github-actions as follows:
+      <EntitySwitch.Case if={isGithubActionsAvailable}>
+        <EntityGithubActionsContent />
+      </EntitySwitch.Case>
+     */}
 
     <EntitySwitch.Case>
       <EmptyState

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,41 +16,39 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.7",
-    "@backstage/backend-defaults": "^0.2.17",
-    "@backstage/backend-tasks": "^0.5.22",
+    "@backstage/backend-common": "^0.23.1",
+    "@backstage/backend-defaults": "^0.3.2",
+    "@backstage/backend-tasks": "^0.5.25",
     "@backstage/config": "^1.2.0",
-    "@backstage/plugin-app-backend": "^0.3.65",
-    "@backstage/plugin-auth-backend": "^0.22.4",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.14",
-    "@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-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.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-techdocs": "^0.1.22",
-    "@backstage/plugin-search-backend-node": "^1.2.21",
-    "@backstage/plugin-techdocs-backend": "^1.10.4",
+    "@backstage/plugin-app-backend": "^0.3.69",
+    "@backstage/plugin-auth-backend": "^0.22.7",
+    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.17",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.6",
+    "@backstage/plugin-auth-node": "^0.4.15",
+    "@backstage/plugin-catalog-backend": "^1.23.1",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.18",
+    "@backstage/plugin-permission-backend": "^0.5.44",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.17",
+    "@backstage/plugin-permission-common": "^0.7.14",
+    "@backstage/plugin-permission-node": "^0.7.31",
+    "@backstage/plugin-proxy-backend": "^0.5.1",
+    "@backstage/plugin-scaffolder-backend": "^1.22.10",
+    "@backstage/plugin-search-backend": "^1.5.12",
+    "@backstage/plugin-search-backend-module-catalog": "^0.1.26",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.1.25",
+    "@backstage/plugin-search-backend-node": "^1.2.25",
+    "@backstage/plugin-techdocs-backend": "^1.10.7",
     "@humanitec/backstage-plugin-backend": "^0.6.3",
     "@humanitec/backstage-plugin-scaffolder-backend-module": "^0.3.0",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
-    "dockerode": "^3.3.1",
     "express": "^4.19.2",
-    "node-gyp": "^9.0.0",
+    "node-gyp": "^10.0.0",
     "pg": "^8.11.3",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3",
-    "@types/dockerode": "^3.3.0",
+    "@backstage/cli": "^0.26.9",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
     "@types/luxon": "^2.0.4"

diff --git a/packages/backend/src/index.test.ts b/packages/backend/src/index.test.ts
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
diff --git a/plugins/humanitec-backend-scaffolder-module/package.json b/plugins/humanitec-backend-scaffolder-module/package.json
@@ -10,7 +10,9 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin-module"
+    "role": "backend-plugin-module",
+    "pluginId": "scaffolder",
+    "pluginPackage": "@backstage/plugin-scaffolder-backend"
   },
   "scripts": {
     "start": "backstage-cli package start",
@@ -22,13 +24,13 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-plugin-api": "^0.6.17",
-    "@backstage/plugin-scaffolder-node": "^0.3.3",
+    "@backstage/backend-plugin-api": "^0.6.20",
+    "@backstage/plugin-scaffolder-node": "^0.4.6",
     "@humanitec/backstage-plugin-common": "^0.5.1",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3",
+    "@backstage/cli": "^0.26.9",
     "@types/js-yaml": "^4.0.5",
     "@types/supertest": "^2.0.8",
     "msw": "^1.0.0",

diff --git a/plugins/humanitec-backend/package.json b/plugins/humanitec-backend/package.json
@@ -10,7 +10,12 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin"
+    "role": "backend-plugin",
+    "pluginId": "humanitec",
+    "pluginPackages": [
+      "@humanitec/backstage-plugin",
+      "@humanitec/backstage-plugin-backend"
+    ]
   },
   "scripts": {
     "start": "backstage-cli package start",
@@ -22,8 +27,8 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.7",
-    "@backstage/backend-plugin-api": "^0.6.17",
+    "@backstage/backend-common": "^0.23.1",
+    "@backstage/backend-plugin-api": "^0.6.20",
     "@backstage/config": "^1.2.0",
     "@humanitec/backstage-plugin-common": "^0.5.1",
     "@types/express": "*",
@@ -35,7 +40,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3",
+    "@backstage/cli": "^0.26.9",
     "@types/supertest": "^2.0.8",
     "msw": "^1.0.0",
     "supertest": "^6.2.4"

diff --git a/plugins/humanitec-common/package.json b/plugins/humanitec-common/package.json
@@ -14,6 +14,7 @@
   "backstage": {
     "role": "common-library"
   },
+  "sideEffects": false,
   "scripts": {
     "build": "backstage-cli package build",
     "lint": "backstage-cli package lint",
@@ -28,7 +29,7 @@
     "zod": "^3.17.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.3"
+    "@backstage/cli": "^0.26.9"
   },
   "files": [
     "dist"