From b9cd50536fa43f1c9c8ac62a819c2db826f526a7 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 7 Aug 2024 11:21:31 +0200
Subject: [PATCH 1/4] chore: fix Signed-off-by: blam <ben@blam.sh>

Signed-off-by: blam <ben@blam.sh>
---
 .../src/wiring/createExtensionBlueprint.ts                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 2b80dac81e..88b2523111 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -420,7 +420,7 @@ export function createExtensionBlueprint<
 ): ExtensionBlueprint<
   TParams,
   UOutput,
-  TInputs,
+  string extends keyof TInputs ? {} : TInputs,
   string extends keyof TConfigSchema
     ? {}
     : { [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>> },
@@ -436,7 +436,7 @@ export function createExtensionBlueprint<
   return new ExtensionBlueprintImpl(options) as ExtensionBlueprint<
     TParams,
     UOutput,
-    TInputs,
+    string extends keyof TInputs ? {} : TInputs,
     string extends keyof TConfigSchema
       ? {}
       : {

From 6f72c2b9905c86fc7cf4d30ced9887facf017e58 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 7 Aug 2024 11:22:37 +0200
Subject: [PATCH 2/4] chore: updating changeset

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/breezy-cats-kiss.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/breezy-cats-kiss.md

diff --git a/.changeset/breezy-cats-kiss.md b/.changeset/breezy-cats-kiss.md
new file mode 100644
index 0000000000..3bcbfaf00a
--- /dev/null
+++ b/.changeset/breezy-cats-kiss.md
@@ -0,0 +1,5 @@
+---
+'@backstage/frontend-plugin-api': patch
+---
+
+Fixing issue with `Blueprints` `inputs` merging

From 9a0147e6daa458ecd1add64d1a20ed3c48781b24 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 7 Aug 2024 11:39:13 +0200
Subject: [PATCH 3/4] chore: fixing api reports

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-plugin-api/api-report.md | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 38b980fcbf..4dc9c99c78 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -622,7 +622,7 @@ export function createExtensionBlueprint<
 ): ExtensionBlueprint<
   TParams,
   UOutput,
-  TInputs,
+  string extends keyof TInputs ? {} : TInputs,
   string extends keyof TConfigSchema
     ? {}
     : {
@@ -1367,15 +1367,7 @@ export const IconBundleBlueprint: ExtensionBlueprint<
     'core.icons',
     {}
   >,
-  {
-    [x: string]: ExtensionInput<
-      AnyExtensionDataRef,
-      {
-        optional: boolean;
-        singleton: boolean;
-      }
-    >;
-  },
+  {},
   {
     icons: string;
     test: string;

From 3a8e23d8ff1b03bc1caaae1441b7fb828f67e5b1 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 7 Aug 2024 11:47:47 +0200
Subject: [PATCH 4/4] chore: updating changeset wording

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/breezy-cats-kiss.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/breezy-cats-kiss.md b/.changeset/breezy-cats-kiss.md
index 3bcbfaf00a..900016c1e8 100644
--- a/.changeset/breezy-cats-kiss.md
+++ b/.changeset/breezy-cats-kiss.md
@@ -2,4 +2,4 @@
 '@backstage/frontend-plugin-api': patch
 ---
 
-Fixing issue with `Blueprints` `inputs` merging
+Fixing issue with extension blueprints `inputs` merging.