Merge pull request #6 from johanneswuerbach/v1-21

feat: backstage v1.21.1
humanitec-architecture · Dec 22, 2023 · 60bf11f · 60bf11f
2 parents 46e888a + e131b54
commit 60bf11f
Show file tree

Hide file tree

Showing 6 changed files with 3,677 additions and 2,988 deletions.
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.20.3"
+  "version": "1.21.1"
 }
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.24.0",
+    "@backstage/cli": "^0.25.0",
     "@backstage/e2e-test-utils": "^0.1.0",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",
@@ -55,6 +55,7 @@
     ]
   },
   "dependencies": {
-    "@types/react": "^17"
+    "@types/react": "^17",
+    "@types/react-dom": "^17"
   }
 }
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -14,33 +14,33 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.4.5",
+    "@backstage/app-defaults": "^1.4.6",
     "@backstage/catalog-model": "^1.4.3",
-    "@backstage/cli": "^0.24.0",
-    "@backstage/core-app-api": "^1.11.1",
-    "@backstage/core-components": "^0.13.8",
-    "@backstage/core-plugin-api": "^1.8.0",
-    "@backstage/integration-react": "^1.1.21",
-    "@backstage/plugin-api-docs": "^0.10.1",
-    "@backstage/plugin-catalog": "^1.15.1",
-    "@backstage/plugin-catalog-common": "^1.0.18",
-    "@backstage/plugin-catalog-graph": "^0.3.1",
-    "@backstage/plugin-catalog-import": "^0.10.3",
-    "@backstage/plugin-catalog-react": "^1.9.1",
-    "@backstage/plugin-github-actions": "^0.6.8",
-    "@backstage/plugin-org": "^0.6.17",
-    "@backstage/plugin-permission-react": "^0.4.17",
-    "@backstage/plugin-scaffolder": "^1.16.1",
-    "@backstage/plugin-scaffolder-react": "^1.6.1",
-    "@backstage/plugin-search": "^1.4.3",
-    "@backstage/plugin-search-react": "^1.7.3",
-    "@backstage/plugin-tech-radar": "^0.6.10",
-    "@backstage/plugin-techdocs": "^1.9.1",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.2",
-    "@backstage/plugin-techdocs-react": "^1.1.13",
-    "@backstage/plugin-user-settings": "^0.7.13",
-    "@backstage/theme": "^0.4.4",
-    "@frontside/backstage-plugin-humanitec": "^0.3.11",
+    "@backstage/cli": "^0.25.0",
+    "@backstage/core-app-api": "^1.11.2",
+    "@backstage/core-components": "^0.13.9",
+    "@backstage/core-plugin-api": "^1.8.1",
+    "@backstage/integration-react": "^1.1.22",
+    "@backstage/plugin-api-docs": "^0.10.2",
+    "@backstage/plugin-catalog": "^1.16.0",
+    "@backstage/plugin-catalog-common": "^1.0.19",
+    "@backstage/plugin-catalog-graph": "^0.3.2",
+    "@backstage/plugin-catalog-import": "^0.10.4",
+    "@backstage/plugin-catalog-react": "^1.9.2",
+    "@backstage/plugin-github-actions": "^0.6.9",
+    "@backstage/plugin-org": "^0.6.18",
+    "@backstage/plugin-permission-react": "^0.4.18",
+    "@backstage/plugin-scaffolder": "^1.17.0",
+    "@backstage/plugin-scaffolder-react": "^1.7.0",
+    "@backstage/plugin-search": "^1.4.4",
+    "@backstage/plugin-search-react": "^1.7.4",
+    "@backstage/plugin-tech-radar": "^0.6.11",
+    "@backstage/plugin-techdocs": "^1.9.2",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.3",
+    "@backstage/plugin-techdocs-react": "^1.1.14",
+    "@backstage/plugin-user-settings": "^0.7.14",
+    "@backstage/theme": "^0.5.0",
+    "@frontside/backstage-plugin-humanitec": "^0.3.12",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@rjsf/utils": "^5.14.2",
@@ -52,7 +52,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.4.5",
+    "@backstage/test-utils": "^1.4.6",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^8.0.0",
     "@testing-library/jest-dom": "^5.10.1",

diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
@@ -304,9 +304,12 @@ const groupPage = (
         <Grid item xs={12} md={6}>
           <EntityOwnershipCard variant="gridItem" />
         </Grid>
-        <Grid item xs={12}>
+        <Grid item xs={12} md={6}>
           <EntityMembersListCard />
         </Grid>
+        <Grid item xs={12} md={6}>
+          <EntityLinksCard />
+        </Grid>
       </Grid>
     </EntityLayout.Route>
   </EntityLayout>

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,27 +16,27 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.19.9",
-    "@backstage/backend-tasks": "^0.5.12",
-    "@backstage/catalog-client": "^1.4.6",
+    "@backstage/backend-common": "^0.20.0",
+    "@backstage/backend-tasks": "^0.5.13",
+    "@backstage/catalog-client": "^1.5.1",
     "@backstage/catalog-model": "^1.4.3",
     "@backstage/config": "^1.1.1",
-    "@backstage/integration": "^1.7.2",
-    "@backstage/plugin-app-backend": "^0.3.55",
-    "@backstage/plugin-auth-backend": "^0.20.0",
-    "@backstage/plugin-auth-node": "^0.4.1",
-    "@backstage/plugin-catalog-backend": "^1.15.0",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.4",
-    "@backstage/plugin-permission-common": "^0.7.10",
-    "@backstage/plugin-permission-node": "^0.7.18",
-    "@backstage/plugin-proxy-backend": "^0.4.5",
-    "@backstage/plugin-scaffolder-backend": "^1.19.1",
-    "@backstage/plugin-search-backend": "^1.4.7",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.16",
-    "@backstage/plugin-search-backend-node": "^1.2.11",
-    "@backstage/plugin-techdocs-backend": "^1.9.0",
-    "@frontside/backstage-plugin-humanitec-backend": "^0.3.11",
-    "@roadiehq/scaffolder-backend-module-aws": "^2.4.16",
+    "@backstage/integration": "^1.8.0",
+    "@backstage/plugin-app-backend": "^0.3.56",
+    "@backstage/plugin-auth-backend": "^0.20.2",
+    "@backstage/plugin-auth-node": "^0.4.2",
+    "@backstage/plugin-catalog-backend": "^1.16.0",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.5",
+    "@backstage/plugin-permission-common": "^0.7.11",
+    "@backstage/plugin-permission-node": "^0.7.19",
+    "@backstage/plugin-proxy-backend": "^0.4.6",
+    "@backstage/plugin-scaffolder-backend": "^1.19.2",
+    "@backstage/plugin-search-backend": "^1.4.8",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.17",
+    "@backstage/plugin-search-backend-node": "^1.2.12",
+    "@backstage/plugin-techdocs-backend": "^1.9.1",
+    "@frontside/backstage-plugin-humanitec-backend": "^0.3.12",
+    "@roadiehq/scaffolder-backend-module-aws": "^2.4.17",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.1",
@@ -47,7 +47,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.24.0",
+    "@backstage/cli": "^0.25.0",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",