From 5d0693edc09b776985ac2842fdf0a4d19d9d6493 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 23 Feb 2023 10:44:57 +0100
Subject: [PATCH] backend-defaults: workaround for cyclic import

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/young-scissors-cough.md     | 5 +++++
 packages/backend-defaults/package.json | 1 +
 packages/backend-defaults/src/index.ts | 5 +++++
 yarn.lock                              | 1 +
 4 files changed, 12 insertions(+)
 create mode 100644 .changeset/young-scissors-cough.md

diff --git a/.changeset/young-scissors-cough.md b/.changeset/young-scissors-cough.md
new file mode 100644
index 0000000000..fa35588224
--- /dev/null
+++ b/.changeset/young-scissors-cough.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Added a workaround for the cyclic dependency bug across `@backstage/backend-common` and `@backstage/backend-app-api`.
diff --git a/packages/backend-defaults/package.json b/packages/backend-defaults/package.json
index cc10118bb8..b5f6018d64 100644
--- a/packages/backend-defaults/package.json
+++ b/packages/backend-defaults/package.json
@@ -33,6 +33,7 @@
   },
   "dependencies": {
     "@backstage/backend-app-api": "workspace:^",
+    "@backstage/backend-common": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^"
   },
   "devDependencies": {
diff --git a/packages/backend-defaults/src/index.ts b/packages/backend-defaults/src/index.ts
index b6ae2f1333..833878744e 100644
--- a/packages/backend-defaults/src/index.ts
+++ b/packages/backend-defaults/src/index.ts
@@ -20,5 +20,10 @@
  * @packageDocumentation
  */
 
+// This import is here as a workaround for a cyclic dependency bug where
+// backend-common must be loaded before backend-app-api
+// TODO(Rugvip): Remove this once backend-common is no longer used by backend-app-api
+import '@backstage/backend-common';
+
 export type { CreateBackendOptions } from './CreateBackend';
 export { createBackend } from './CreateBackend';
diff --git a/yarn.lock b/yarn.lock
index 6b7d97d53c..7ccb27fb64 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3514,6 +3514,7 @@ __metadata:
   resolution: "@backstage/backend-defaults@workspace:packages/backend-defaults"
   dependencies:
     "@backstage/backend-app-api": "workspace:^"
+    "@backstage/backend-common": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"