Merge pull request #406 from thefrontside/dl/update-deps

Update backstage packages
thefrontside · Jul 30, 2024 · 39b7b1f · 39b7b1f
2 parents 89a0523 + ca6ac80
commit 39b7b1f
Show file tree

Hide file tree

Showing 23 changed files with 3,519 additions and 2,345 deletions.
diff --git a/.changeset/sweet-nails-act.md b/.changeset/sweet-nails-act.md
@@ -0,0 +1,21 @@
+---
+'@frontside/backstage-plugin-graphql-backend-module-catalog': patch
+'@frontside/backstage-plugin-incremental-ingestion-backend': patch
+'@frontside/backstage-plugin-incremental-ingestion-github': patch
+'@frontside/backstage-plugin-scaffolder-workflow': patch
+'@frontside/backstage-plugin-effection-inspector-backend': patch
+'@frontside/scaffolder-yaml-actions': patch
+'@frontside/backstage-plugin-graphql-backend-node': patch
+'@frontside/backstage-plugin-effection-inspector': patch
+'@frontside/backstage-plugin-humanitec-backend': patch
+'@frontside/backstage-ingestion-tests': patch
+'@frontside/backstage-plugin-humanitec-common': patch
+'@frontside/backstage-plugin-graphql-backend': patch
+'@frontside/backstage-plugin-batch-loader': patch
+'@internal/plugin-healthcheck': patch
+'@frontside/backstage-plugin-humanitec': patch
+'backend': patch
+'app': patch
+---
+
+Update backstage deps
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.20.3"
+  "version": "1.29.2"
 }
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.11",
     "@changesets/cli": "^2.22.0",
     "@spotify/prettier-config": "^12.0.0",
     "concurrently": "^7.5.0",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -7,32 +7,32 @@
   },
   "bundled": true,
   "dependencies": {
-    "@backstage/app-defaults": "^1.4.5",
-    "@backstage/catalog-model": "^1.4.3",
-    "@backstage/cli": "^0.25.2",
-    "@backstage/core-app-api": "^1.11.1",
-    "@backstage/core-components": "^0.14.0",
-    "@backstage/core-plugin-api": "^1.8.0",
-    "@backstage/integration-react": "^1.1.21",
-    "@backstage/plugin-api-docs": "^0.11.0",
-    "@backstage/plugin-catalog": "^1.15.1",
-    "@backstage/plugin-catalog-graph": "^0.4.0",
-    "@backstage/plugin-catalog-import": "^0.10.3",
-    "@backstage/plugin-catalog-react": "^1.9.1",
-    "@backstage/plugin-catalog-unprocessed-entities": "^0.1.5",
-    "@backstage/plugin-github-actions": "^0.6.8",
-    "@backstage/plugin-graphiql": "^0.3.0",
-    "@backstage/plugin-org": "^0.6.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.8.1",
-    "@backstage/theme": "^0.5.1",
+    "@backstage/app-defaults": "^1.5.9",
+    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/cli": "^0.26.11",
+    "@backstage/core-app-api": "^1.14.1",
+    "@backstage/core-components": "^0.14.9",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/integration-react": "^1.1.29",
+    "@backstage/plugin-api-docs": "^0.11.7",
+    "@backstage/plugin-catalog": "^1.21.1",
+    "@backstage/plugin-catalog-graph": "^0.4.7",
+    "@backstage/plugin-catalog-import": "^0.12.1",
+    "@backstage/plugin-catalog-react": "^1.12.2",
+    "@backstage/plugin-catalog-unprocessed-entities": "^0.2.6",
+    "@backstage/plugin-github-actions": "^0.6.16",
+    "@backstage/plugin-graphiql": "^0.3.8",
+    "@backstage/plugin-org": "^0.6.27",
+    "@backstage/plugin-scaffolder": "^1.23.0",
+    "@backstage/plugin-scaffolder-react": "^1.10.0",
+    "@backstage/plugin-search": "^1.4.14",
+    "@backstage/plugin-search-react": "^1.7.13",
+    "@backstage/plugin-tech-radar": "^0.7.4",
+    "@backstage/plugin-techdocs": "^1.10.7",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.12",
+    "@backstage/plugin-techdocs-react": "^1.2.6",
+    "@backstage/plugin-user-settings": "^0.8.10",
+    "@backstage/theme": "^0.5.6",
     "@backstage/types": "^1.1.1",
     "@frontside/backstage-plugin-effection-inspector": "^0.1.12",
     "@frontside/backstage-plugin-humanitec": "^0.3.15",
@@ -50,7 +50,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.0",
+    "@backstage/test-utils": "^1.5.9",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.5.1",

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -17,29 +17,29 @@
     "migrate:create": "knex migrate:make -x ts"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.3",
-    "@backstage/backend-tasks": "^0.5.12",
-    "@backstage/catalog-client": "^1.4.6",
-    "@backstage/catalog-model": "^1.4.3",
-    "@backstage/config": "^1.1.1",
-    "@backstage/errors": "^1.2.3",
-    "@backstage/integration": "^1.7.2",
-    "@backstage/plugin-app-backend": "^0.3.55",
-    "@backstage/plugin-auth-backend": "^0.21.3",
-    "@backstage/plugin-auth-node": "^0.4.1",
-    "@backstage/plugin-catalog-backend": "^1.15.0",
-    "@backstage/plugin-catalog-backend-module-github": "^0.5.3",
-    "@backstage/plugin-catalog-backend-module-unprocessed": "^0.3.4",
-    "@backstage/plugin-catalog-graph": "^0.4.0",
-    "@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-scaffolder-node": "^0.3.3",
-    "@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",
+    "@backstage/backend-common": "^0.23.3",
+    "@backstage/backend-tasks": "^0.5.27",
+    "@backstage/catalog-client": "^1.6.5",
+    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/config": "^1.2.0",
+    "@backstage/errors": "^1.2.4",
+    "@backstage/integration": "^1.13.0",
+    "@backstage/plugin-app-backend": "^0.3.71",
+    "@backstage/plugin-auth-backend": "^0.22.9",
+    "@backstage/plugin-auth-node": "^0.4.17",
+    "@backstage/plugin-catalog-backend": "^1.24.0",
+    "@backstage/plugin-catalog-backend-module-github": "^0.6.5",
+    "@backstage/plugin-catalog-backend-module-unprocessed": "^0.4.9",
+    "@backstage/plugin-catalog-graph": "^0.4.7",
+    "@backstage/plugin-permission-common": "^0.8.0",
+    "@backstage/plugin-permission-node": "^0.8.0",
+    "@backstage/plugin-proxy-backend": "^0.5.3",
+    "@backstage/plugin-scaffolder-backend": "^1.23.0",
+    "@backstage/plugin-scaffolder-node": "^0.4.8",
+    "@backstage/plugin-search-backend": "^1.5.14",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.32",
+    "@backstage/plugin-search-backend-node": "^1.2.27",
+    "@backstage/plugin-techdocs-backend": "^1.10.9",
     "@frontside/backstage-plugin-batch-loader": "0.4.1",
     "@frontside/backstage-plugin-effection-inspector-backend": "0.1.12",
     "@frontside/backstage-plugin-graphql-backend": "^0.1.8",
@@ -71,7 +71,7 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.11",
     "@octokit/types": "^6.34.0",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",

diff --git a/packages/backend/src/plugins/catalog.ts b/packages/backend/src/plugins/catalog.ts
@@ -25,10 +25,12 @@ export default async function createPlugin(
   // before incremental builder migrations are executed
   await incrementalBuilder.build();
 
-  const unprocessed = new UnprocessedEntitiesModule(
-    await env.database.getClient(),
+  const unprocessed = UnprocessedEntitiesModule.create({
+    database: await env.database.getClient(),
     router,
-  );
+    discovery: env.discovery,
+    permissions: env.permissions
+  });
 
   unprocessed.registerRoutes();
 

diff --git a/packages/ingestion-tests/package.json b/packages/ingestion-tests/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@frontside/backstage-ingestion-tests",
   "version": "0.7.1",
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -21,11 +22,11 @@
     "role": "common-library"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.3",
-    "@backstage/catalog-client": "^1.4.6",
-    "@backstage/cli": "^0.25.2",
-    "@backstage/config": "^1.1.1",
-    "@backstage/integration": "^1.7.2",
+    "@backstage/backend-common": "^0.23.3",
+    "@backstage/catalog-client": "^1.6.5",
+    "@backstage/cli": "^0.26.11",
+    "@backstage/config": "^1.2.0",
+    "@backstage/integration": "^1.13.0",
     "@effection/process": "^2.0.4",
     "@effection/vitest": "^2.1.0",
     "@frontside/graphgen": "^1.6.0",

diff --git a/plugins/batch-loader/package.json b/plugins/batch-loader/package.json
@@ -13,6 +13,7 @@
   "backstage": {
     "role": "common-library"
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -23,17 +24,17 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.3",
-    "@backstage/catalog-model": "^1.4.3",
+    "@backstage/backend-common": "^0.23.3",
+    "@backstage/catalog-model": "^1.5.0",
     "knex": "^3.0.1",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
-    "@backstage/config": "^1.1.1",
-    "@backstage/integration": "^1.7.2",
-    "@backstage/plugin-catalog-backend": "^1.15.0",
-    "@backstage/plugin-permission-node": "^0.7.18",
+    "@backstage/cli": "^0.26.11",
+    "@backstage/config": "^1.2.0",
+    "@backstage/integration": "^1.13.0",
+    "@backstage/plugin-catalog-backend": "^1.24.0",
+    "@backstage/plugin-permission-node": "^0.8.0",
     "@effection/jest": "^2.0.4",
     "effection": "^2.0.6",
     "jest": "^29.2.2"

diff --git a/plugins/effection-inspector-backend/package.json b/plugins/effection-inspector-backend/package.json
@@ -10,7 +10,12 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "backend-plugin"
+    "role": "backend-plugin",
+    "pluginId": "effection-inspector",
+    "pluginPackages": [
+      "@frontside/backstage-plugin-effection-inspector",
+      "@frontside/backstage-plugin-effection-inspector-backend"
+    ]
   },
   "scripts": {
     "start": "backstage-cli package start",
@@ -22,8 +27,8 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.3",
-    "@backstage/config": "^1.1.1",
+    "@backstage/backend-common": "^0.23.3",
+    "@backstage/config": "^1.2.0",
     "@effection/inspect-utils": "^2.1.6",
     "@types/express": "*",
     "effection": "^2.0.6",
@@ -34,7 +39,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.11",
     "@types/supertest": "^2.0.8",
     "msw": "^0.35.0",
     "supertest": "^4.0.2"

diff --git a/plugins/effection-inspector/package.json b/plugins/effection-inspector/package.json
@@ -10,8 +10,14 @@
     "types": "dist/index.d.ts"
   },
   "backstage": {
-    "role": "frontend-plugin"
+    "role": "frontend-plugin",
+    "pluginId": "effection-inspector",
+    "pluginPackages": [
+      "@frontside/backstage-plugin-effection-inspector",
+      "@frontside/backstage-plugin-effection-inspector-backend"
+    ]
   },
+  "sideEffects": false,
   "scripts": {
     "start": "backstage-cli package start",
     "build": "backstage-cli package build",
@@ -22,9 +28,9 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.14.0",
-    "@backstage/core-plugin-api": "^1.8.0",
-    "@backstage/theme": "^0.5.1",
+    "@backstage/core-components": "^0.14.9",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/theme": "^0.5.6",
     "@effection/inspect-ui": "^2.3.2",
     "@effection/react": "^2.2.2",
     "@material-ui/core": "^4.12.2",
@@ -36,10 +42,10 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
-    "@backstage/core-app-api": "^1.11.1",
-    "@backstage/dev-utils": "^1.0.27",
-    "@backstage/test-utils": "^1.5.0",
+    "@backstage/cli": "^0.26.11",
+    "@backstage/core-app-api": "^1.14.1",
+    "@backstage/dev-utils": "^1.0.36",
+    "@backstage/test-utils": "^1.5.9",
     "@effection/atom": "^2.0.6",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.3",

diff --git a/plugins/graphql-backend-module-catalog/package.json b/plugins/graphql-backend-module-catalog/package.json
@@ -6,18 +6,35 @@
   "types": "src/index.ts",
   "license": "Apache-2.0",
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.cjs.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "exports": {
     ".": "./src/index.ts",
     "./catalog.graphql": "./src/catalog/catalog.graphql",
     "./relation.graphql": "./src/relation/relation.graphql",
     "./package.json": "./package.json"
   },
+  "typesVersions": {
+    "*": {
+      "catalog.graphql": [
+        "src/catalog/catalog.graphql"
+      ],
+      "relation.graphql": [
+        "src/relation/relation.graphql"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "backstage": {
-    "role": "backend-plugin"
+    "role": "backend-plugin",
+    "pluginId": "graphql",
+    "pluginPackages": [
+      "@frontside/backstage-plugin-graphql-backend",
+      "@frontside/backstage-plugin-graphql-backend-module-catalog",
+      "@frontside/backstage-plugin-graphql-backend-node"
+    ]
   },
   "homepage": "https://frontside.com",
   "repository": {
@@ -40,12 +57,12 @@
     "clean": "backstage-cli package clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.21.3",
-    "@backstage/backend-plugin-api": "^0.6.7",
-    "@backstage/catalog-client": "^1.4.6",
-    "@backstage/catalog-model": "^1.4.3",
-    "@backstage/plugin-auth-node": "^0.4.1",
-    "@backstage/plugin-catalog-node": "^1.5.0",
+    "@backstage/backend-common": "^0.23.3",
+    "@backstage/backend-plugin-api": "^0.7.0",
+    "@backstage/catalog-client": "^1.6.5",
+    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/plugin-auth-node": "^0.4.17",
+    "@backstage/plugin-catalog-node": "^1.12.4",
     "@frontside/backstage-plugin-graphql-backend": "^0.1.8",
     "@frontside/hydraphql": "^0.1.3",
     "@graphql-tools/load-files": "^7.0.0",
@@ -58,7 +75,7 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.11",
     "@envelop/core": "^4.0.0",
     "@envelop/dataloader": "^5.0.0",
     "@envelop/graphql-modules": "^5.0.0",