fix: update backstage from 1.15.0 to 1.16.0 (#57)

radiorabe · Jul 20, 2023 · 909f1c7 · 909f1c7
1 parent af04fa1
commit 909f1c7
Show file tree

Hide file tree

Showing 7 changed files with 909 additions and 760 deletions.
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.15.0"
+  "version": "1.16.0"
 }
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.8",
+    "@backstage/cli": "^0.22.9",
     "@spotify/prettier-config": "^15.0.0",
     "concurrently": "^8.2.0",
     "lerna": "^7.0.2",

diff --git a/packages/app/cypress/.eslintrc.json b/packages/app/cypress/.eslintrc.json
@@ -5,7 +5,7 @@
     "jest/expect-expect": [
       "error",
       {
-        "assertFunctionNames": ["expect", "cy.contains"]
+        "assertFunctionNames": ["expect", "cy.contains", "cy.**.should"]
       }
     ]
   }

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -18,37 +18,37 @@
     "cy:run": "cypress run --browser electron"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.4.0",
-    "@backstage/catalog-model": "^1.4.0",
-    "@backstage/cli": "^0.22.8",
-    "@backstage/core-app-api": "^1.8.1",
-    "@backstage/core-components": "^0.13.2",
-    "@backstage/core-plugin-api": "^1.5.2",
-    "@backstage/integration-react": "^1.1.14",
-    "@backstage/plugin-api-docs": "^0.9.5",
-    "@backstage/plugin-catalog": "^1.11.2",
-    "@backstage/plugin-catalog-common": "^1.0.14",
-    "@backstage/plugin-catalog-graph": "^0.2.31",
-    "@backstage/plugin-catalog-import": "^0.9.9",
-    "@backstage/plugin-catalog-react": "^1.7.0",
-    "@backstage/plugin-catalog-unprocessed-entities": "^0.1.0",
-    "@backstage/plugin-devtools": "^0.1.1",
-    "@backstage/plugin-devtools-common": "^0.1.1",
-    "@backstage/plugin-github-actions": "^0.6.0",
-    "@backstage/plugin-github-pull-requests-board": "^0.1.13",
-    "@backstage/plugin-home": "^0.5.3",
-    "@backstage/plugin-org": "^0.6.9",
-    "@backstage/plugin-permission-react": "^0.4.13",
-    "@backstage/plugin-scaffolder": "^1.14.0",
-    "@backstage/plugin-search": "^1.3.2",
-    "@backstage/plugin-search-react": "^1.6.2",
-    "@backstage/plugin-tech-insights": "^0.3.11",
-    "@backstage/plugin-tech-radar": "^0.6.5",
-    "@backstage/plugin-techdocs": "^1.6.4",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.0.14",
-    "@backstage/plugin-techdocs-react": "^1.1.7",
-    "@backstage/plugin-user-settings": "^0.7.4",
-    "@backstage/theme": "^0.4.0",
+    "@backstage/app-defaults": "^1.4.1",
+    "@backstage/catalog-model": "^1.4.1",
+    "@backstage/cli": "^0.22.9",
+    "@backstage/core-app-api": "^1.9.0",
+    "@backstage/core-components": "^0.13.3",
+    "@backstage/core-plugin-api": "^1.5.3",
+    "@backstage/integration-react": "^1.1.15",
+    "@backstage/plugin-api-docs": "^0.9.6",
+    "@backstage/plugin-catalog": "^1.12.0",
+    "@backstage/plugin-catalog-common": "^1.0.15",
+    "@backstage/plugin-catalog-graph": "^0.2.32",
+    "@backstage/plugin-catalog-import": "^0.9.10",
+    "@backstage/plugin-catalog-react": "^1.8.0",
+    "@backstage/plugin-catalog-unprocessed-entities": "^0.1.1",
+    "@backstage/plugin-devtools": "^0.1.2",
+    "@backstage/plugin-devtools-common": "^0.1.2",
+    "@backstage/plugin-github-actions": "^0.6.1",
+    "@backstage/plugin-github-pull-requests-board": "^0.1.14",
+    "@backstage/plugin-home": "^0.5.4",
+    "@backstage/plugin-org": "^0.6.10",
+    "@backstage/plugin-permission-react": "^0.4.14",
+    "@backstage/plugin-scaffolder": "^1.14.1",
+    "@backstage/plugin-search": "^1.3.3",
+    "@backstage/plugin-search-react": "^1.6.3",
+    "@backstage/plugin-tech-insights": "^0.3.12",
+    "@backstage/plugin-tech-radar": "^0.6.6",
+    "@backstage/plugin-techdocs": "^1.6.5",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.0.15",
+    "@backstage/plugin-techdocs-react": "^1.1.8",
+    "@backstage/plugin-user-settings": "^0.7.5",
+    "@backstage/theme": "^0.4.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@roadiehq/backstage-plugin-github-insights": "^2.3.15",
@@ -60,7 +60,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.4.0",
+    "@backstage/test-utils": "^1.4.1",
     "@testing-library/dom": "^9.3.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",

diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
@@ -26,6 +26,8 @@ import {
   isKind,
   hasCatalogProcessingErrors,
   isOrphan,
+  hasRelationWarnings,
+  EntityRelationWarning,
 } from '@backstage/plugin-catalog';
 import {
   EntityGithubActionsContent,
@@ -105,6 +107,14 @@ const entityWarningContent = (
       </EntitySwitch.Case>
     </EntitySwitch>
 
+    <EntitySwitch>
+      <EntitySwitch.Case if={hasRelationWarnings}>
+        <Grid item xs={12}>
+          <EntityRelationWarning />
+        </Grid>
+      </EntitySwitch.Case>
+    </EntitySwitch>
+
     <EntitySwitch>
       <EntitySwitch.Case if={hasCatalogProcessingErrors}>
         <Grid item xs={12}>

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,29 +16,29 @@
     "build-image": "docker build ../.. -f ../../Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.19.0",
-    "@backstage/backend-tasks": "^0.5.3",
-    "@backstage/catalog-client": "^1.4.2",
-    "@backstage/catalog-model": "^1.4.0",
+    "@backstage/backend-common": "^0.19.1",
+    "@backstage/backend-tasks": "^0.5.4",
+    "@backstage/catalog-client": "^1.4.3",
+    "@backstage/catalog-model": "^1.4.1",
     "@backstage/config": "^1.0.8",
-    "@backstage/plugin-app-backend": "^0.3.46",
-    "@backstage/plugin-auth-backend": "^0.18.4",
-    "@backstage/plugin-auth-node": "^0.2.15",
-    "@backstage/plugin-catalog-backend": "^1.10.0",
-    "@backstage/plugin-catalog-backend-module-github": "^0.3.1",
-    "@backstage/plugin-catalog-backend-module-unprocessed": "^0.1.0",
-    "@backstage/plugin-devtools-backend": "^0.1.1",
-    "@backstage/plugin-permission-backend": "^0.5.21",
-    "@backstage/plugin-permission-common": "^0.7.6",
-    "@backstage/plugin-permission-node": "^0.7.9",
-    "@backstage/plugin-proxy-backend": "^0.2.40",
-    "@backstage/plugin-scaffolder-backend": "^1.15.0",
-    "@backstage/plugin-search-backend": "^1.3.2",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.7",
-    "@backstage/plugin-search-backend-node": "^1.2.2",
-    "@backstage/plugin-tech-insights-backend": "^0.5.12",
-    "@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.30",
-    "@backstage/plugin-techdocs-backend": "^1.6.3",
+    "@backstage/plugin-app-backend": "^0.3.47",
+    "@backstage/plugin-auth-backend": "^0.18.5",
+    "@backstage/plugin-auth-node": "^0.2.16",
+    "@backstage/plugin-catalog-backend": "^1.11.0",
+    "@backstage/plugin-catalog-backend-module-github": "^0.3.2",
+    "@backstage/plugin-catalog-backend-module-unprocessed": "^0.1.1",
+    "@backstage/plugin-devtools-backend": "^0.1.2",
+    "@backstage/plugin-permission-backend": "^0.5.22",
+    "@backstage/plugin-permission-common": "^0.7.7",
+    "@backstage/plugin-permission-node": "^0.7.10",
+    "@backstage/plugin-proxy-backend": "^0.2.41",
+    "@backstage/plugin-scaffolder-backend": "^1.15.1",
+    "@backstage/plugin-search-backend": "^1.3.3",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.8",
+    "@backstage/plugin-search-backend-node": "^1.2.3",
+    "@backstage/plugin-tech-insights-backend": "^0.5.13",
+    "@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.31",
+    "@backstage/plugin-techdocs-backend": "^1.6.4",
     "@janus-idp/backstage-plugin-keycloak-backend": "^1.3.10",
     "@roadiehq/scaffolder-backend-module-http-request": "^4.0.9",
     "app": "link:../app",
@@ -50,7 +50,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.8",
+    "@backstage/cli": "^0.22.9",
     "@types/dockerode": "^3.3.19",
     "@types/express": "^4.17.17",
     "@types/express-serve-static-core": "^4.17.35",