diff --git a/packages/core-plugin-api/src/apis/definitions/TranslationApi.ts b/packages/core-plugin-api/src/apis/definitions/TranslationApi.ts index 202b2093a0..dba8753828 100644 --- a/packages/core-plugin-api/src/apis/definitions/TranslationApi.ts +++ b/packages/core-plugin-api/src/apis/definitions/TranslationApi.ts @@ -15,7 +15,7 @@ */ import { ApiRef, createApiRef } from '@backstage/core-plugin-api'; -import { Observable } from '@backstage/types'; +import { Expand, ExpandRecursive, Observable } from '@backstage/types'; import { TranslationRef } from '../../translation'; /** @@ -98,22 +98,6 @@ type CollapsedMessages = { : key]: TMessages[key]; }; -/** - * Helper type that expands type hints - * - * @ignore - */ -type Expand = T extends infer O ? { [K in keyof O]: O[K] } : never; - -/** - * Helper type that expands type hints recursively - * - * @ignore - */ -type ExpandRecursive = T extends infer O - ? { [K in keyof O]: ExpandRecursive } - : never; - /** * Trim away whitespace * diff --git a/packages/frontend-plugin-api/src/types.ts b/packages/frontend-plugin-api/src/types.ts index a658760758..9088a9d772 100644 --- a/packages/frontend-plugin-api/src/types.ts +++ b/packages/frontend-plugin-api/src/types.ts @@ -17,13 +17,6 @@ import { ReactNode } from 'react'; import { FrontendPlugin } from './wiring'; -// TODO(Rugvip): This might be a quite useful utility type, maybe add to @backstage/types? -/** - * Utility type to expand type aliases into their equivalent type. - * @ignore - */ -export type Expand = T extends infer O ? { [K in keyof O]: O[K] } : never; - /** @public */ export type CoreProgressProps = {}; diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts index 16f9f341a7..baf0b31215 100644 --- a/packages/frontend-plugin-api/src/wiring/createExtension.ts +++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts @@ -15,7 +15,7 @@ */ import { ApiHolder, AppNode } from '../apis'; -import { Expand } from '../types'; +import { Expand } from '@backstage/types'; import { ResolveInputValueOverrides, resolveInputOverrides, diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts index e22179127a..3d55b0bbe0 100644 --- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts +++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts @@ -15,7 +15,7 @@ */ import { ApiHolder, AppNode } from '../apis'; -import { Expand } from '../types'; +import { Expand } from '@backstage/types'; import { ExtensionDefinition, ResolvedExtensionInputs, diff --git a/packages/frontend-plugin-api/src/wiring/resolveInputOverrides.ts b/packages/frontend-plugin-api/src/wiring/resolveInputOverrides.ts index cf201779e0..0541ca3620 100644 --- a/packages/frontend-plugin-api/src/wiring/resolveInputOverrides.ts +++ b/packages/frontend-plugin-api/src/wiring/resolveInputOverrides.ts @@ -15,7 +15,7 @@ */ import { AppNode } from '../apis'; -import { Expand } from '../types'; +import { Expand } from '@backstage/types'; import { ResolvedExtensionInput } from './createExtension'; import { ExtensionDataContainer,