Merge pull request #11 from johanneswuerbach/v1-22

feat: backstage v1.22.2
humanitec-architecture · Feb 1, 2024 · 91e1ffd · 91e1ffd
2 parents ede847f + ce93348
commit 91e1ffd
Show file tree

Hide file tree

Showing 7 changed files with 3,098 additions and 2,864 deletions.
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.21.1"
+  "version": "1.22.2"
 }
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.0",
+    "@backstage/cli": "^0.25.1",
     "@backstage/e2e-test-utils": "^0.1.0",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",
@@ -41,8 +41,8 @@
     "typescript": "~5.2.0"
   },
   "resolutions": {
-    "@types/react": "^17",
-    "@types/react-dom": "^17"
+    "@types/react": "^18",
+    "@types/react-dom": "^18"
   },
   "prettier": "@spotify/prettier-config",
   "lint-staged": {
@@ -55,7 +55,6 @@
     ]
   },
   "dependencies": {
-    "@types/react": "^17",
-    "@types/react-dom": "^17"
+    "@types/react": "^18"
   }
 }
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -14,49 +14,49 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.4.6",
+    "@backstage/app-defaults": "^1.4.7",
     "@backstage/catalog-model": "^1.4.3",
-    "@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/cli": "^0.25.1",
+    "@backstage/core-app-api": "^1.11.3",
+    "@backstage/core-components": "^0.13.10",
+    "@backstage/core-plugin-api": "^1.8.2",
+    "@backstage/integration-react": "^1.1.23",
+    "@backstage/plugin-api-docs": "^0.10.3",
+    "@backstage/plugin-catalog": "^1.16.1",
+    "@backstage/plugin-catalog-common": "^1.0.20",
+    "@backstage/plugin-catalog-graph": "^0.3.3",
+    "@backstage/plugin-catalog-import": "^0.10.5",
+    "@backstage/plugin-catalog-react": "^1.9.3",
+    "@backstage/plugin-github-actions": "^0.6.10",
+    "@backstage/plugin-org": "^0.6.19",
+    "@backstage/plugin-permission-react": "^0.4.19",
+    "@backstage/plugin-scaffolder": "^1.17.1",
+    "@backstage/plugin-scaffolder-react": "^1.7.1",
+    "@backstage/plugin-search": "^1.4.5",
+    "@backstage/plugin-search-react": "^1.7.5",
+    "@backstage/plugin-tech-radar": "^0.6.12",
+    "@backstage/plugin-techdocs": "^1.9.3",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.4",
+    "@backstage/plugin-techdocs-react": "^1.1.15",
+    "@backstage/plugin-user-settings": "^0.8.0",
     "@backstage/theme": "^0.5.0",
     "@frontside/backstage-plugin-humanitec": "^0.3.14",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@rjsf/utils": "^5.14.2",
     "history": "^5.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.2",
+    "react-dom": "^18.0.2",
     "react-router": "^6.3.0",
     "react-router-dom": "^6.3.0",
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.4.6",
+    "@backstage/test-utils": "^1.4.7",
     "@playwright/test": "^1.32.3",
-    "@testing-library/dom": "^8.0.0",
-    "@testing-library/jest-dom": "^5.10.1",
-    "@testing-library/react": "^12.1.3",
+    "@testing-library/dom": "^9.0.0",
+    "@testing-library/jest-dom": "^6.0.0",
+    "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.0.0",
     "@types/react-dom": "*",
     "cross-env": "^7.0.0"

diff --git a/packages/app/src/App.test.tsx b/packages/app/src/App.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderWithEffects } from '@backstage/test-utils';
+import { render, waitFor } from '@testing-library/react';
 import App from './App';
 
 describe('App', () => {
@@ -20,7 +20,9 @@ describe('App', () => {
       ] as any,
     };
 
-    const rendered = await renderWithEffects(<App />);
-    expect(rendered.baseElement).toBeInTheDocument();
+    const rendered = render(<App />);
+    await waitFor(() => {
+      expect(rendered.baseElement).toBeInTheDocument();
+    });
   });
 });
diff --git a/packages/app/src/index.tsx b/packages/app/src/index.tsx
@@ -1,6 +1,6 @@
 import '@backstage/cli/asset-types';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import ReactDOM from 'react-dom/client';
 import App from './App';
 
-ReactDOM.render(<App />, document.getElementById('root'));
+ReactDOM.createRoot(document.getElementById('root')!).render(<App />);
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,25 +16,25 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.20.0",
-    "@backstage/backend-tasks": "^0.5.13",
-    "@backstage/catalog-client": "^1.5.1",
+    "@backstage/backend-common": "^0.20.1",
+    "@backstage/backend-tasks": "^0.5.14",
+    "@backstage/catalog-client": "^1.5.2",
     "@backstage/catalog-model": "^1.4.3",
     "@backstage/config": "^1.1.1",
     "@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",
+    "@backstage/plugin-app-backend": "^0.3.57",
+    "@backstage/plugin-auth-backend": "^0.20.3",
+    "@backstage/plugin-auth-node": "^0.4.3",
+    "@backstage/plugin-catalog-backend": "^1.16.2",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.6",
+    "@backstage/plugin-permission-common": "^0.7.12",
+    "@backstage/plugin-permission-node": "^0.7.20",
+    "@backstage/plugin-proxy-backend": "^0.4.7",
+    "@backstage/plugin-scaffolder-backend": "^1.20.0",
+    "@backstage/plugin-search-backend": "^1.4.9",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.18",
+    "@backstage/plugin-search-backend-node": "^1.2.13",
+    "@backstage/plugin-techdocs-backend": "^1.9.2",
     "@frontside/backstage-plugin-humanitec-backend": "^0.3.14",
     "@roadiehq/scaffolder-backend-module-aws": "^2.4.17",
     "app": "link:../app",
@@ -47,7 +47,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.0",
+    "@backstage/cli": "^0.25.1",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",