From e42d1595cb6b6aaae04f490ae518f5302ef6ce18 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Feb 2023 10:12:22 +0100
Subject: [PATCH 1/2] backend-common: work around missing logform dependency

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/backend-common/package.json | 1 +
 yarn.lock                            | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 9f1069f322..9ec68e5531 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -53,6 +53,7 @@
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/luxon": "^3.0.0",
+    "@types/triple-beam": "^1.3.2",
     "@types/webpack-env": "^1.15.2",
     "archiver": "^5.0.2",
     "aws-sdk": "^2.840.0",
diff --git a/yarn.lock b/yarn.lock
index 6e252cb1c2..adcc15e13b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3457,6 +3457,7 @@ __metadata:
     "@types/stoppable": ^1.1.0
     "@types/supertest": ^2.0.8
     "@types/tar": ^6.1.1
+    "@types/triple-beam": ^1.3.2
     "@types/webpack-env": ^1.15.2
     "@types/yauzl": ^2.10.0
     archiver: ^5.0.2
@@ -15443,6 +15444,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/triple-beam@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "@types/triple-beam@npm:1.3.2"
+  checksum: dd7b4a563fb710abc992e5d59eac481bed9e303fada2e276e37b00be31c392e03300ee468e57761e616512872e77935f92472877d0704a19688d15a726cee17b
+  languageName: node
+  linkType: hard
+
 "@types/trusted-types@npm:*":
   version: 2.0.2
   resolution: "@types/trusted-types@npm:2.0.2"

From 783c54d497771958c422bb6d85f9a7b4ec0fe45a Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 7 Feb 2023 12:07:20 +0100
Subject: [PATCH 2/2] chore: ignore this dependency in the typechecking

Signed-off-by: blam <ben@blam.sh>
---
 packages/repo-tools/src/commands/type-deps/type-deps.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/repo-tools/src/commands/type-deps/type-deps.ts b/packages/repo-tools/src/commands/type-deps/type-deps.ts
index 4f8e5e5529..852cec34d2 100644
--- a/packages/repo-tools/src/commands/type-deps/type-deps.ts
+++ b/packages/repo-tools/src/commands/type-deps/type-deps.ts
@@ -196,6 +196,14 @@ function findTypeDepErrors(typeDeps: string[], pkg: Package) {
   }
 
   for (const dep of deps) {
+    // Remove this once the logform issue has been fixed.
+    // https://github.com/winstonjs/logform/issues/242
+    if (
+      pkg.packageJson.name === '@backstage/backend-common' &&
+      dep === '@types/triple-beam'
+    ) {
+      continue;
+    }
     errors.push(
       mkErr('WrongDepError', `Should be dev dep ${dep}`, {
         dep,