From 7034eb790efca441588bd8b05561dc1eda1e0f72 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 18 Sep 2023 21:01:12 +0200 Subject: [PATCH] core-app-api: avoid dependency on core-plugin-api/alpha Signed-off-by: Patrik Oldsberg --- packages/core-app-api/api-report.md | 15 ++++++++++++--- packages/core-app-api/src/app/types.ts | 15 ++++++++++----- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/core-app-api/api-report.md b/packages/core-app-api/api-report.md index bd99874a71..6824dbcf4c 100644 --- a/packages/core-app-api/api-report.md +++ b/packages/core-app-api/api-report.md @@ -64,8 +64,6 @@ import { SessionState } from '@backstage/core-plugin-api'; import { StorageApi } from '@backstage/core-plugin-api'; import { StorageValueSnapshot } from '@backstage/core-plugin-api'; import { SubRouteRef } from '@backstage/core-plugin-api'; -import { TranslationMessages } from '@backstage/core-plugin-api/alpha'; -import { TranslationResource } from '@backstage/core-plugin-api/alpha'; // @public export class AlertApiForwarder implements AlertApi { @@ -225,7 +223,18 @@ export type AppOptions = { __experimentalTranslations?: { defaultLanguage?: string; availableLanguages?: string[]; - resources?: Array; + resources?: Array< + | { + $$type: '@backstage/TranslationResource'; + id: string; + } + | { + $$type: '@backstage/TranslationMessages'; + id: string; + full: boolean; + messages: Record; + } + >; }; }; diff --git a/packages/core-app-api/src/app/types.ts b/packages/core-app-api/src/app/types.ts index f203ce9278..523e35e9cb 100644 --- a/packages/core-app-api/src/app/types.ts +++ b/packages/core-app-api/src/app/types.ts @@ -27,10 +27,6 @@ import { FeatureFlag, } from '@backstage/core-plugin-api'; import { AppConfig } from '@backstage/config'; -import { - TranslationMessages, - TranslationResource, -} from '@backstage/core-plugin-api/alpha'; /** * Props for the `BootErrorPage` component of {@link AppComponents}. @@ -286,7 +282,16 @@ export type AppOptions = { __experimentalTranslations?: { defaultLanguage?: string; availableLanguages?: string[]; - resources?: Array; + resources?: Array< + // Separate declaration for now to avoid dependency on core-plugin-api/alpha and TS 5.0 + | { $$type: '@backstage/TranslationResource'; id: string } + | { + $$type: '@backstage/TranslationMessages'; + id: string; + full: boolean; + messages: Record; + } + >; }; };