From ec950c58caac142a311225af4463e50982f7ee11 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 18 Jul 2024 12:35:16 +0200 Subject: [PATCH 1/4] chore: remove app-api dependency Signed-off-by: blam --- plugins/search-backend-module-pg/package.json | 1 - yarn.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json index 8bdcf14306..1693c14c8a 100644 --- a/plugins/search-backend-module-pg/package.json +++ b/plugins/search-backend-module-pg/package.json @@ -49,7 +49,6 @@ "test": "backstage-cli package test" }, "dependencies": { - "@backstage/backend-app-api": "workspace:^", "@backstage/backend-common": "workspace:^", "@backstage/backend-plugin-api": "workspace:^", "@backstage/config": "workspace:^", diff --git a/yarn.lock b/yarn.lock index c6a1d2139a..9261d70f21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7271,7 +7271,6 @@ __metadata: version: 0.0.0-use.local resolution: "@backstage/plugin-search-backend-module-pg@workspace:plugins/search-backend-module-pg" dependencies: - "@backstage/backend-app-api": "workspace:^" "@backstage/backend-common": "workspace:^" "@backstage/backend-plugin-api": "workspace:^" "@backstage/backend-test-utils": "workspace:^" From d3d6f5e9ec07a34dc9d6c66c84493629d75ea0a4 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 18 Jul 2024 12:42:16 +0200 Subject: [PATCH 2/4] chore: remove app-api dep Signed-off-by: blam --- packages/backend-dynamic-feature-service/package.json | 3 ++- .../src/schemas/rootLoggerServiceFactory.ts | 4 ++-- yarn.lock | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/backend-dynamic-feature-service/package.json b/packages/backend-dynamic-feature-service/package.json index 0d05b97bd9..c693135f30 100644 --- a/packages/backend-dynamic-feature-service/package.json +++ b/packages/backend-dynamic-feature-service/package.json @@ -41,8 +41,8 @@ "start": "backstage-cli package start" }, "dependencies": { - "@backstage/backend-app-api": "workspace:^", "@backstage/backend-common": "workspace:^", + "@backstage/backend-defaults": "workspace:^", "@backstage/backend-plugin-api": "workspace:^", "@backstage/backend-tasks": "workspace:^", "@backstage/cli-common": "workspace:^", @@ -70,6 +70,7 @@ "winston": "^3.2.1" }, "devDependencies": { + "@backstage/backend-app-api": "workspace:^", "@backstage/backend-test-utils": "workspace:^", "@backstage/cli": "workspace:^", "wait-for-expect": "^3.0.2" diff --git a/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts b/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts index 6681a65a75..bf3df3ffe7 100644 --- a/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts +++ b/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts @@ -18,9 +18,9 @@ import { createServiceFactory, coreServices, } from '@backstage/backend-plugin-api'; -import { WinstonLogger } from '@backstage/backend-app-api'; +import { WinstonLogger } from '@backstage/backend-defaults/rootLogger'; import { transports, format } from 'winston'; -import { createConfigSecretEnumerator } from '@backstage/backend-app-api'; +import { createConfigSecretEnumerator } from '@backstage/backend-defaults/rootLogger'; import { loadConfigSchema } from '@backstage/config-loader'; import { getPackages } from '@manypkg/get-packages'; import { dynamicPluginsSchemasServiceRef } from './schemas'; diff --git a/yarn.lock b/yarn.lock index 9261d70f21..53bef5284a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3708,6 +3708,7 @@ __metadata: dependencies: "@backstage/backend-app-api": "workspace:^" "@backstage/backend-common": "workspace:^" + "@backstage/backend-defaults": "workspace:^" "@backstage/backend-plugin-api": "workspace:^" "@backstage/backend-tasks": "workspace:^" "@backstage/backend-test-utils": "workspace:^" From 7251567926578e77bddd0f87ec668b91209826e8 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 18 Jul 2024 12:43:24 +0200 Subject: [PATCH 3/4] chore: changeset Signed-off-by: blam --- .changeset/nine-glasses-nail.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/nine-glasses-nail.md diff --git a/.changeset/nine-glasses-nail.md b/.changeset/nine-glasses-nail.md new file mode 100644 index 0000000000..0d68da9f2b --- /dev/null +++ b/.changeset/nine-glasses-nail.md @@ -0,0 +1,6 @@ +--- +'@backstage/backend-dynamic-feature-service': patch +'@backstage/plugin-search-backend-module-pg': patch +--- + +Removing `@backstage/backend-app-api` dependency From b1104f9bd5c8516e7d85a70660f394608d0057a2 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 18 Jul 2024 16:58:03 +0200 Subject: [PATCH 4/4] chore: skip backend dynamic Signed-off-by: blam --- .changeset/nine-glasses-nail.md | 1 - packages/backend-dynamic-feature-service/package.json | 3 +-- .../src/schemas/rootLoggerServiceFactory.ts | 4 ++-- yarn.lock | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.changeset/nine-glasses-nail.md b/.changeset/nine-glasses-nail.md index 0d68da9f2b..138acce3dd 100644 --- a/.changeset/nine-glasses-nail.md +++ b/.changeset/nine-glasses-nail.md @@ -1,5 +1,4 @@ --- -'@backstage/backend-dynamic-feature-service': patch '@backstage/plugin-search-backend-module-pg': patch --- diff --git a/packages/backend-dynamic-feature-service/package.json b/packages/backend-dynamic-feature-service/package.json index c693135f30..0d05b97bd9 100644 --- a/packages/backend-dynamic-feature-service/package.json +++ b/packages/backend-dynamic-feature-service/package.json @@ -41,8 +41,8 @@ "start": "backstage-cli package start" }, "dependencies": { + "@backstage/backend-app-api": "workspace:^", "@backstage/backend-common": "workspace:^", - "@backstage/backend-defaults": "workspace:^", "@backstage/backend-plugin-api": "workspace:^", "@backstage/backend-tasks": "workspace:^", "@backstage/cli-common": "workspace:^", @@ -70,7 +70,6 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/backend-app-api": "workspace:^", "@backstage/backend-test-utils": "workspace:^", "@backstage/cli": "workspace:^", "wait-for-expect": "^3.0.2" diff --git a/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts b/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts index bf3df3ffe7..6681a65a75 100644 --- a/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts +++ b/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts @@ -18,9 +18,9 @@ import { createServiceFactory, coreServices, } from '@backstage/backend-plugin-api'; -import { WinstonLogger } from '@backstage/backend-defaults/rootLogger'; +import { WinstonLogger } from '@backstage/backend-app-api'; import { transports, format } from 'winston'; -import { createConfigSecretEnumerator } from '@backstage/backend-defaults/rootLogger'; +import { createConfigSecretEnumerator } from '@backstage/backend-app-api'; import { loadConfigSchema } from '@backstage/config-loader'; import { getPackages } from '@manypkg/get-packages'; import { dynamicPluginsSchemasServiceRef } from './schemas'; diff --git a/yarn.lock b/yarn.lock index 53bef5284a..9261d70f21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3708,7 +3708,6 @@ __metadata: dependencies: "@backstage/backend-app-api": "workspace:^" "@backstage/backend-common": "workspace:^" - "@backstage/backend-defaults": "workspace:^" "@backstage/backend-plugin-api": "workspace:^" "@backstage/backend-tasks": "workspace:^" "@backstage/backend-test-utils": "workspace:^"