diff --git a/.changeset/small-hornets-dress.md b/.changeset/small-hornets-dress.md new file mode 100644 index 0000000000..6d6817977d --- /dev/null +++ b/.changeset/small-hornets-dress.md @@ -0,0 +1,6 @@ +--- +'@backstage/plugin-catalog-backend': patch +'@backstage/plugin-catalog-common': patch +--- + +Moved the `CatalogEntityDocument` to `@backstage/plugin-catalog-common` and deprecated the export from `@backstage/plugin-catalog-backend` diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts index c59318d0af..a24c6d4f67 100644 --- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts +++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts @@ -29,14 +29,11 @@ import { CatalogClient, GetEntitiesRequest, } from '@backstage/catalog-client'; -import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common'; -import { CatalogEntityDocument } from './DefaultCatalogCollatorFactory'; +import { + catalogEntityReadPermission, + CatalogEntityDocument, +} from '@backstage/plugin-catalog-common'; -/** - * @public - * @deprecated Upgrade to a more recent `@backstage/search-backend-node` and - * use `DefaultCatalogCollatorFactory` instead. - */ export class DefaultCatalogCollator { protected discovery: PluginEndpointDiscovery; protected locationTemplate: string; diff --git a/plugins/catalog-backend/src/search/index.ts b/plugins/catalog-backend/src/search/index.ts index 93ff0b8b32..bd54e33e59 100644 --- a/plugins/catalog-backend/src/search/index.ts +++ b/plugins/catalog-backend/src/search/index.ts @@ -16,7 +16,9 @@ export { DefaultCatalogCollatorFactory } from './DefaultCatalogCollatorFactory'; export type { DefaultCatalogCollatorFactoryOptions } from './DefaultCatalogCollatorFactory'; -export type { CatalogEntityDocument } from './DefaultCatalogCollatorFactory'; + +/** @public @deprecated use the export from `plugin-catalog-common` instead */ +export type { CatalogEntityDocument } from '@backstage/plugin-catalog-common'; /** * todo(backstage/techdocs-core): stop exporting this in a future release.