Merge pull request #202 from backstage/topic/v1.21.0-next.3

v1.21.0-next.3 version bump

app-config.yaml

@@ -24,7 +24,7 @@ backend:
     port: 7007
   csp:
     connect-src: ["'self'", 'http:', 'https:']
-    img-src: ["'self'", 'data:', 'https://backstage.io']
+    img-src: ["'self'", 'data:', 'https://backstage.io', 'https://img.shields.io']
   cors:
     origin: http://localhost:3000
     methods: [GET, POST, PUT, DELETE]

backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.21.0-next.2"
+  "version": "1.21.0-next.3"
 }

package.json

@@ -40,7 +40,7 @@
     "react-router-dom": "6.19.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.0-next.1",
+    "@backstage/cli": "^0.25.0-next.2",
     "@backstage/e2e-test-utils": "^0.1.0",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^7.0.0",

packages/app/package.json

@@ -7,32 +7,32 @@
   },
   "bundled": true,
   "dependencies": {
-    "@backstage/app-defaults": "^1.4.6-next.1",
+    "@backstage/app-defaults": "^1.4.6-next.2",
     "@backstage/catalog-model": "^1.4.3",
-    "@backstage/cli": "^0.25.0-next.1",
+    "@backstage/cli": "^0.25.0-next.2",
     "@backstage/core-app-api": "^1.11.2-next.1",
-    "@backstage/core-components": "^0.13.9-next.1",
+    "@backstage/core-components": "^0.13.9-next.2",
     "@backstage/core-plugin-api": "^1.8.1-next.1",
     "@backstage/integration-react": "^1.1.22-next.1",
-    "@backstage/plugin-api-docs": "^0.10.2-next.2",
-    "@backstage/plugin-badges": "^0.2.52-next.1",
-    "@backstage/plugin-catalog": "^1.16.0-next.2",
-    "@backstage/plugin-catalog-graph": "^0.3.2-next.1",
-    "@backstage/plugin-catalog-react": "^1.9.2-next.1",
-    "@backstage/plugin-cost-insights": "^0.12.17-next.1",
-    "@backstage/plugin-explore": "^0.4.14-next.1",
-    "@backstage/plugin-github-actions": "^0.6.9-next.1",
-    "@backstage/plugin-graphiql": "^0.3.1-next.2",
-    "@backstage/plugin-home": "^0.6.0-next.1",
-    "@backstage/plugin-org": "^0.6.18-next.1",
-    "@backstage/plugin-search": "^1.4.4-next.2",
-    "@backstage/plugin-search-react": "^1.7.4-next.1",
-    "@backstage/plugin-tech-radar": "^0.6.11-next.2",
-    "@backstage/plugin-techdocs": "^1.9.2-next.2",
-    "@backstage/plugin-todo": "^0.2.32-next.1",
-    "@backstage/plugin-user-settings": "^0.7.14-next.2",
-    "@backstage/test-utils": "^1.4.6-next.1",
-    "@backstage/theme": "^0.5.0-next.0",
+    "@backstage/plugin-api-docs": "^0.10.2-next.3",
+    "@backstage/plugin-badges": "^0.2.52-next.2",
+    "@backstage/plugin-catalog": "^1.16.0-next.3",
+    "@backstage/plugin-catalog-graph": "^0.3.2-next.2",
+    "@backstage/plugin-catalog-react": "^1.9.2-next.2",
+    "@backstage/plugin-cost-insights": "^0.12.17-next.2",
+    "@backstage/plugin-explore": "^0.4.14-next.2",
+    "@backstage/plugin-github-actions": "^0.6.9-next.2",
+    "@backstage/plugin-graphiql": "^0.3.1-next.3",
+    "@backstage/plugin-home": "^0.6.0-next.2",
+    "@backstage/plugin-org": "^0.6.18-next.2",
+    "@backstage/plugin-search": "^1.4.4-next.3",
+    "@backstage/plugin-search-react": "^1.7.4-next.2",
+    "@backstage/plugin-tech-radar": "^0.6.11-next.3",
+    "@backstage/plugin-techdocs": "^1.9.2-next.3",
+    "@backstage/plugin-todo": "^0.2.32-next.2",
+    "@backstage/plugin-user-settings": "^0.7.14-next.3",
+    "@backstage/test-utils": "^1.4.6-next.2",
+    "@backstage/theme": "^0.5.0-next.1",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",

packages/app/src/components/catalog/EntityPage.tsx

@@ -335,9 +335,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>
   </EntityLayoutWrapper>

packages/backend/package.json

@@ -17,31 +17,31 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.20.0-next.1",
-    "@backstage/backend-defaults": "^0.2.8-next.1",
-    "@backstage/backend-tasks": "^0.5.13-next.1",
-    "@backstage/catalog-client": "^1.5.0-next.0",
+    "@backstage/backend-common": "^0.20.0-next.2",
+    "@backstage/backend-defaults": "^0.2.8-next.2",
+    "@backstage/backend-tasks": "^0.5.13-next.2",
+    "@backstage/catalog-client": "^1.5.0-next.1",
     "@backstage/catalog-model": "^1.4.3",
     "@backstage/config": "^1.1.1",
     "@backstage/errors": "^1.2.3",
-    "@backstage/plugin-app-backend": "^0.3.56-next.1",
-    "@backstage/plugin-auth-backend": "^0.20.1-next.1",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.5-next.1",
-    "@backstage/plugin-auth-node": "^0.4.2-next.1",
-    "@backstage/plugin-badges-backend": "^0.3.5-next.1",
-    "@backstage/plugin-catalog-backend": "^1.15.1-next.1",
-    "@backstage/plugin-explore-backend": "^0.0.18-next.1",
+    "@backstage/plugin-app-backend": "^0.3.56-next.2",
+    "@backstage/plugin-auth-backend": "^0.20.1-next.2",
+    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.5-next.2",
+    "@backstage/plugin-auth-node": "^0.4.2-next.2",
+    "@backstage/plugin-badges-backend": "^0.3.5-next.2",
+    "@backstage/plugin-catalog-backend": "^1.16.0-next.2",
+    "@backstage/plugin-explore-backend": "^0.0.18-next.2",
     "@backstage/plugin-explore-common": "^0.0.2",
     "@backstage/plugin-permission-common": "^0.7.10",
-    "@backstage/plugin-permission-node": "^0.7.19-next.1",
-    "@backstage/plugin-proxy-backend": "^0.4.6-next.1",
-    "@backstage/plugin-search-backend": "^1.4.8-next.1",
-    "@backstage/plugin-search-backend-module-catalog": "^0.1.12-next.1",
-    "@backstage/plugin-search-backend-module-explore": "^0.1.12-next.1",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.1.12-next.1",
-    "@backstage/plugin-search-backend-node": "^1.2.12-next.1",
-    "@backstage/plugin-techdocs-backend": "^1.9.1-next.1",
-    "@backstage/plugin-todo-backend": "^0.3.6-next.1",
+    "@backstage/plugin-permission-node": "^0.7.19-next.2",
+    "@backstage/plugin-proxy-backend": "^0.4.6-next.2",
+    "@backstage/plugin-search-backend": "^1.4.8-next.2",
+    "@backstage/plugin-search-backend-module-catalog": "^0.1.12-next.2",
+    "@backstage/plugin-search-backend-module-explore": "^0.1.12-next.2",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.1.12-next.2",
+    "@backstage/plugin-search-backend-node": "^1.2.12-next.2",
+    "@backstage/plugin-techdocs-backend": "^1.9.1-next.2",
+    "@backstage/plugin-todo-backend": "^0.3.6-next.2",
     "@frontside/backstage-plugin-graphql-backend": "^0.1.2",
     "@frontside/backstage-plugin-graphql-backend-module-catalog": "^0.1.2",
     "app": "^0.0.0",
@@ -52,7 +52,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.0-next.1",
+    "@backstage/cli": "^0.25.0-next.2",
     "@types/dockerode": "^3.2.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",