detach backend-common from backend-app-api

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

.changeset/silver-scissors-fold.md

@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Removed the circular dependency on `@backstage/backend-app-api`

packages/backend-common/api-report.md

@@ -32,7 +32,6 @@ import { GithubCredentialsProvider } from '@backstage/integration';
 import { GithubIntegration } from '@backstage/integration';
 import { GitLabIntegration } from '@backstage/integration';
 import { HarnessIntegration } from '@backstage/integration';
-import { HostDiscovery as HostDiscovery_2 } from '@backstage/backend-app-api';
 import { HttpAuthService } from '@backstage/backend-plugin-api';
 import { IdentityService } from '@backstage/backend-plugin-api';
 import { isChildPath as isChildPath_2 } from '@backstage/backend-plugin-api';
@@ -365,6 +364,8 @@ export const GitlabUrlReader: typeof GitlabUrlReader_2;
 // @public @deprecated (undocumented)
 export const HarnessUrlReader: typeof HarnessUrlReader_2;
 
+// Warning: (ae-forgotten-export) The symbol "HostDiscovery_2" needs to be exported by the entry point index.d.ts
+//
 // @public @deprecated
 export const HostDiscovery: typeof HostDiscovery_2;
 

packages/backend-common/package.json

@@ -59,7 +59,6 @@
     "@aws-sdk/client-s3": "^3.350.0",
     "@aws-sdk/credential-providers": "^3.350.0",
     "@aws-sdk/types": "^3.347.0",
-    "@backstage/backend-app-api": "workspace:^",
     "@backstage/backend-dev-utils": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/cli-common": "workspace:^",

packages/backend-common/src/config.ts

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import {
   createConfigSecretEnumerator,
   loadBackendConfig as newLoadBackendConfig,
-} from '@backstage/backend-app-api';
+} from '../../backend-app-api/src/config';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { AppConfig, Config } from '@backstage/config';
 import { LoadConfigOptionsRemote } from '@backstage/config-loader';

packages/backend-common/src/discovery/HostDiscovery.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { HostDiscovery as _HostDiscovery } from '@backstage/backend-app-api';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
+import { HostDiscovery as _HostDiscovery } from '../../../backend-defaults/src/entrypoints/discovery/HostDiscovery';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 
 /**

packages/backend-common/src/legacy.test.ts

@@ -23,10 +23,10 @@ import { EventEmitter } from 'events';
 import { Router } from 'express';
 import { createLegacyAuthAdapters } from './auth';
 import { legacyPlugin } from './legacy';
-import {
-  authServiceFactory,
-  tokenManagerServiceFactory,
-} from '@backstage/backend-app-api';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
+import { authServiceFactory } from '../../backend-app-api/src/services/implementations/auth';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
+import { tokenManagerServiceFactory } from '../../backend-app-api/src/services/implementations/tokenManager';
 
 describe('legacyPlugin', () => {
   it('can auth across the new and old systems', async () => {

packages/backend-common/src/logging/createRootLogger.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { WinstonLogger } from '@backstage/backend-app-api';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
+import { WinstonLogger } from '../../../backend-app-api/src/logging/WinstonLogger';
 import { merge } from 'lodash';
 import * as winston from 'winston';
 import { format, LoggerOptions } from 'winston';

packages/backend-common/src/middleware/errorHandler.ts

@@ -18,7 +18,8 @@ import { ErrorRequestHandler } from 'express';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { getRootLogger } from '../logging';
 import { ConfigReader } from '@backstage/config';
-import { MiddlewareFactory } from '@backstage/backend-app-api';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
+import { MiddlewareFactory } from '../../../backend-app-api/src/http/MiddlewareFactory';
 
 /**
  * Options passed to the {@link errorHandler} middleware.

packages/backend-common/src/middleware/notFoundHandler.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { MiddlewareFactory } from '@backstage/backend-app-api';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
+import { MiddlewareFactory } from '../../../backend-app-api/src/http/MiddlewareFactory';
 import { ConfigReader } from '@backstage/config';
 import { RequestHandler } from 'express';
 import { getRootLogger } from '../logging';

packages/backend-common/src/middleware/requestLoggingHandler.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { MiddlewareFactory } from '@backstage/backend-app-api';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
+import { MiddlewareFactory } from '../../../backend-app-api/src/http/MiddlewareFactory';
 import { RequestHandler } from 'express';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { getRootLogger } from '../logging';

packages/backend-common/src/service/lib/ServiceBuilderImpl.ts

@@ -30,13 +30,14 @@ import {
   requestLoggingHandler as defaultRequestLoggingHandler,
 } from '../../middleware';
 import { RequestLoggingHandlerFactory, ServiceBuilder } from '../types';
+// eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import {
   readCorsOptions,
   readHelmetOptions,
   readHttpServerOptions,
   HttpServerOptions,
   createHttpServer,
-} from '@backstage/backend-app-api';
+} from '../../../../backend-app-api/src/http';
 
 export type CspOptions = Record<string, string[]>;
 

yarn.lock

@@ -3514,7 +3514,6 @@ __metadata:
     "@aws-sdk/credential-providers": ^3.350.0
     "@aws-sdk/types": ^3.347.0
     "@aws-sdk/util-stream-node": ^3.350.0
-    "@backstage/backend-app-api": "workspace:^"
     "@backstage/backend-dev-utils": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"