From ba840639250cd1647dda46b05c361f0593dbcbe3 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 20 Dec 2024 14:09:47 +0100 Subject: [PATCH] chore: smol comment Signed-off-by: blam --- .changeset/metal-ravens-hammer.md | 1 + packages/config-loader/src/schema/collect.ts | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.changeset/metal-ravens-hammer.md b/.changeset/metal-ravens-hammer.md index 9a834b4715..e8a97f412c 100644 --- a/.changeset/metal-ravens-hammer.md +++ b/.changeset/metal-ravens-hammer.md @@ -1,5 +1,6 @@ --- '@backstage/config-loader': patch +'@backstage/backend-defaults': patch --- Exclude `@backstage/backend-common` from schema collection if `@backstage/backend-defaults` is present diff --git a/packages/config-loader/src/schema/collect.ts b/packages/config-loader/src/schema/collect.ts index 074248b89b..35ca786a7f 100644 --- a/packages/config-loader/src/schema/collect.ts +++ b/packages/config-loader/src/schema/collect.ts @@ -159,7 +159,10 @@ export async function collectConfigSchemas( ({ packageName }) => packageName === '@backstage/backend-defaults', ); - // Filter out the backend-common schema unless the backend-defaults schema is missing + // Filter out the backend-common schema unless the backend-defaults schema is missing. + // This was causing issue with merging of the schemas. + // This should be removed when we have no need for backend-common anymore, and other + // packages are no longer depending on it. return allSchemas.filter( ({ packageName }) => packageName !== '@backstage/backend-common' || isMissingBackendDefaults,