From 22c838c467a0d6b38e6f99cae4af269a50d9fdb6 Mon Sep 17 00:00:00 2001 From: Camila Belo Date: Thu, 13 Jun 2024 12:55:30 +0200 Subject: [PATCH] fix: remove backend defaults dependency Signed-off-by: Camila Belo --- package.json | 1 - packages/backend-common/api-report.md | 9 ++++++--- packages/backend-common/package.json | 1 - packages/backend-common/src/deprecated/index.ts | 10 ++++++---- yarn.lock | 2 -- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index c1d099dd5f..03b152d1e6 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,6 @@ "jest-haste-map@^29.7.0": "patch:jest-haste-map@npm%3A29.7.0#./.yarn/patches/jest-haste-map-npm-29.7.0-e3be419eff.patch" }, "dependencies": { - "@backstage/backend-defaults": "workspace:^", "@backstage/errors": "workspace:^", "@manypkg/get-packages": "^1.1.3", "@useoptic/optic": "^0.50.10" diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md index e259383320..ec54f36af2 100644 --- a/packages/backend-common/api-report.md +++ b/packages/backend-common/api-report.md @@ -17,8 +17,6 @@ import { BackendFeature } from '@backstage/backend-plugin-api'; import { BitbucketCloudIntegration } from '@backstage/integration'; import { BitbucketIntegration } from '@backstage/integration'; import { BitbucketServerIntegration } from '@backstage/integration'; -import { CacheManager as CacheManager_2 } from '@backstage/backend-defaults/cache'; -import { CacheManagerOptions as CacheManagerOptions_2 } from '@backstage/backend-defaults/cache'; import { CacheService } from '@backstage/backend-plugin-api'; import { CacheServiceOptions } from '@backstage/backend-plugin-api'; import { CacheServiceSetOptions } from '@backstage/backend-plugin-api'; @@ -45,7 +43,6 @@ import { Logger } from 'winston'; import { LoggerService } from '@backstage/backend-plugin-api'; import { MergeResult } from 'isomorphic-git'; import { PermissionsService } from '@backstage/backend-plugin-api'; -import { PluginCacheManager as PluginCacheManager_2 } from '@backstage/backend-defaults/cache'; import { DatabaseService as PluginDatabaseManager } from '@backstage/backend-plugin-api'; import { PluginMetadataService } from '@backstage/backend-plugin-api'; import { PushResult } from 'isomorphic-git'; @@ -122,9 +119,13 @@ export type CacheClientOptions = CacheServiceOptions; // @public @deprecated (undocumented) export type CacheClientSetOptions = CacheServiceSetOptions; +// Warning: (ae-forgotten-export) The symbol "CacheManager_2" needs to be exported by the entry point index.d.ts +// // @public @deprecated (undocumented) export const CacheManager: typeof CacheManager_2; +// Warning: (ae-forgotten-export) The symbol "CacheManagerOptions_2" needs to be exported by the entry point index.d.ts +// // @public @deprecated (undocumented) export type CacheManagerOptions = CacheManagerOptions_2; @@ -460,6 +461,8 @@ export function makeLegacyPlugin< // @public @deprecated export function notFoundHandler(): RequestHandler; +// Warning: (ae-forgotten-export) The symbol "PluginCacheManager_2" needs to be exported by the entry point index.d.ts +// // @public @deprecated (undocumented) export type PluginCacheManager = PluginCacheManager_2; diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index f0bbcc2a2b..847fefa697 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -59,7 +59,6 @@ "@aws-sdk/client-s3": "^3.350.0", "@aws-sdk/credential-providers": "^3.350.0", "@aws-sdk/types": "^3.347.0", - "@backstage/backend-defaults": "workspace:^", "@backstage/backend-dev-utils": "workspace:^", "@backstage/backend-plugin-api": "workspace:^", "@backstage/cli-common": "workspace:^", diff --git a/packages/backend-common/src/deprecated/index.ts b/packages/backend-common/src/deprecated/index.ts index deb6c24a7f..6bd8906fec 100644 --- a/packages/backend-common/src/deprecated/index.ts +++ b/packages/backend-common/src/deprecated/index.ts @@ -16,11 +16,13 @@ export * from './scm'; +// eslint-disable-next-line @backstage/no-relative-monorepo-imports +import { CacheManager as _CacheManager } from '../../../backend-defaults/src/entrypoints/cache/CacheManager'; +// eslint-disable-next-line @backstage/no-relative-monorepo-imports import { - CacheManager as _CacheManager, - CacheManagerOptions as _CacheManagerOptions, - PluginCacheManager as _PluginCacheManager, -} from '@backstage/backend-defaults/cache'; + type PluginCacheManager as _PluginCacheManager, + type CacheManagerOptions as _CacheManagerOptions, +} from '../../../backend-defaults/src/entrypoints/cache/types'; import { CacheService, diff --git a/yarn.lock b/yarn.lock index 2fa274021b..a0ca966e1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3518,7 +3518,6 @@ __metadata: "@aws-sdk/credential-providers": ^3.350.0 "@aws-sdk/types": ^3.347.0 "@aws-sdk/util-stream-node": ^3.350.0 - "@backstage/backend-defaults": "workspace:^" "@backstage/backend-dev-utils": "workspace:^" "@backstage/backend-plugin-api": "workspace:^" "@backstage/backend-test-utils": "workspace:^" @@ -39568,7 +39567,6 @@ __metadata: version: 0.0.0-use.local resolution: "root@workspace:." dependencies: - "@backstage/backend-defaults": "workspace:^" "@backstage/cli": "workspace:*" "@backstage/codemods": "workspace:*" "@backstage/create-app": "workspace:*"