diff --git a/packages/cli/package.json b/packages/cli/package.json index 4a95df0f38..47d4c73cc9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -82,6 +82,7 @@ "inquirer": "^7.0.4", "jest": "^26.0.1", "jest-css-modules": "^2.1.0", + "json-schema": "^0.2.5", "lodash": "^4.17.19", "mini-css-extract-plugin": "^0.9.0", "ora": "^4.0.3", diff --git a/packages/cli/src/commands/config/schema.ts b/packages/cli/src/commands/config/schema.ts index fbf46bff1a..63c1524789 100644 --- a/packages/cli/src/commands/config/schema.ts +++ b/packages/cli/src/commands/config/schema.ts @@ -15,12 +15,11 @@ */ import { Command } from 'commander'; +import { JSONSchema7 as JSONSchema } from 'json-schema'; import { stringify as stringifyYaml } from 'yaml'; import { loadCliConfig } from '../../lib/config'; -import { - mergeConfigSchemas, - ConfigSchemaPackageEntry, -} from '@backstage/config-loader'; +import { JsonObject } from '@backstage/config'; +import { mergeConfigSchemas } from '@backstage/config-loader'; export default async (cmd: Command) => { const { schema } = await loadCliConfig({ @@ -30,7 +29,9 @@ export default async (cmd: Command) => { }); const merged = mergeConfigSchemas( - schema.serialize().schemas.map(_ => _.value), + (schema.serialize().schemas as JsonObject[]).map( + _ => _.value as JSONSchema, + ), ); merged.title = 'Application Configuration Schema';