chore: upgrade backstage version

globallogicuki · Sep 9, 2024 · deabb86 · deabb86
1 parent 517ac1c
commit deabb86
Show file tree

Hide file tree

Showing 14 changed files with 1,854 additions and 1,243 deletions.
diff --git a/.changeset/tricky-suits-return.md b/.changeset/tricky-suits-return.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.26.3"
+  "version": "1.30.4"
 }
diff --git a/package.json b/package.json
@@ -33,15 +33,15 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
+    "@backstage/cli": "^0.27.0",
     "@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": "^10.0.0",
     "prettier": "^2.3.2",
-    "typescript": "~5.2.0"
+    "typescript": "~5.4.0"
   },
   "resolutions": {
     "@types/react": "^18",
@@ -58,7 +58,7 @@
     ]
   },
   "dependencies": {
-    "@backstage/repo-tools": "^0.8.0",
+    "@backstage/repo-tools": "^0.9.6",
     "@changesets/cli": "^2.27.1",
     "@useoptic/optic": "^0.54.10"
   }

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -14,31 +14,29 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.5.4",
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/cli": "^0.26.4",
-    "@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.16",
-    "@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-tech-radar": "^0.7.4",
-    "@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.10",
+    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/core-app-api": "^1.14.2",
+    "@backstage/core-components": "^0.14.10",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/integration-react": "^1.1.30",
+    "@backstage/plugin-api-docs": "^0.11.8",
+    "@backstage/plugin-catalog": "^1.22.0",
+    "@backstage/plugin-catalog-common": "^1.0.26",
+    "@backstage/plugin-catalog-graph": "^0.4.8",
+    "@backstage/plugin-catalog-import": "^0.12.2",
+    "@backstage/plugin-catalog-react": "^1.12.3",
+    "@backstage/plugin-org": "^0.6.28",
+    "@backstage/plugin-permission-react": "^0.4.25",
+    "@backstage/plugin-scaffolder": "^1.24.0",
+    "@backstage/plugin-search": "^1.4.15",
+    "@backstage/plugin-search-react": "^1.7.14",
+    "@backstage/plugin-techdocs": "^1.10.8",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.13",
+    "@backstage/plugin-techdocs-react": "^1.2.7",
+    "@backstage/plugin-user-settings": "^0.8.11",
+    "@backstage/theme": "^0.5.6",
     "@globallogicuki/backstage-plugin-terraform": "^0.6.0",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -47,10 +45,11 @@
     "react-dom": "^18.0.2",
     "react-router": "^6.3.0",
     "react-router-dom": "^6.3.0",
-    "react-use": "^17.2.4"
+    "react-use": "^17.2.4",
+    "@backstage-community/plugin-github-actions": "^0.6.16"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/test-utils": "^1.5.10",
     "@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
@@ -13,7 +13,6 @@ import {
 import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
 import { orgPlugin } from '@backstage/plugin-org';
 import { SearchPage } from '@backstage/plugin-search';
-import { TechRadarPage } from '@backstage/plugin-tech-radar';
 import {
   TechDocsIndexPage,
   techdocsPlugin,
@@ -83,10 +82,6 @@ const routes = (
     </Route>
     <Route path="/create" element={<ScaffolderPage />} />
     <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';
@@ -26,6 +25,8 @@ import {
 } from '@backstage/core-components';
 import MenuIcon from '@material-ui/icons/Menu';
 import SearchIcon from '@material-ui/icons/Search';
+import { MyGroupsSidebarItem } from '@backstage/plugin-org';
+import GroupIcon from '@material-ui/icons/People';
 
 const useSidebarLogoStyles = makeStyles({
   root: {
@@ -66,13 +67,18 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
       <SidebarGroup label="Menu" icon={<MenuIcon />}>
         {/* Global nav, not org-specific */}
         <SidebarItem icon={HomeIcon} to="catalog" text="Home" />
+        <MyGroupsSidebarItem
+          singularTitle="My Group"
+          pluralTitle="My Groups"
+          icon={GroupIcon}
+        />
         <SidebarItem icon={ExtensionIcon} to="api-docs" text="APIs" />
         <SidebarItem icon={LibraryBooks} to="docs" text="Docs" />
         <SidebarItem icon={CreateComponentIcon} to="create" text="Create..." />
         {/* 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
@@ -31,7 +31,7 @@ import {
 import {
   isGithubActionsAvailable,
   EntityGithubActionsContent,
-} from '@backstage/plugin-github-actions';
+} from '@backstage-community/plugin-github-actions';
 import {
   EntityUserProfileCard,
   EntityGroupProfileCard,

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,42 +16,43 @@
     "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/catalog-client": "^1.6.4",
-    "@backstage/catalog-model": "^1.4.5",
+    "@backstage/backend-common": "^0.24.1",
+    "@backstage/backend-defaults": "^0.4.4",
+    "@backstage/backend-tasks": "^0.6.1",
+    "@backstage/catalog-client": "^1.6.6",
+    "@backstage/catalog-model": "^1.6.0",
     "@backstage/config": "^1.2.0",
-    "@backstage/plugin-app-backend": "^0.3.65",
-    "@backstage/plugin-auth-backend": "^0.22.4",
-    "@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-pg": "^0.5.26",
-    "@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.73",
+    "@backstage/plugin-auth-backend": "^0.22.12",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.10",
+    "@backstage/plugin-auth-node": "^0.5.1",
+    "@backstage/plugin-catalog-backend": "^1.25.2",
+    "@backstage/plugin-catalog-backend-module-logs": "^0.0.2",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.22",
+    "@backstage/plugin-permission-backend": "^0.5.48",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.21",
+    "@backstage/plugin-permission-common": "^0.8.1",
+    "@backstage/plugin-permission-node": "^0.8.2",
+    "@backstage/plugin-proxy-backend": "^0.5.5",
+    "@backstage/plugin-scaffolder-backend": "^1.24.1",
+    "@backstage/plugin-search-backend": "^1.5.16",
+    "@backstage/plugin-search-backend-module-catalog": "^0.2.1",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.34",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.2.1",
+    "@backstage/plugin-search-backend-node": "^1.3.1",
+    "@backstage/plugin-techdocs-backend": "^1.10.12",
     "@globallogicuki/backstage-plugin-terraform-backend": "^0.4.1",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.1",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
-    "node-gyp": "^9.0.0",
+    "node-gyp": "^10.0.0",
     "pg": "^8.11.3",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
+    "@backstage/cli": "^0.27.0",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",

diff --git a/packages/backend/src/index.test.ts b/packages/backend/src/index.test.ts
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -26,6 +26,7 @@ backend.add(import('@backstage/plugin-catalog-backend/alpha'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
+backend.add(import('@backstage/plugin-catalog-backend-module-logs'));
 
 // permission plugin
 backend.add(import('@backstage/plugin-permission-backend/alpha'));
@@ -35,6 +36,7 @@ backend.add(
 
 // search plugin
 backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));
 backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
 backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
 

diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
diff --git a/plugins/terraform-backend/package.json b/plugins/terraform-backend/package.json
@@ -32,10 +32,10 @@
     "generate-openapi-schema": "backstage-repo-tools package schema openapi generate --server"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.7",
-    "@backstage/backend-defaults": "^0.2.17",
-    "@backstage/backend-openapi-utils": "^0.1.10",
-    "@backstage/backend-plugin-api": "^0.6.17",
+    "@backstage/backend-common": "^0.24.1",
+    "@backstage/backend-defaults": "^0.4.4",
+    "@backstage/backend-openapi-utils": "^0.1.17",
+    "@backstage/backend-plugin-api": "^0.8.1",
     "@backstage/config": "^1.2.0",
     "@types/express": "*",
     "axios": "^1.6.7",
@@ -46,9 +46,9 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
-    "@backstage/plugin-auth-backend": "^0.22.4",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.3",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/plugin-auth-backend": "^0.22.12",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.10",
     "@types/supertest": "^6.0.2",
     "msw": "^1.0.0",
     "supertest": "^6.3.4"

diff --git a/plugins/terraform/package.json b/plugins/terraform/package.json
@@ -32,11 +32,11 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/core-components": "^0.14.4",
-    "@backstage/core-plugin-api": "^1.9.2",
-    "@backstage/plugin-catalog-react": "^1.11.3",
-    "@backstage/theme": "^0.5.3",
+    "@backstage/catalog-model": "^1.6.0",
+    "@backstage/core-components": "^0.14.10",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/plugin-catalog-react": "^1.12.3",
+    "@backstage/theme": "^0.5.6",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
@@ -47,10 +47,10 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.4",
-    "@backstage/core-app-api": "^1.12.4",
-    "@backstage/dev-utils": "^1.0.31",
-    "@backstage/test-utils": "^1.5.4",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/core-app-api": "^1.14.2",
+    "@backstage/dev-utils": "^1.0.37",
+    "@backstage/test-utils": "^1.5.10",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
     "@testing-library/user-event": "^14.0.0",