feat: update backstage to 1.18 (#151)

radiorabe · Oct 10, 2023 · da817b4 · da817b4
1 parent 760db16
commit da817b4
Show file tree

Hide file tree

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

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -18,40 +18,40 @@
     "cy:run": "cypress run --browser electron"
   },
   "dependencies": {
-    "@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/app-defaults": "^1.4.3",
+    "@backstage/catalog-model": "^1.4.2",
+    "@backstage/cli": "^0.22.13",
+    "@backstage/core-app-api": "^1.10.0",
+    "@backstage/core-components": "^0.13.5",
+    "@backstage/core-plugin-api": "^1.6.0",
+    "@backstage/integration-react": "^1.1.19",
+    "@backstage/plugin-api-docs": "^0.9.11",
+    "@backstage/plugin-catalog": "^1.13.0",
+    "@backstage/plugin-catalog-common": "^1.0.16",
+    "@backstage/plugin-catalog-graph": "^0.2.36",
+    "@backstage/plugin-catalog-import": "^0.10.0",
+    "@backstage/plugin-catalog-react": "^1.8.4",
     "@backstage/plugin-catalog-unprocessed-entities": "^0.1.3",
-    "@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",
+    "@backstage/plugin-devtools": "^0.1.4",
+    "@backstage/plugin-devtools-common": "^0.1.4",
+    "@backstage/plugin-github-actions": "^0.6.5",
+    "@backstage/plugin-github-pull-requests-board": "^0.1.18",
+    "@backstage/plugin-home": "^0.5.8",
+    "@backstage/plugin-org": "^0.6.14",
+    "@backstage/plugin-permission-react": "^0.4.15",
+    "@backstage/plugin-scaffolder": "^1.15.0",
+    "@backstage/plugin-search": "^1.4.0",
+    "@backstage/plugin-search-react": "^1.7.0",
+    "@backstage/plugin-tech-insights": "^0.3.16",
+    "@backstage/plugin-tech-radar": "^0.6.8",
+    "@backstage/plugin-techdocs": "^1.7.0",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.0",
+    "@backstage/plugin-techdocs-react": "^1.1.11",
+    "@backstage/plugin-user-settings": "^0.7.10",
+    "@backstage/theme": "^0.4.2",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "@roadiehq/backstage-plugin-github-insights": "^2.3.15",
+    "@roadiehq/backstage-plugin-github-insights": "^2.3.21",
     "history": "^5.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -60,7 +60,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.4.1",
+    "@backstage/test-utils": "^1.4.3",
     "@testing-library/dom": "^9.3.1",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,31 +16,31 @@
     "build-image": "docker build ../.. -f ../../Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@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.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.3.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",
+    "@backstage/backend-common": "^0.19.7",
+    "@backstage/backend-tasks": "^0.5.10",
+    "@backstage/catalog-client": "^1.4.4",
+    "@backstage/catalog-model": "^1.4.2",
+    "@backstage/config": "^1.1.0",
+    "@backstage/plugin-app-backend": "^0.3.53",
+    "@backstage/plugin-auth-backend": "^0.19.2",
+    "@backstage/plugin-auth-node": "^0.3.2",
+    "@backstage/plugin-catalog-backend": "^1.13.3",
+    "@backstage/plugin-catalog-backend-module-github": "^0.4.3",
+    "@backstage/plugin-catalog-backend-module-unprocessed": "^0.3.2",
+    "@backstage/plugin-devtools-backend": "^0.2.2",
+    "@backstage/plugin-permission-backend": "^0.5.28",
+    "@backstage/plugin-permission-common": "^0.7.8",
+    "@backstage/plugin-permission-node": "^0.7.16",
+    "@backstage/plugin-proxy-backend": "^0.4.2",
+    "@backstage/plugin-scaffolder-backend": "^1.17.3",
+    "@backstage/plugin-search-backend": "^1.4.5",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.14",
+    "@backstage/plugin-search-backend-node": "^1.2.9",
+    "@backstage/plugin-tech-insights-backend": "^0.5.19",
+    "@backstage/plugin-tech-insights-backend-module-jsonfc": "^0.1.37",
+    "@backstage/plugin-techdocs-backend": "^1.7.2",
+    "@janus-idp/backstage-plugin-keycloak-backend": "^1.5.5",
+    "@roadiehq/scaffolder-backend-module-http-request": "^4.0.13",
     "app": "link:../app",
     "better-sqlite3": "^8.0.0",
     "dockerode": "^3.3.1",
@@ -50,7 +50,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.22.9",
+    "@backstage/cli": "^0.22.13",
     "@types/dockerode": "^3.3.19",
     "@types/express": "^4.17.17",
     "@types/express-serve-static-core": "^4.17.35",

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -42,7 +42,7 @@ function makeCreateEnv(config: Config) {
   const cacheManager = CacheManager.fromConfig(config);
   const databaseManager = DatabaseManager.fromConfig(config, { logger: root });
   const tokenManager = ServerTokenManager.fromConfig(config, { logger: root });
-  const taskScheduler = TaskScheduler.fromConfig(config);
+  const taskScheduler = TaskScheduler.fromConfig(config, { databaseManager });
 
   const identity = DefaultIdentityClient.create({
     discovery,