backstage version: 1.36.1 -> 1.38.1

2025-04-23 11:20:58 +02:00 · 2025-04-23 11:20:58 +02:00 · 3be5d357b9
commit 3be5d357b9
parent adf76c431a
7 changed files with 1724 additions and 887 deletions
--- a/backstage.json
+++ b/backstage.json
@ -1,3 +1,3 @@
 {
-  "version": "1.36.1"
+  "version": "1.38.1"
 }
--- a/package.json
+++ b/package.json
@ -31,7 +31,7 @@
    ]
  },
  "devDependencies": {
-    "@backstage/cli": "^0.30.0",
+    "@backstage/cli": "^0.32.0",
    "@backstage/e2e-test-utils": "^0.1.1",
    "@playwright/test": "^1.32.3",
    "@spotify/prettier-config": "^12.0.0",
--- a/packages/app/package.json
+++ b/packages/app/package.json
@ -16,31 +16,31 @@
  "dependencies": {
    "@backstage-community/plugin-github-actions": "^0.6.16",
    "@backstage-community/plugin-tech-radar": "^0.7.4",
-    "@backstage/app-defaults": "^1.5.17",
+    "@backstage/app-defaults": "^1.6.1",
    "@backstage/catalog-model": "^1.7.3",
-    "@backstage/cli": "^0.30.0",
-    "@backstage/core-app-api": "^1.15.5",
-    "@backstage/core-components": "^0.16.4",
-    "@backstage/core-plugin-api": "^1.10.4",
-    "@backstage/integration-react": "^1.2.4",
-    "@backstage/plugin-api-docs": "^0.12.4",
-    "@backstage/plugin-catalog": "^1.27.0",
+    "@backstage/cli": "^0.32.0",
+    "@backstage/core-app-api": "^1.16.1",
+    "@backstage/core-components": "^0.17.1",
+    "@backstage/core-plugin-api": "^1.10.6",
+    "@backstage/integration-react": "^1.2.6",
+    "@backstage/plugin-api-docs": "^0.12.6",
+    "@backstage/plugin-catalog": "^1.29.0",
    "@backstage/plugin-catalog-common": "^1.1.3",
-    "@backstage/plugin-catalog-graph": "^0.4.16",
-    "@backstage/plugin-catalog-import": "^0.12.10",
-    "@backstage/plugin-catalog-react": "^1.15.2",
-    "@backstage/plugin-home": "^0.8.5",
-    "@backstage/plugin-kubernetes": "^0.12.4",
-    "@backstage/plugin-org": "^0.6.36",
-    "@backstage/plugin-permission-react": "^0.4.31",
-    "@backstage/plugin-scaffolder": "^1.28.0",
-    "@backstage/plugin-search": "^1.4.23",
-    "@backstage/plugin-search-react": "^1.8.6",
-    "@backstage/plugin-techdocs": "^1.12.3",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.21",
-    "@backstage/plugin-techdocs-react": "^1.2.14",
-    "@backstage/plugin-user-settings": "^0.8.19",
-    "@backstage/theme": "^0.6.4",
+    "@backstage/plugin-catalog-graph": "^0.4.18",
+    "@backstage/plugin-catalog-import": "^0.12.13",
+    "@backstage/plugin-catalog-react": "^1.17.0",
+    "@backstage/plugin-home": "^0.8.7",
+    "@backstage/plugin-kubernetes": "^0.12.6",
+    "@backstage/plugin-org": "^0.6.38",
+    "@backstage/plugin-permission-react": "^0.4.33",
+    "@backstage/plugin-scaffolder": "^1.30.1",
+    "@backstage/plugin-search": "^1.4.25",
+    "@backstage/plugin-search-react": "^1.8.8",
+    "@backstage/plugin-techdocs": "^1.12.5",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.23",
+    "@backstage/plugin-techdocs-react": "^1.2.16",
+    "@backstage/plugin-user-settings": "^0.8.21",
+    "@backstage/theme": "^0.6.5",
    "@material-ui/core": "^4.12.2",
    "@material-ui/icons": "^4.9.1",
    "@roadiehq/backstage-plugin-argo-cd": "^2.5.1",
@ -52,7 +52,7 @@
    "react-use": "^17.2.4"
  },
  "devDependencies": {
-    "@backstage/test-utils": "^1.7.5",
+    "@backstage/test-utils": "^1.7.7",
    "@playwright/test": "^1.32.3",
    "@testing-library/dom": "^9.0.0",
    "@testing-library/jest-dom": "^6.0.0",
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@ -17,35 +17,35 @@
  },
  "dependencies": {
    "@backstage/backend-common": "^0.25.0",
-    "@backstage/backend-defaults": "^0.8.1",
-    "@backstage/backend-plugin-api": "^1.2.0",
+    "@backstage/backend-defaults": "^0.9.0",
+    "@backstage/backend-plugin-api": "^1.3.0",
    "@backstage/backend-tasks": "^0.6.1",
    "@backstage/catalog-client": "^1.9.1",
    "@backstage/catalog-model": "^1.7.3",
    "@backstage/config": "^1.3.2",
    "@backstage/errors": "^1.2.7",
-    "@backstage/integration": "^1.16.1",
-    "@backstage/plugin-app-backend": "^0.4.5",
-    "@backstage/plugin-auth-backend": "^0.24.3",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.5",
-    "@backstage/plugin-auth-backend-module-oidc-provider": "^0.4.0",
-    "@backstage/plugin-auth-node": "^0.6.0",
-    "@backstage/plugin-catalog-backend": "^1.31.0",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.5",
-    "@backstage/plugin-kubernetes-backend": "^0.19.3",
+    "@backstage/integration": "^1.16.3",
+    "@backstage/plugin-app-backend": "^0.5.1",
+    "@backstage/plugin-auth-backend": "^0.24.5",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.7",
+    "@backstage/plugin-auth-backend-module-oidc-provider": "^0.4.2",
+    "@backstage/plugin-auth-node": "^0.6.2",
+    "@backstage/plugin-catalog-backend": "^1.32.1",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.7",
+    "@backstage/plugin-kubernetes-backend": "^0.19.5",
    "@backstage/plugin-permission-common": "^0.8.4",
-    "@backstage/plugin-permission-node": "^0.8.8",
-    "@backstage/plugin-proxy-backend": "^0.5.11",
-    "@backstage/plugin-scaffolder-backend": "^1.30.0",
-    "@backstage/plugin-scaffolder-backend-module-gitea": "^0.2.6",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.6.0",
-    "@backstage/plugin-scaffolder-node": "^0.7.0",
-    "@backstage/plugin-search-backend": "^1.8.2",
-    "@backstage/plugin-search-backend-module-catalog": "^0.3.1",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.41",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.3.6",
-    "@backstage/plugin-search-backend-node": "^1.3.8",
-    "@backstage/plugin-techdocs-backend": "^1.11.6",
+    "@backstage/plugin-permission-node": "^0.9.1",
+    "@backstage/plugin-proxy-backend": "^0.6.1",
+    "@backstage/plugin-scaffolder-backend": "^1.32.1",
+    "@backstage/plugin-scaffolder-backend-module-gitea": "^0.2.8",
+    "@backstage/plugin-scaffolder-backend-module-github": "^0.7.0",
+    "@backstage/plugin-scaffolder-node": "^0.8.1",
+    "@backstage/plugin-search-backend": "^2.0.1",
+    "@backstage/plugin-search-backend-module-catalog": "^0.3.3",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.43",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.4.1",
+    "@backstage/plugin-search-backend-node": "^1.3.10",
+    "@backstage/plugin-techdocs-backend": "^2.0.1",
    "@backstage/types": "^1.2.1",
    "@kubernetes/client-node": "~0.20.0",
    "@roadiehq/backstage-plugin-argo-cd-backend": "3.1.0",
@ -62,7 +62,7 @@
    "winston": "^3.2.1"
  },
  "devDependencies": {
-    "@backstage/cli": "^0.30.0",
+    "@backstage/cli": "^0.32.0",
    "@types/dockerode": "^3.3.0",
    "@types/express": "^4.17.6",
    "@types/express-serve-static-core": "^4.17.5",
--- a/packages/backend/src/plugins/argocd.ts
+++ b/packages/backend/src/plugins/argocd.ts
@ -4,16 +4,6 @@ import { examples } from './gitea-actions';
 import { Logger } from 'winston';
 import { ArgoService } from '@roadiehq/backstage-plugin-argo-cd-backend';
 import { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend';
-//import { PluginEnvironment } from '../types';
-
-
-/*export default async function createPlugin({
-  logger,
-  config,
-}: PluginEnvironment) {
-  return await createRouter({ logger, config });
-}*/
-
 import { loggerToWinstonLogger } from '@backstage/backend-common';

 import {
@ -31,7 +21,6 @@ export const argocdPlugin = createBackendPlugin({
        reader: coreServices.urlReader,
        discovery: coreServices.discovery,
        auth: coreServices.auth,
-        //tokenManager: coreServices.tokenManager,
        httpRouter: coreServices.httpRouter,
      },
      async init({
@ -50,8 +39,6 @@ export const argocdPlugin = createBackendPlugin({
  },
 });

-
-
 export function createArgoCDApp(options: { config: Config; logger: Logger }) {
  const { config, logger } = options;

--- a/packages/backend/src/plugins/proxy.ts
+++ b/packages/backend/src/plugins/proxy.ts
@ -1,4 +1,4 @@
-import { createRouter } from '@backstage/plugin-proxy-backend';
+import { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';

@ -7,7 +7,6 @@ export default async function createPlugin(
 ): Promise<Router> {
  return await createRouter({
    logger: env.logger,
-    config: env.config,
-    discovery: env.discovery,
+    config: env.config
  });
 }
--- a/yarn.lock
+++ b/yarn.lock