From 90a7340efd87f1174018093dc671f07bff02e733 Mon Sep 17 00:00:00 2001
From: Ooi Yee Fei <yeefeiooi@gmail.com>
Date: Sat, 1 Jun 2024 15:09:02 +0800
Subject: [PATCH 001/225] fix: Prefer accountId for
 AwsOrganizationCloudAccountProcessor authentication

Signed-off-by: Ooi Yee Fei <yeefeiooi@gmail.com>
---
 .changeset/swift-kings-sparkle.md             |  5 +++
 .../catalog-backend-module-aws/config.d.ts    |  6 +++
 .../src/awsOrganization/config.test.ts        |  2 +
 .../src/awsOrganization/config.ts             |  7 +++
 .../AwsOrganizationCloudAccountProcessor.ts   | 44 ++++++++++++-------
 5 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/swift-kings-sparkle.md

diff --git a/.changeset/swift-kings-sparkle.md b/.changeset/swift-kings-sparkle.md
new file mode 100644
index 0000000000..18a37b82f1
--- /dev/null
+++ b/.changeset/swift-kings-sparkle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-aws': patch
+---
+
+AwsOrganizationCloudAccountProcessor configuration field roleArn is deprecated in favor of new field accountId
diff --git a/plugins/catalog-backend-module-aws/config.d.ts b/plugins/catalog-backend-module-aws/config.d.ts
index 4c9c98512e..0a9d9c97db 100644
--- a/plugins/catalog-backend-module-aws/config.d.ts
+++ b/plugins/catalog-backend-module-aws/config.d.ts
@@ -26,8 +26,14 @@ export interface Config {
         provider: {
           /**
            * The role to be assumed by this processor
+           * @deprecated Use `accountId` instead.
            */
           roleArn?: string;
+
+          /**
+           * The AWS account ID to query for organizational data
+           */
+          accountId?: string;
         };
       };
     };
diff --git a/plugins/catalog-backend-module-aws/src/awsOrganization/config.test.ts b/plugins/catalog-backend-module-aws/src/awsOrganization/config.test.ts
index 7e0dc58559..a84c65abda 100644
--- a/plugins/catalog-backend-module-aws/src/awsOrganization/config.test.ts
+++ b/plugins/catalog-backend-module-aws/src/awsOrganization/config.test.ts
@@ -22,11 +22,13 @@ describe('readAwsOrganizationConfig', () => {
     const config = {
       provider: {
         roleArn: 'aws::arn::foo',
+        accountId: '111111111111',
       },
     };
     const actual = readAwsOrganizationConfig(new ConfigReader(config));
     const expected = {
       roleArn: 'aws::arn::foo',
+      accountId: '111111111111',
     };
     expect(actual).toEqual(expected);
   });
diff --git a/plugins/catalog-backend-module-aws/src/awsOrganization/config.ts b/plugins/catalog-backend-module-aws/src/awsOrganization/config.ts
index e6096b932b..ff00af48e4 100644
--- a/plugins/catalog-backend-module-aws/src/awsOrganization/config.ts
+++ b/plugins/catalog-backend-module-aws/src/awsOrganization/config.ts
@@ -24,6 +24,11 @@ export type AwsOrganizationProviderConfig = {
    * The role to assume for the processor.
    */
   roleArn?: string;
+
+  /**
+   * The AWS accountId
+   */
+  accountId?: string;
 };
 
 export function readAwsOrganizationConfig(
@@ -32,7 +37,9 @@ export function readAwsOrganizationConfig(
   const providerConfig = config.getOptionalConfig('provider');
 
   const roleArn = providerConfig?.getOptionalString('roleArn');
+  const accountId = providerConfig?.getOptionalString('accountId');
   return {
     roleArn,
+    accountId,
   };
 }
diff --git a/plugins/catalog-backend-module-aws/src/processors/AwsOrganizationCloudAccountProcessor.ts b/plugins/catalog-backend-module-aws/src/processors/AwsOrganizationCloudAccountProcessor.ts
index 4a454fce6f..b843503a28 100644
--- a/plugins/catalog-backend-module-aws/src/processors/AwsOrganizationCloudAccountProcessor.ts
+++ b/plugins/catalog-backend-module-aws/src/processors/AwsOrganizationCloudAccountProcessor.ts
@@ -59,10 +59,18 @@ export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor {
   static async fromConfig(config: Config, options: { logger: LoggerService }) {
     const c = config.getOptionalConfig('catalog.processors.awsOrganization');
     const orgConfig = c ? readAwsOrganizationConfig(c) : undefined;
+
+    if (orgConfig?.roleArn) {
+      options.logger.warn(
+        'The roleArn configuration for AwsOrganizationCloudAccountProcessor ignores the role name, use accountId configuration instead',
+      );
+    }
+
     const awsCredentialsManager =
       DefaultAwsCredentialsManager.fromConfig(config);
     const credProvider = await awsCredentialsManager.getCredentialProvider({
       arn: orgConfig?.roleArn,
+      accountId: orgConfig?.accountId,
     });
     return new AwsOrganizationCloudAccountProcessor(
       credProvider,
@@ -98,23 +106,27 @@ export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor {
 
     this.logger?.info('Discovering AWS Organization Account objects');
 
-    (await this.getAwsAccounts())
-      .map(account => this.mapAccountToComponent(account))
-      .filter(entity => {
-        if (location.target !== '') {
-          if (entity.metadata.annotations) {
-            return (
-              entity.metadata.annotations[ORGANIZATION_ANNOTATION] ===
-              location.target
-            );
+    try {
+      (await this.getAwsAccounts())
+        .map(account => this.mapAccountToComponent(account))
+        .filter(entity => {
+          if (location.target !== '') {
+            if (entity.metadata.annotations) {
+              return (
+                entity.metadata.annotations[ORGANIZATION_ANNOTATION] ===
+                location.target
+              );
+            }
+            return false;
           }
-          return false;
-        }
-        return true;
-      })
-      .forEach(entity => {
-        emit(processingResult.entity(location, entity));
-      });
+          return true;
+        })
+        .forEach(entity => {
+          emit(processingResult.entity(location, entity));
+        });
+    } catch (e) {
+      this.logger?.error(e);
+    }
 
     return true;
   }

From a0fd89c3ef77677404cfb46e973000ef4061d2b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20St=C3=B6rkle?= <florian@stoerkle.net>
Date: Thu, 15 Feb 2024 14:54:48 +0100
Subject: [PATCH 002/225] fix: use correct odata type in TypeScript
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Florian Störkle <florian@stoerkle.net>
---
 .../src/microsoftGraph/client.ts                              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
index 1233b1e2f9..c190e2a959 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
@@ -64,8 +64,8 @@ export type ODataQuery = {
  * @public
  */
 export type GroupMember =
-  | (MicrosoftGraph.Group & { '@odata.type': '#microsoft.graph.user' })
-  | (MicrosoftGraph.User & { '@odata.type': '#microsoft.graph.group' });
+  | (MicrosoftGraph.Group & { '@odata.type': '#microsoft.graph.group' })
+  | (MicrosoftGraph.User & { '@odata.type': '#microsoft.graph.user' });
 
 /**
  * A HTTP Client that communicates with Microsoft Graph API.

From da7651605a6c78e8e4a89ab89fc2d0e30291d06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20St=C3=B6rkle?= <florian@stoerkle.net>
Date: Fri, 16 Feb 2024 13:15:50 +0100
Subject: [PATCH 003/225] feat(catalog): ingest member groups if configured
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Florian Störkle <florian@stoerkle.net>
---
 .../config.d.ts                               |   5 +
 .../src/microsoftGraph/config.test.ts         |   2 +
 .../src/microsoftGraph/config.ts              |  10 ++
 .../src/microsoftGraph/read.test.ts           | 114 ++++++++++++++++++
 .../src/microsoftGraph/read.ts                |  28 +++++
 .../MicrosoftGraphOrgEntityProvider.ts        |   1 +
 6 files changed, 160 insertions(+)

diff --git a/plugins/catalog-backend-module-msgraph/config.d.ts b/plugins/catalog-backend-module-msgraph/config.d.ts
index 5a1f56a03f..a470c075f0 100644
--- a/plugins/catalog-backend-module-msgraph/config.d.ts
+++ b/plugins/catalog-backend-module-msgraph/config.d.ts
@@ -192,6 +192,11 @@ export interface Config {
                * E.g. ["id", "displayName", "description"]
                */
               select?: string[];
+              /**
+               * Whether to ingest groups that are members of the found/filtered/searched groups.
+               * Default value is `false`.
+               */
+              includeSubGroups?: boolean;
             };
 
             userGroupMember?: {
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.test.ts
index b02894dfd9..e1c81662a3 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.test.ts
@@ -175,6 +175,7 @@ describe('readProviderConfigs', () => {
                 expand: 'member',
                 filter: 'securityEnabled eq false',
                 select: ['id', 'displayName', 'description'],
+                includeSubGroups: true,
               },
               schedule: {
                 frequency: 'PT30M',
@@ -203,6 +204,7 @@ describe('readProviderConfigs', () => {
         groupExpand: 'member',
         groupSelect: ['id', 'displayName', 'description'],
         groupFilter: 'securityEnabled eq false',
+        groupIncludeSubGroups: true,
         schedule: {
           frequency: Duration.fromISO('PT30M'),
           timeout: {
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts
index 1545114e45..257a7d5736 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts
@@ -116,6 +116,12 @@ export type MicrosoftGraphProviderConfig = {
    */
   groupSelect?: string[];
 
+  /**
+   * Whether to ingest groups that are members of the found/filtered/searched groups.
+   * Default value is `false`.
+   */
+  groupIncludeSubGroups?: boolean;
+
   /**
    * By default, the Microsoft Graph API only provides the basic feature set
    * for querying. Certain features are limited to advanced query capabilities
@@ -292,6 +298,9 @@ export function readProviderConfig(
   const groupFilter = config.getOptionalString('group.filter');
   const groupSearch = config.getOptionalString('group.search');
   const groupSelect = config.getOptionalStringArray('group.select');
+  const groupIncludeSubGroups = config.getOptionalBoolean(
+    'group.includeSubGroups',
+  );
 
   const queryMode = config.getOptionalString('queryMode');
   if (
@@ -347,6 +356,7 @@ export function readProviderConfig(
     groupFilter,
     groupSearch,
     groupSelect,
+    groupIncludeSubGroups,
     queryMode,
     userGroupMemberFilter,
     userGroupMemberSearch,
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
index 8821ffd2db..b83597653f 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
@@ -90,6 +90,9 @@ describe('read microsoft graph', () => {
     yield {
       '@odata.type': '#microsoft.graph.group',
       id: 'childgroupid',
+      displayName: 'Child Group Name',
+      description: 'Child Group Description',
+      mail: 'childgroup@example.com',
     };
     yield {
       '@odata.type': '#microsoft.graph.user',
@@ -770,6 +773,117 @@ describe('read microsoft graph', () => {
         top: 999,
       });
     });
+
+    it('should read groups and their sub groups', async () => {
+      async function* getExampleGroupMembersForSubGroup(): AsyncIterable<GroupMember> {
+        yield {
+          '@odata.type': '#microsoft.graph.user',
+          id: 'userid2',
+        };
+      }
+
+      client.getGroups.mockImplementation(getExampleGroups);
+      client.getGroupMembers.mockImplementationOnce(getExampleGroupMembers);
+      client.getGroupMembers.mockImplementationOnce(
+        getExampleGroupMembersForSubGroup,
+      );
+      client.getOrganization.mockResolvedValue({
+        id: 'tenantid',
+        displayName: 'Organization Name',
+      });
+      client.getGroupPhotoWithSizeLimit.mockResolvedValue(
+        'data:image/jpeg;base64,...',
+      );
+
+      const { groups, groupMember, groupMemberOf, rootGroup } =
+        await readMicrosoftGraphGroups(client, 'tenantid', {
+          groupIncludeSubGroups: true,
+        });
+
+      const expectedRootGroup = group({
+        metadata: {
+          annotations: {
+            'graph.microsoft.com/tenant-id': 'tenantid',
+          },
+          name: 'organization_name',
+          description: 'Organization Name',
+        },
+        spec: {
+          type: 'root',
+          profile: {
+            displayName: 'Organization Name',
+          },
+          children: [],
+        },
+      });
+      expect(groups).toEqual([
+        expectedRootGroup,
+        group({
+          metadata: {
+            annotations: {
+              'graph.microsoft.com/group-id': 'childgroupid',
+            },
+            name: 'child_group_name',
+            description: 'Child Group Description',
+          },
+          spec: {
+            type: 'team',
+            profile: {
+              displayName: 'Child Group Name',
+              email: 'childgroup@example.com',
+              // TODO: Loading groups photos doesn't work right now as Microsoft
+              // Graph doesn't allows this yet
+              /* picture: 'data:image/jpeg;base64,...',*/
+            },
+            children: [],
+          },
+        }),
+        group({
+          metadata: {
+            annotations: {
+              'graph.microsoft.com/group-id': 'groupid',
+            },
+            name: 'group_name',
+            description: 'Group Description',
+          },
+          spec: {
+            type: 'team',
+            profile: {
+              displayName: 'Group Name',
+              email: 'group@example.com',
+              // TODO: Loading groups photos doesn't work right now as Microsoft
+              // Graph doesn't allows this yet
+              /* picture: 'data:image/jpeg;base64,...',*/
+            },
+            children: [],
+          },
+        }),
+      ]);
+      expect(rootGroup).toEqual(expectedRootGroup);
+      expect(groupMember.get('groupid')).toEqual(new Set(['childgroupid']));
+      expect(groupMemberOf.get('userid')).toEqual(new Set(['groupid']));
+      expect(groupMemberOf.get('userid2')).toEqual(new Set(['childgroupid']));
+      expect(groupMember.get('organization_name')).toEqual(new Set());
+
+      expect(client.getGroups).toHaveBeenCalledTimes(1);
+      expect(client.getGroups).toHaveBeenCalledWith(
+        {
+          top: 999,
+        },
+        undefined,
+      );
+      expect(client.getGroupMembers).toHaveBeenCalledTimes(2);
+      expect(client.getGroupMembers).toHaveBeenCalledWith('groupid', {
+        top: 999,
+      });
+      expect(client.getGroupMembers).toHaveBeenCalledWith('childgroupid', {
+        top: 999,
+      });
+      // TODO: Loading groups photos doesn't work right now as Microsoft Graph
+      // doesn't allows this yet
+      // expect(client.getGroupPhotoWithSizeLimit).toBeCalledTimes(1);
+      // expect(client.getGroupPhotoWithSizeLimit).toBeCalledWith('groupid', 120);
+    });
   });
 
   describe('resolveRelations', () => {
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
index 2ca21fca9c..60e5c3d79b 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
@@ -178,6 +178,7 @@ export async function readMicrosoftGraphGroups(
     groupFilter?: string;
     groupSearch?: string;
     groupSelect?: string[];
+    groupIncludeSubGroups?: boolean;
     groupTransformer?: GroupTransformer;
     organizationTransformer?: OrganizationTransformer;
   },
@@ -244,6 +245,31 @@ export async function readMicrosoftGraphGroups(
 
           if (member['@odata.type'] === '#microsoft.graph.group') {
             ensureItem(groupMember, group.id!, member.id);
+
+            if (options?.groupIncludeSubGroups) {
+              const groupMemberEntity = await transformer(member);
+
+              if (groupMemberEntity) {
+                groups.push(groupMemberEntity);
+
+                for await (const subMember of client.getGroupMembers(
+                  member.id!,
+                  { top: PAGE_SIZE },
+                )) {
+                  if (!subMember.id) {
+                    continue;
+                  }
+
+                  if (subMember['@odata.type'] === '#microsoft.graph.user') {
+                    ensureItem(groupMemberOf, subMember.id, member.id!);
+                  }
+
+                  if (subMember['@odata.type'] === '#microsoft.graph.group') {
+                    ensureItem(groupMember, member.id!, subMember.id);
+                  }
+                }
+              }
+            }
           }
         }
 
@@ -377,6 +403,7 @@ export async function readMicrosoftGraphOrg(
     groupSearch?: string;
     groupFilter?: string;
     groupSelect?: string[];
+    groupIncludeSubGroups?: boolean;
     queryMode?: 'basic' | 'advanced';
     userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;
@@ -421,6 +448,7 @@ export async function readMicrosoftGraphOrg(
       groupFilter: options.groupFilter,
       groupSearch: options.groupSearch,
       groupSelect: options.groupSelect,
+      groupIncludeSubGroups: options.groupIncludeSubGroups,
       groupTransformer: options.groupTransformer,
       organizationTransformer: options.organizationTransformer,
     });
diff --git a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts
index 3c8b903e69..c48ee18ffe 100644
--- a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts
@@ -317,6 +317,7 @@ export class MicrosoftGraphOrgEntityProvider implements EntityProvider {
         groupFilter: provider.groupFilter,
         groupSearch: provider.groupSearch,
         groupSelect: provider.groupSelect,
+        groupIncludeSubGroups: provider.groupIncludeSubGroups,
         queryMode: provider.queryMode,
         groupTransformer: this.options.groupTransformer,
         userTransformer: this.options.userTransformer,

From 24b3a3141b2eec8f89e4f76aa3cfc7328d28ea6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20St=C3=B6rkle?= <florian@stoerkle.net>
Date: Mon, 19 Feb 2024 08:35:18 +0100
Subject: [PATCH 004/225] docs: document `includeSubGroups` config option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Florian Störkle <florian@stoerkle.net>
---
 docs/integrations/azure/org.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/integrations/azure/org.md b/docs/integrations/azure/org.md
index 89abd4813b..b1719a63da 100644
--- a/docs/integrations/azure/org.md
+++ b/docs/integrations/azure/org.md
@@ -112,6 +112,17 @@ microsoftGraphOrg:
       search: '"description:One" AND ("displayName:Video" OR "displayName:Drive")'
 ```
 
+If you don't want to only ingest groups matching the `search` and/or `filter` query, but also the groups which are members of the matched groups, you can use the `includeSubGroups` configuration:
+
+```yaml
+microsoftGraphOrg:
+  providerId:
+    group:
+      filter: securityEnabled eq false and mailEnabled eq true and groupTypes/any(c:c+eq+'Unified')
+      search: '"description:One" AND ("displayName:Video" OR "displayName:Drive")'
+      includeSubGroups: true
+```
+
 In addition to these groups, one additional group will be created for your organization.
 All imported groups will be a child of this group.
 

From d9cf697afda7543d72610e59f656ca05e2c9c3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20St=C3=B6rkle?= <florian@stoerkle.net>
Date: Mon, 19 Feb 2024 08:40:38 +0100
Subject: [PATCH 005/225] chore: generate API report
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Florian Störkle <florian@stoerkle.net>
---
 plugins/catalog-backend-module-msgraph/api-report.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/catalog-backend-module-msgraph/api-report.md b/plugins/catalog-backend-module-msgraph/api-report.md
index 86170e2910..87402eedb1 100644
--- a/plugins/catalog-backend-module-msgraph/api-report.md
+++ b/plugins/catalog-backend-module-msgraph/api-report.md
@@ -39,10 +39,10 @@ export function defaultUserTransformer(
 // @public
 export type GroupMember =
   | (MicrosoftGraph.Group & {
-      '@odata.type': '#microsoft.graph.user';
+      '@odata.type': '#microsoft.graph.group';
     })
   | (MicrosoftGraph.User & {
-      '@odata.type': '#microsoft.graph.group';
+      '@odata.type': '#microsoft.graph.user';
     });
 
 // @public
@@ -210,6 +210,7 @@ export type MicrosoftGraphProviderConfig = {
   groupFilter?: string;
   groupSearch?: string;
   groupSelect?: string[];
+  groupIncludeSubGroups?: boolean;
   queryMode?: 'basic' | 'advanced';
   loadUserPhotos?: boolean;
   schedule?: TaskScheduleDefinition;
@@ -253,6 +254,7 @@ export function readMicrosoftGraphOrg(
     groupSearch?: string;
     groupFilter?: string;
     groupSelect?: string[];
+    groupIncludeSubGroups?: boolean;
     queryMode?: 'basic' | 'advanced';
     userTransformer?: UserTransformer;
     groupTransformer?: GroupTransformer;

From 58dff4d5e574428090ec09a4fbc7de3e08224c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20St=C3=B6rkle?= <florian@stoerkle.net>
Date: Tue, 16 Apr 2024 10:01:13 +0200
Subject: [PATCH 006/225] chore: add changeset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Florian Störkle <florian@stoerkle.net>
---
 .changeset/little-suns-fly.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/little-suns-fly.md

diff --git a/.changeset/little-suns-fly.md b/.changeset/little-suns-fly.md
new file mode 100644
index 0000000000..887df4be6d
--- /dev/null
+++ b/.changeset/little-suns-fly.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+---
+
+Added option to ingest groups based on their group membership in Azure Entra ID

From 2b8b4f115a1f3052dc5db9ff14c33b8d0afd8d20 Mon Sep 17 00:00:00 2001
From: Niall Thomson <thomson.niall@gmail.com>
Date: Tue, 11 Jun 2024 22:19:44 -0400
Subject: [PATCH 007/225] Removed code that catches error and formatted
 changeset markdown

Signed-off-by: Niall Thomson <thomson.niall@gmail.com>
---
 .changeset/swift-kings-sparkle.md             |  2 +-
 .../AwsOrganizationCloudAccountProcessor.ts   | 36 +++++++++----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.changeset/swift-kings-sparkle.md b/.changeset/swift-kings-sparkle.md
index 18a37b82f1..84ceae962b 100644
--- a/.changeset/swift-kings-sparkle.md
+++ b/.changeset/swift-kings-sparkle.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-catalog-backend-module-aws': patch
 ---
 
-AwsOrganizationCloudAccountProcessor configuration field roleArn is deprecated in favor of new field accountId
+`AwsOrganizationCloudAccountProcessor` configuration field `roleArn` is deprecated in favor of new field `accountId`
diff --git a/plugins/catalog-backend-module-aws/src/processors/AwsOrganizationCloudAccountProcessor.ts b/plugins/catalog-backend-module-aws/src/processors/AwsOrganizationCloudAccountProcessor.ts
index b843503a28..73d7a63e2b 100644
--- a/plugins/catalog-backend-module-aws/src/processors/AwsOrganizationCloudAccountProcessor.ts
+++ b/plugins/catalog-backend-module-aws/src/processors/AwsOrganizationCloudAccountProcessor.ts
@@ -106,27 +106,23 @@ export class AwsOrganizationCloudAccountProcessor implements CatalogProcessor {
 
     this.logger?.info('Discovering AWS Organization Account objects');
 
-    try {
-      (await this.getAwsAccounts())
-        .map(account => this.mapAccountToComponent(account))
-        .filter(entity => {
-          if (location.target !== '') {
-            if (entity.metadata.annotations) {
-              return (
-                entity.metadata.annotations[ORGANIZATION_ANNOTATION] ===
-                location.target
-              );
-            }
-            return false;
+    (await this.getAwsAccounts())
+      .map(account => this.mapAccountToComponent(account))
+      .filter(entity => {
+        if (location.target !== '') {
+          if (entity.metadata.annotations) {
+            return (
+              entity.metadata.annotations[ORGANIZATION_ANNOTATION] ===
+              location.target
+            );
           }
-          return true;
-        })
-        .forEach(entity => {
-          emit(processingResult.entity(location, entity));
-        });
-    } catch (e) {
-      this.logger?.error(e);
-    }
+          return false;
+        }
+        return true;
+      })
+      .forEach(entity => {
+        emit(processingResult.entity(location, entity));
+      });
 
     return true;
   }

From d42b410050645dcac54a3bbefa6f20e219b7a807 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 18 Jun 2024 11:53:20 +0200
Subject: [PATCH 008/225] chore: initial pass at implementation from mob with
 simple test

Signed-off-by: blam <ben@blam.sh>
---
 .../src/wiring/createExtensionKind.test.tsx   |  44 +++++
 .../src/wiring/createExtensionKind.ts         | 164 ++++++++++++++++++
 2 files changed, 208 insertions(+)
 create mode 100644 packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
 create mode 100644 packages/frontend-plugin-api/src/wiring/createExtensionKind.ts

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
new file mode 100644
index 0000000000..d841ea2c62
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { coreExtensionData } from './coreExtensionData';
+import { createExtensionKind } from './createExtensionKind';
+
+describe('createExtensionKind', () => {
+  it('should allow creation of extension kinds', () => {
+    const TestExtension = createExtensionKind({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      factory(_, props: { text: string }) {
+        return {
+          element: <h1>{props.text}</h1>,
+        };
+      },
+    });
+
+    const extension = TestExtension.new({
+      name: 'my-extension',
+      props: {
+        text: 'Hello, world!',
+      },
+    });
+
+    expect(extension).toBeDefined();
+  });
+});
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
new file mode 100644
index 0000000000..31a8e5da64
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
@@ -0,0 +1,164 @@
+import { AppNode } from '../apis';
+import { PortableSchema } from '../schema';
+import { Expand } from '../types';
+import {
+  AnyExtensionDataMap,
+  AnyExtensionInputMap,
+  ExtensionDataValues,
+  ResolvedExtensionInputs,
+  createExtension,
+} from './createExtension';
+
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+interface ExtensionKindOptions<
+  TProps,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  kind: string;
+  namespace?: string;
+  name?: string;
+  attachTo: { id: string; input: string };
+  disabled?: boolean;
+  inputs?: TInputs;
+  output: TOutput;
+  configSchema?: PortableSchema<TConfig>;
+  factory(
+    options: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+    },
+    props: TProps,
+  ): Expand<ExtensionDataValues<TOutput>>;
+}
+
+class ExtensionKind<
+  TProps,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  static create<
+    TProps,
+    TInputs extends AnyExtensionInputMap,
+    TOutput extends AnyExtensionDataMap,
+    TConfig,
+  >(
+    options: ExtensionKindOptions<TProps, TInputs, TOutput, TConfig>,
+  ): ExtensionKind<TProps, TInputs, TOutput, TConfig> {
+    return new ExtensionKind(options);
+  }
+
+  private constructor(
+    private readonly options: ExtensionKindOptions<
+      TProps,
+      TInputs,
+      TOutput,
+      TConfig
+    >,
+  ) {}
+
+  public new(options: {
+    namespace?: string;
+    name?: string;
+    attachTo?: { id: string; input: string };
+    disabled?: boolean;
+    inputs?: TInputs;
+    output?: TOutput;
+    configSchema?: PortableSchema<TConfig>;
+    props: TProps;
+    factory?(
+      options: {
+        node: AppNode;
+        config: TConfig;
+        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+        orignalFactory(
+          options?: {
+            node?: AppNode;
+            config?: TConfig;
+            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+          },
+          props?: TProps,
+        ): Expand<ExtensionDataValues<TOutput>>;
+      },
+      props: TProps,
+    ): Expand<ExtensionDataValues<TOutput>>;
+  }) {
+    return createExtension({
+      kind: this.options.kind,
+      namespace: options.namespace ?? this.options.namespace,
+      name: options.name ?? this.options.name,
+      attachTo: options.attachTo ?? this.options.attachTo,
+      disabled: options.disabled ?? this.options.disabled,
+      inputs: options.inputs ?? this.options.inputs,
+      output: options.output ?? this.options.output,
+      configSchema: options.configSchema ?? this.options.configSchema, // TODO: some config merging or smth
+      factory: ({ node, config, inputs }) => {
+        if (options.factory) {
+          return options.factory(
+            {
+              node,
+              config,
+              inputs,
+              orignalFactory: (
+                innerOptions?: {
+                  node?: AppNode;
+                  config?: TConfig;
+                  inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+                },
+                innerProps?: TProps,
+              ) =>
+                this.options.factory(
+                  {
+                    node: innerOptions?.node ?? node,
+                    config: innerOptions?.config ?? config,
+                    inputs: innerOptions?.inputs ?? inputs,
+                  },
+                  innerProps ?? options.props,
+                ),
+            },
+            options.props,
+          );
+        }
+
+        return this.options.factory(
+          {
+            node,
+            config,
+            inputs,
+          },
+          options.props,
+        );
+      },
+    });
+  }
+}
+
+/**
+ * A simpler replacement for wrapping up `createExtension` inside a kind or type. This allows for a cleaner API for creating
+ * types and instances of those types.
+ */
+export function createExtensionKind<
+  TProps,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+>(options: ExtensionKindOptions<TProps, TInputs, TOutput, TConfig>) {
+  return ExtensionKind.create(options);
+}

From d6c9f12ab3bc54f077e1d2baac8396c61c1c9cbf Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 18 Jun 2024 13:27:31 +0200
Subject: [PATCH 009/225] chore: add some simple tests

Signed-off-by: blam <ben@blam.sh>
---
 .../src/wiring/createExtensionKind.test.tsx   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
index d841ea2c62..ea9459f3f6 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
@@ -16,6 +16,7 @@
 import React from 'react';
 import { coreExtensionData } from './coreExtensionData';
 import { createExtensionKind } from './createExtensionKind';
+import { createExtensionTester } from '@backstage/frontend-test-utils';
 
 describe('createExtensionKind', () => {
   it('should allow creation of extension kinds', () => {
@@ -40,5 +41,40 @@ describe('createExtensionKind', () => {
     });
 
     expect(extension).toBeDefined();
+
+    const { container } = createExtensionTester(extension).render();
+    expect(container.querySelector('h1')).toHaveTextContent('Hello, world!');
+  });
+
+  it('should allow overriding of the default factory', () => {
+    const TestExtension = createExtensionKind({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      factory(_, props: { text: string }) {
+        return {
+          element: <h1>{props.text}</h1>,
+        };
+      },
+    });
+
+    const extension = TestExtension.new({
+      name: 'my-extension',
+      props: {
+        text: 'Hello, world!',
+      },
+      factory(_, props: { text: string }) {
+        return {
+          element: <h2>{props.text}</h2>,
+        };
+      },
+    });
+
+    expect(extension).toBeDefined();
+
+    const { container } = createExtensionTester(extension).render();
+    expect(container.querySelector('h2')).toHaveTextContent('Hello, world!');
   });
 });

From ad4591af6615ac1e6281e424ea3b7ec90e9ca4f9 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 18 Jun 2024 13:29:57 +0200
Subject: [PATCH 010/225] chore: test creted extension Signed-off-by: blam
 <ben@blam.sh>

---
 .../src/wiring/createExtensionKind.test.tsx   | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
index ea9459f3f6..2d5b218082 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
@@ -40,7 +40,31 @@ describe('createExtensionKind', () => {
       },
     });
 
-    expect(extension).toBeDefined();
+    expect(extension).toEqual({
+      $$type: '@backstage/ExtensionDefinition',
+      attachTo: {
+        id: 'test',
+        input: 'default',
+      },
+      configSchema: undefined,
+      disabled: false,
+      inputs: {},
+      kind: 'test-extension',
+      name: 'my-extension',
+      namespace: undefined,
+      output: {
+        element: {
+          $$type: '@backstage/ExtensionDataRef',
+          config: {},
+          id: 'core.reactElement',
+          optional: expect.any(Function),
+          toString: expect.any(Function),
+        },
+      },
+      factory: expect.any(Function),
+      toString: expect.any(Function),
+      version: 'v1',
+    });
 
     const { container } = createExtensionTester(extension).render();
     expect(container.querySelector('h1')).toHaveTextContent('Hello, world!');

From 71172a4caf3044b5379bd956c64d3535e1bc6528 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 18 Jun 2024 14:13:34 +0200
Subject: [PATCH 011/225] chore: added api-reports

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-plugin-api/api-report.md    | 95 +++++++++++++++++++
 .../src/wiring/createExtensionKind.ts         | 13 ++-
 .../frontend-plugin-api/src/wiring/index.ts   |  5 +
 3 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 3e19573d95..b4c761ec05 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -522,6 +522,16 @@ export function createExtensionInput<
   }
 >;
 
+// @public
+export function createExtensionKind<
+  TProps,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+>(
+  options: ExtensionKindOptions<TProps, TInputs, TOutput, TConfig>,
+): ExtensionKind<TProps, TInputs, TOutput, TConfig>;
+
 // @public (undocumented)
 export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
@@ -913,6 +923,91 @@ export interface ExtensionInput<
   extensionData: TExtensionData;
 }
 
+// @public (undocumented)
+export class ExtensionKind<
+  TProps,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  // (undocumented)
+  static create<
+    TProps,
+    TInputs extends AnyExtensionInputMap,
+    TOutput extends AnyExtensionDataMap,
+    TConfig,
+  >(
+    options: ExtensionKindOptions<TProps, TInputs, TOutput, TConfig>,
+  ): ExtensionKind<TProps, TInputs, TOutput, TConfig>;
+  // (undocumented)
+  new(options: {
+    namespace?: string;
+    name?: string;
+    attachTo?: {
+      id: string;
+      input: string;
+    };
+    disabled?: boolean;
+    inputs?: TInputs;
+    output?: TOutput;
+    configSchema?: PortableSchema<TConfig>;
+    props: TProps;
+    factory?(
+      options: {
+        node: AppNode;
+        config: TConfig;
+        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+        orignalFactory(
+          options?: {
+            node?: AppNode;
+            config?: TConfig;
+            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+          },
+          props?: TProps,
+        ): Expand<ExtensionDataValues<TOutput>>;
+      },
+      props: TProps,
+    ): Expand<ExtensionDataValues<TOutput>>;
+  }): ExtensionDefinition<TConfig>;
+}
+
+// @public (undocumented)
+export interface ExtensionKindOptions<
+  TProps,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  // (undocumented)
+  attachTo: {
+    id: string;
+    input: string;
+  };
+  // (undocumented)
+  configSchema?: PortableSchema<TConfig>;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  factory(
+    options: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+    },
+    props: TProps,
+  ): Expand<ExtensionDataValues<TOutput>>;
+  // (undocumented)
+  inputs?: TInputs;
+  // (undocumented)
+  kind: string;
+  // (undocumented)
+  name?: string;
+  // (undocumented)
+  namespace?: string;
+  // (undocumented)
+  output: TOutput;
+}
+
 // @public (undocumented)
 export interface ExtensionOverrides {
   // (undocumented)
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
index 31a8e5da64..2067d18c04 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
@@ -24,7 +24,11 @@ import {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-interface ExtensionKindOptions<
+
+/**
+ * @public
+ */
+export interface ExtensionKindOptions<
   TProps,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
@@ -48,7 +52,10 @@ interface ExtensionKindOptions<
   ): Expand<ExtensionDataValues<TOutput>>;
 }
 
-class ExtensionKind<
+/**
+ * @public
+ */
+export class ExtensionKind<
   TProps,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
@@ -153,6 +160,8 @@ class ExtensionKind<
 /**
  * A simpler replacement for wrapping up `createExtension` inside a kind or type. This allows for a cleaner API for creating
  * types and instances of those types.
+ *
+ * @public
  */
 export function createExtensionKind<
   TProps,
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index 61f821c7ce..e8c9afbaae 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -48,3 +48,8 @@ export {
   type FeatureFlagConfig,
   type FrontendFeature,
 } from './types';
+export {
+  type ExtensionKindOptions,
+  ExtensionKind,
+  createExtensionKind,
+} from './createExtensionKind';

From 4e53ad666d3c39d53ad4b81d7b6869a23dc1d5fa Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 18 Jun 2024 14:15:39 +0200
Subject: [PATCH 012/225] chore: add changeset

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/dry-squids-tap.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .changeset/dry-squids-tap.md

diff --git a/.changeset/dry-squids-tap.md b/.changeset/dry-squids-tap.md
new file mode 100644
index 0000000000..a9eb7efb3b
--- /dev/null
+++ b/.changeset/dry-squids-tap.md
@@ -0,0 +1,26 @@
+---
+'@backstage/frontend-plugin-api': patch
+---
+
+Introduce a new way to create extension types and kinds, with `createExtensionKind`.
+
+This allows the creation of extension with the following pattern:
+
+```tsx
+// create the extension kind
+const TestExtension = createExtensionKind({
+  kind: 'test-extension',
+  attachTo: { id: 'test', input: 'default' },
+  output: {
+    element: coreExtensionData.reactElement,
+  },
+  factory(_, props: { text: string }) {
+    return {
+      element: <h1>{props.text}</h1>,
+    };
+  },
+});
+
+// create an instance of the extension kind with props
+const testExtension = TestExtension.create({ text: 'Hello World' });
+```

From 8839381d6a0980df52604bc6fd8cca5a44931afc Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Fri, 21 Jun 2024 00:41:13 -0400
Subject: [PATCH 013/225] Add scaffolder option to display object items in
 separate rows

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .changeset/late-games-protect.md              |   5 +
 .../ReviewState/ReviewState.test.tsx          | 173 ++++++++++++++++++
 .../components/ReviewState/ReviewState.tsx    |  63 ++++++-
 3 files changed, 232 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/late-games-protect.md

diff --git a/.changeset/late-games-protect.md b/.changeset/late-games-protect.md
new file mode 100644
index 0000000000..584780f836
--- /dev/null
+++ b/.changeset/late-games-protect.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': minor
+---
+
+Add scaffolder option to display object items in separate rows on review page
diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
index e9277b2230..dfa1c9c097 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
@@ -202,4 +202,177 @@ describe('ReviewState', () => {
 
     expect(queryByRole('row', { name: 'Name type4' })).toBeInTheDocument();
   });
+
+  it('should display exploded object in separate rows', async () => {
+    const formState = {
+      name: {
+        foo: 'type3',
+        bar: 'type4',
+      },
+    };
+
+    const schemas: ParsedTemplateSchema[] = [
+      {
+        mergedSchema: {
+          type: 'object',
+          properties: {
+            name: {
+              type: 'object',
+              'ui:backstage': {
+                review: {
+                  explode: true,
+                },
+              },
+              properties: {
+                foo: {
+                  type: 'string',
+                  default: 'type1',
+                },
+                bar: {
+                  type: 'string',
+                  default: 'type2',
+                },
+              },
+            },
+          },
+        },
+        schema: {},
+        title: 'test',
+        uiSchema: {},
+        description: 'asd',
+      },
+    ];
+
+    const { queryByRole } = render(
+      <ReviewState formState={formState} schemas={schemas} />,
+    );
+
+    expect(queryByRole('row', { name: 'Foo type3' })).toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Bar type4' })).toBeInTheDocument();
+  });
+
+  it('should display exploded nested objects', async () => {
+    const formState = {
+      name: {
+        foo: 'type3',
+        bar: 'type4',
+        example: {
+          test: 'type6',
+        },
+      },
+    };
+
+    const schemas: ParsedTemplateSchema[] = [
+      {
+        mergedSchema: {
+          type: 'object',
+          properties: {
+            name: {
+              type: 'object',
+              'ui:backstage': {
+                review: {
+                  explode: true,
+                },
+              },
+              properties: {
+                foo: {
+                  type: 'string',
+                  default: 'type1',
+                },
+                bar: {
+                  type: 'string',
+                  default: 'type2',
+                },
+                example: {
+                  type: 'object',
+                  'ui:backstage': {
+                    review: {
+                      explode: true,
+                    },
+                  },
+                  properties: {
+                    test: {
+                      type: 'string',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        schema: {},
+        title: 'test',
+        uiSchema: {},
+        description: 'asd',
+      },
+    ];
+
+    const { queryByRole } = render(
+      <ReviewState formState={formState} schemas={schemas} />,
+    );
+
+    expect(queryByRole('row', { name: 'Foo type3' })).toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Bar type4' })).toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Test type6' })).toBeInTheDocument();
+  });
+
+  it('should display partially exploded nested objects', async () => {
+    const formState = {
+      name: {
+        foo: 'type3',
+        bar: 'type4',
+        example: {
+          test: 'type6',
+        },
+      },
+    };
+
+    const schemas: ParsedTemplateSchema[] = [
+      {
+        mergedSchema: {
+          type: 'object',
+          properties: {
+            name: {
+              type: 'object',
+              'ui:backstage': {
+                review: {
+                  explode: true,
+                },
+              },
+              properties: {
+                foo: {
+                  type: 'string',
+                  default: 'type1',
+                },
+                bar: {
+                  type: 'string',
+                  default: 'type2',
+                },
+                example: {
+                  type: 'object',
+                  properties: {
+                    test: {
+                      type: 'string',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        schema: {},
+        title: 'test',
+        uiSchema: {},
+        description: 'asd',
+      },
+    ];
+
+    const { queryByRole } = render(
+      <ReviewState formState={formState} schemas={schemas} />,
+    );
+
+    expect(queryByRole('row', { name: 'Foo type3' })).toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Bar type4' })).toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Test type6' })).not.toBeInTheDocument();
+  });
 });
diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
index e3c7bc303e..ac7ac989e3 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
@@ -15,7 +15,7 @@
  */
 import React from 'react';
 import { StructuredMetadataTable } from '@backstage/core-components';
-import { JsonObject } from '@backstage/types';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { Draft07 as JSONSchema } from 'json-schema-library';
 import { ParsedTemplateSchema } from '../../hooks/useTemplateSchema';
 
@@ -28,6 +28,39 @@ export type ReviewStateProps = {
   formState: JsonObject;
 };
 
+function flattenObject(
+  obj: JsonObject,
+  prefix: string,
+  schema: JSONSchema,
+  formState: JsonObject,
+): [string, JsonValue | undefined][] {
+  return Object.entries(obj).flatMap(([key, value]) => {
+    const prefixedKey = prefix ? `${prefix}/${key}` : key;
+
+    const definitionInSchema = schema.getSchema({
+      pointer: `#/${prefixedKey}`,
+      data: formState,
+    });
+
+    if (definitionInSchema) {
+      const backstageReviewOptions = definitionInSchema['ui:backstage']?.review;
+
+      // Recurse into nested objects
+      if (
+        backstageReviewOptions &&
+        backstageReviewOptions.explode &&
+        typeof value === 'object' &&
+        value !== null &&
+        !Array.isArray(value)
+      ) {
+        return flattenObject(value, prefixedKey, schema, formState);
+      }
+    }
+
+    return [[key, value]];
+  });
+}
+
 /**
  * The component used by the {@link Stepper} to render the review step.
  * @alpha
@@ -35,7 +68,7 @@ export type ReviewStateProps = {
 export const ReviewState = (props: ReviewStateProps) => {
   const reviewData = Object.fromEntries(
     Object.entries(props.formState)
-      .map(([key, value]) => {
+      .flatMap(([key, value]) => {
         for (const step of props.schemas) {
           const parsedSchema = new JSONSchema(step.mergedSchema);
           const definitionInSchema = parsedSchema.getSchema({
@@ -49,30 +82,42 @@ export const ReviewState = (props: ReviewStateProps) => {
 
             if (backstageReviewOptions) {
               if (backstageReviewOptions.mask) {
-                return [key, backstageReviewOptions.mask];
+                return [[key, backstageReviewOptions.mask]];
               }
               if (backstageReviewOptions.show === false) {
                 return [];
               }
+              if (
+                backstageReviewOptions.explode &&
+                typeof value === 'object' &&
+                value !== null &&
+                !Array.isArray(value)
+              ) {
+                return flattenObject(value, key, parsedSchema, props.formState);
+              }
             }
 
             if (definitionInSchema['ui:widget'] === 'password') {
-              return [key, '******'];
+              return [[key, '******']];
             }
 
             if (definitionInSchema.enum && definitionInSchema.enumNames) {
               return [
-                key,
-                definitionInSchema.enumNames[
-                  definitionInSchema.enum.indexOf(value)
-                ] || value,
+                [
+                  key,
+                  definitionInSchema.enumNames[
+                    definitionInSchema.enum.indexOf(value)
+                  ] || value,
+                ],
               ];
             }
           }
         }
-        return [key, value];
+
+        return [[key, value]];
       })
       .filter(prop => prop.length > 0),
   );
+
   return <StructuredMetadataTable metadata={reviewData} />;
 };

From 546700b0c1acd565c089c6b8a9a89228d3f97909 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 26 Jun 2024 14:15:45 +0200
Subject: [PATCH 014/225] chore: some PR feedback suggestions

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/dry-squids-tap.md                  |  9 +-
 packages/frontend-plugin-api/api-report.md    | 36 +++----
 .../src/wiring/createExtension.ts             |  4 +-
 .../src/wiring/createExtensionKind.test.tsx   | 17 ++--
 .../src/wiring/createExtensionKind.ts         | 93 ++++++++++---------
 .../frontend-plugin-api/src/wiring/index.ts   |  2 +-
 6 files changed, 84 insertions(+), 77 deletions(-)

diff --git a/.changeset/dry-squids-tap.md b/.changeset/dry-squids-tap.md
index a9eb7efb3b..5193e1f204 100644
--- a/.changeset/dry-squids-tap.md
+++ b/.changeset/dry-squids-tap.md
@@ -8,7 +8,7 @@ This allows the creation of extension with the following pattern:
 
 ```tsx
 // create the extension kind
-const TestExtension = createExtensionKind({
+const TestExtensionKind = createExtensionKind({
   kind: 'test-extension',
   attachTo: { id: 'test', input: 'default' },
   output: {
@@ -22,5 +22,10 @@ const TestExtension = createExtensionKind({
 });
 
 // create an instance of the extension kind with props
-const testExtension = TestExtension.create({ text: 'Hello World' });
+const testExtension = TestExtensionKind.new({
+  name: 'foo',
+  options: {
+    text: 'Hello World',
+  },
+});
 ```
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index b4c761ec05..48718f5375 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -524,13 +524,13 @@ export function createExtensionInput<
 
 // @public
 export function createExtensionKind<
-  TProps,
+  TOptions,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
 >(
-  options: ExtensionKindOptions<TProps, TInputs, TOutput, TConfig>,
-): ExtensionKind<TProps, TInputs, TOutput, TConfig>;
+  options: ExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
+): ExtensionKind<TOptions, TInputs, TOutput, TConfig>;
 
 // @public (undocumented)
 export interface CreateExtensionOptions<
@@ -548,7 +548,7 @@ export interface CreateExtensionOptions<
   // (undocumented)
   disabled?: boolean;
   // (undocumented)
-  factory(options: {
+  factory(context: {
     node: AppNode;
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
@@ -923,24 +923,24 @@ export interface ExtensionInput<
   extensionData: TExtensionData;
 }
 
-// @public (undocumented)
+// @public
 export class ExtensionKind<
-  TProps,
+  TOptions,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
 > {
   // (undocumented)
   static create<
-    TProps,
+    TOptions,
     TInputs extends AnyExtensionInputMap,
     TOutput extends AnyExtensionDataMap,
     TConfig,
   >(
-    options: ExtensionKindOptions<TProps, TInputs, TOutput, TConfig>,
-  ): ExtensionKind<TProps, TInputs, TOutput, TConfig>;
+    options: ExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
+  ): ExtensionKind<TOptions, TInputs, TOutput, TConfig>;
   // (undocumented)
-  new(options: {
+  new(args: {
     namespace?: string;
     name?: string;
     attachTo?: {
@@ -951,29 +951,29 @@ export class ExtensionKind<
     inputs?: TInputs;
     output?: TOutput;
     configSchema?: PortableSchema<TConfig>;
-    props: TProps;
+    options: TOptions;
     factory?(
-      options: {
+      context: {
         node: AppNode;
         config: TConfig;
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         orignalFactory(
-          options?: {
+          context?: {
             node?: AppNode;
             config?: TConfig;
             inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
           },
-          props?: TProps,
+          options?: TOptions,
         ): Expand<ExtensionDataValues<TOutput>>;
       },
-      props: TProps,
+      options: TOptions,
     ): Expand<ExtensionDataValues<TOutput>>;
   }): ExtensionDefinition<TConfig>;
 }
 
 // @public (undocumented)
 export interface ExtensionKindOptions<
-  TProps,
+  TOptions,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
@@ -989,12 +989,12 @@ export interface ExtensionKindOptions<
   disabled?: boolean;
   // (undocumented)
   factory(
-    options: {
+    context: {
       node: AppNode;
       config: TConfig;
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
-    props: TProps,
+    options: TOptions,
   ): Expand<ExtensionDataValues<TOutput>>;
   // (undocumented)
   inputs?: TInputs;
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index be76fbc069..28dc6a4e29 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -91,7 +91,7 @@ export interface CreateExtensionOptions<
   inputs?: TInputs;
   output: TOutput;
   configSchema?: PortableSchema<TConfig>;
-  factory(options: {
+  factory(context: {
     node: AppNode;
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
@@ -115,7 +115,7 @@ export interface InternalExtensionDefinition<TConfig>
   readonly version: 'v1';
   readonly inputs: AnyExtensionInputMap;
   readonly output: AnyExtensionDataMap;
-  factory(options: {
+  factory(context: {
     node: AppNode;
     config: TConfig;
     inputs: ResolvedExtensionInputs<any>;
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
index 2d5b218082..3bdcd3a7cc 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import { coreExtensionData } from './coreExtensionData';
 import { createExtensionKind } from './createExtensionKind';
@@ -26,16 +27,16 @@ describe('createExtensionKind', () => {
       output: {
         element: coreExtensionData.reactElement,
       },
-      factory(_, props: { text: string }) {
+      factory(_, options: { text: string }) {
         return {
-          element: <h1>{props.text}</h1>,
+          element: <h1>{options.text}</h1>,
         };
       },
     });
 
     const extension = TestExtension.new({
       name: 'my-extension',
-      props: {
+      options: {
         text: 'Hello, world!',
       },
     });
@@ -77,21 +78,21 @@ describe('createExtensionKind', () => {
       output: {
         element: coreExtensionData.reactElement,
       },
-      factory(_, props: { text: string }) {
+      factory(_, options: { text: string }) {
         return {
-          element: <h1>{props.text}</h1>,
+          element: <h1>{options.text}</h1>,
         };
       },
     });
 
     const extension = TestExtension.new({
       name: 'my-extension',
-      props: {
+      options: {
         text: 'Hello, world!',
       },
-      factory(_, props: { text: string }) {
+      factory(_, options: { text: string }) {
         return {
-          element: <h2>{props.text}</h2>,
+          element: <h2>{options.text}</h2>,
         };
       },
     });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
index 2067d18c04..52bf711822 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
@@ -1,14 +1,3 @@
-import { AppNode } from '../apis';
-import { PortableSchema } from '../schema';
-import { Expand } from '../types';
-import {
-  AnyExtensionDataMap,
-  AnyExtensionInputMap,
-  ExtensionDataValues,
-  ResolvedExtensionInputs,
-  createExtension,
-} from './createExtension';
-
 /*
  * Copyright 2024 The Backstage Authors
  *
@@ -25,11 +14,22 @@ import {
  * limitations under the License.
  */
 
+import { AppNode } from '../apis';
+import { PortableSchema } from '../schema';
+import { Expand } from '../types';
+import {
+  AnyExtensionDataMap,
+  AnyExtensionInputMap,
+  ExtensionDataValues,
+  ResolvedExtensionInputs,
+  createExtension,
+} from './createExtension';
+
 /**
  * @public
  */
-export interface ExtensionKindOptions<
-  TProps,
+export interface CreateExtensionKindOptions<
+  TOptions,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
@@ -43,45 +43,46 @@ export interface ExtensionKindOptions<
   output: TOutput;
   configSchema?: PortableSchema<TConfig>;
   factory(
-    options: {
+    context: {
       node: AppNode;
       config: TConfig;
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
-    props: TProps,
+    options: TOptions,
   ): Expand<ExtensionDataValues<TOutput>>;
 }
 
 /**
+ * TODO: should we export an interface instead of a concrete class?
  * @public
  */
 export class ExtensionKind<
-  TProps,
+  TOptions,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
 > {
   static create<
-    TProps,
+    TOptions,
     TInputs extends AnyExtensionInputMap,
     TOutput extends AnyExtensionDataMap,
     TConfig,
   >(
-    options: ExtensionKindOptions<TProps, TInputs, TOutput, TConfig>,
-  ): ExtensionKind<TProps, TInputs, TOutput, TConfig> {
+    options: CreateExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
+  ): ExtensionKind<TOptions, TInputs, TOutput, TConfig> {
     return new ExtensionKind(options);
   }
 
   private constructor(
-    private readonly options: ExtensionKindOptions<
-      TProps,
+    private readonly options: CreateExtensionKindOptions<
+      TOptions,
       TInputs,
       TOutput,
       TConfig
     >,
   ) {}
 
-  public new(options: {
+  public new(args: {
     namespace?: string;
     name?: string;
     attachTo?: { id: string; input: string };
@@ -89,58 +90,58 @@ export class ExtensionKind<
     inputs?: TInputs;
     output?: TOutput;
     configSchema?: PortableSchema<TConfig>;
-    props: TProps;
+    options: TOptions;
     factory?(
-      options: {
+      context: {
         node: AppNode;
         config: TConfig;
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         orignalFactory(
-          options?: {
+          context?: {
             node?: AppNode;
             config?: TConfig;
             inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
           },
-          props?: TProps,
+          options?: TOptions,
         ): Expand<ExtensionDataValues<TOutput>>;
       },
-      props: TProps,
+      options: TOptions,
     ): Expand<ExtensionDataValues<TOutput>>;
   }) {
     return createExtension({
       kind: this.options.kind,
-      namespace: options.namespace ?? this.options.namespace,
-      name: options.name ?? this.options.name,
-      attachTo: options.attachTo ?? this.options.attachTo,
-      disabled: options.disabled ?? this.options.disabled,
-      inputs: options.inputs ?? this.options.inputs,
-      output: options.output ?? this.options.output,
-      configSchema: options.configSchema ?? this.options.configSchema, // TODO: some config merging or smth
+      namespace: args.namespace ?? this.options.namespace,
+      name: args.name ?? this.options.name,
+      attachTo: args.attachTo ?? this.options.attachTo,
+      disabled: args.disabled ?? this.options.disabled,
+      inputs: args.inputs ?? this.options.inputs,
+      output: args.output ?? this.options.output,
+      configSchema: args.configSchema ?? this.options.configSchema, // TODO: some config merging or smth
       factory: ({ node, config, inputs }) => {
-        if (options.factory) {
-          return options.factory(
+        if (args.factory) {
+          return args.factory(
             {
               node,
               config,
               inputs,
               orignalFactory: (
-                innerOptions?: {
+                innerContext?: {
                   node?: AppNode;
                   config?: TConfig;
                   inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
                 },
-                innerProps?: TProps,
+                innerOptions?: TOptions,
               ) =>
                 this.options.factory(
                   {
-                    node: innerOptions?.node ?? node,
-                    config: innerOptions?.config ?? config,
-                    inputs: innerOptions?.inputs ?? inputs,
+                    node: innerContext?.node ?? node,
+                    config: innerContext?.config ?? config,
+                    inputs: innerContext?.inputs ?? inputs,
                   },
-                  innerProps ?? options.props,
+                  innerOptions ?? args.options,
                 ),
             },
-            options.props,
+            args.options,
           );
         }
 
@@ -150,7 +151,7 @@ export class ExtensionKind<
             config,
             inputs,
           },
-          options.props,
+          args.options,
         );
       },
     });
@@ -164,10 +165,10 @@ export class ExtensionKind<
  * @public
  */
 export function createExtensionKind<
-  TProps,
+  TOptions,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
->(options: ExtensionKindOptions<TProps, TInputs, TOutput, TConfig>) {
+>(options: CreateExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>) {
   return ExtensionKind.create(options);
 }
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index e8c9afbaae..8fe9dc3a54 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -49,7 +49,7 @@ export {
   type FrontendFeature,
 } from './types';
 export {
-  type ExtensionKindOptions,
+  type CreateExtensionKindOptions as ExtensionKindOptions,
   ExtensionKind,
   createExtensionKind,
 } from './createExtensionKind';

From a629fb22914852cd5f2c2e431b372833773c5156 Mon Sep 17 00:00:00 2001
From: 1337 <19777147+the-serious-programmer@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:26:29 +0000
Subject: [PATCH 015/225] Added setAllowedLocationTypes with new
 CatalogLocationsExtensionPoint

Signed-off-by: The serious programmer <19777147+the-serious-programmer@users.noreply.github.com>
Signed-off-by: 1337 <19777147+the-serious-programmer@users.noreply.github.com>
---
 .changeset/hip-hairs-exist.md                 |  6 +++++
 .../src/service/CatalogPlugin.ts              | 26 +++++++++++++++++++
 plugins/catalog-node/api-report-alpha.md      |  8 ++++++
 plugins/catalog-node/src/alpha.ts             |  2 ++
 plugins/catalog-node/src/extensions.ts        | 19 ++++++++++++++
 5 files changed, 61 insertions(+)
 create mode 100644 .changeset/hip-hairs-exist.md

diff --git a/.changeset/hip-hairs-exist.md b/.changeset/hip-hairs-exist.md
new file mode 100644
index 0000000000..d8cb939dfb
--- /dev/null
+++ b/.changeset/hip-hairs-exist.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-catalog-node': patch
+---
+
+Added setAllowedLocationTypes while introducing a new extension point called CatalogLocationsExtensionPoint
diff --git a/plugins/catalog-backend/src/service/CatalogPlugin.ts b/plugins/catalog-backend/src/service/CatalogPlugin.ts
index aebd969701..2f5fd9103d 100644
--- a/plugins/catalog-backend/src/service/CatalogPlugin.ts
+++ b/plugins/catalog-backend/src/service/CatalogPlugin.ts
@@ -28,6 +28,8 @@ import {
   catalogPermissionExtensionPoint,
   CatalogProcessingExtensionPoint,
   catalogProcessingExtensionPoint,
+  CatalogLocationsExtensionPoint,
+  catalogLocationsExtensionPoint,
 } from '@backstage/plugin-catalog-node/alpha';
 import {
   CatalogProcessor,
@@ -41,6 +43,20 @@ import { merge } from 'lodash';
 import { Permission } from '@backstage/plugin-permission-common';
 import { ForwardedError } from '@backstage/errors';
 
+class CatalogLocationsExtensionPointImpl
+  implements CatalogLocationsExtensionPoint
+{
+  #locationTypes = new Array<string>();
+
+  setAllowedLocationTypes(locationTypes: Array<string>) {
+    this.#locationTypes = locationTypes;
+  }
+
+  get allowedLocationTypes() {
+    return this.#locationTypes;
+  }
+}
+
 class CatalogProcessingExtensionPointImpl
   implements CatalogProcessingExtensionPoint
 {
@@ -199,6 +215,12 @@ export const catalogPlugin = createBackendPlugin({
     const modelExtensions = new CatalogModelExtensionPointImpl();
     env.registerExtensionPoint(catalogModelExtensionPoint, modelExtensions);
 
+    const locationTypeExtensions = new CatalogLocationsExtensionPointImpl();
+    env.registerExtensionPoint(
+      catalogLocationsExtensionPoint,
+      locationTypeExtensions,
+    );
+
     env.registerInit({
       deps: {
         logger: coreServices.logger,
@@ -271,6 +293,10 @@ export const catalogPlugin = createBackendPlugin({
         builder.addPermissionRules(...permissionExtensions.permissionRules);
         builder.setFieldFormatValidators(modelExtensions.fieldValidators);
 
+        builder.setAllowedLocationTypes(
+          locationTypeExtensions.allowedLocationTypes,
+        );
+
         const { processingEngine, router } = await builder.build();
 
         lifecycle.addStartupHook(async () => {
diff --git a/plugins/catalog-node/api-report-alpha.md b/plugins/catalog-node/api-report-alpha.md
index b61d1b1d27..e14f55c196 100644
--- a/plugins/catalog-node/api-report-alpha.md
+++ b/plugins/catalog-node/api-report-alpha.md
@@ -34,6 +34,14 @@ export interface CatalogAnalysisExtensionPoint {
 // @alpha (undocumented)
 export const catalogAnalysisExtensionPoint: ExtensionPoint<CatalogAnalysisExtensionPoint>;
 
+// @alpha (undocumented)
+export interface CatalogLocationsExtensionPoint {
+  setAllowedLocationTypes(locationTypes: Array<string>): void;
+}
+
+// @alpha (undocumented)
+export const catalogLocationsExtensionPoint: ExtensionPoint<CatalogLocationsExtensionPoint>;
+
 // @alpha (undocumented)
 export interface CatalogModelExtensionPoint {
   setEntityDataParser(parser: CatalogProcessorParser): void;
diff --git a/plugins/catalog-node/src/alpha.ts b/plugins/catalog-node/src/alpha.ts
index 91b5bb99b6..b75ec48a7f 100644
--- a/plugins/catalog-node/src/alpha.ts
+++ b/plugins/catalog-node/src/alpha.ts
@@ -15,6 +15,8 @@
  */
 
 export { catalogServiceRef } from './catalogService';
+export type { CatalogLocationsExtensionPoint } from './extensions';
+export { catalogLocationsExtensionPoint } from './extensions';
 export type { CatalogProcessingExtensionPoint } from './extensions';
 export { catalogProcessingExtensionPoint } from './extensions';
 export type { CatalogAnalysisExtensionPoint } from './extensions';
diff --git a/plugins/catalog-node/src/extensions.ts b/plugins/catalog-node/src/extensions.ts
index 7c1fe6c30d..a971e1588d 100644
--- a/plugins/catalog-node/src/extensions.ts
+++ b/plugins/catalog-node/src/extensions.ts
@@ -31,6 +31,25 @@ import {
 } from '@backstage/plugin-permission-common';
 import { PermissionRule } from '@backstage/plugin-permission-node';
 
+/**
+ * @alpha
+ */
+export interface CatalogLocationsExtensionPoint {
+  /**
+   * Allows setting custom location types, such as showcased in: https://backstage.io/docs/features/software-catalog/external-integrations/#creating-a-catalog-data-reader-processor
+   * @param locationTypes - List of location types to allow, default is "url" and "file"
+   */
+  setAllowedLocationTypes(locationTypes: Array<string>): void;
+}
+
+/**
+ * @alpha
+ */
+export const catalogLocationsExtensionPoint =
+  createExtensionPoint<CatalogLocationsExtensionPoint>({
+    id: 'catalog.locations',
+  });
+
 /**
  * @alpha
  */

From 64e7e9409f6bc84fed0241adca226d09ac396561 Mon Sep 17 00:00:00 2001
From: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
Date: Thu, 27 Jun 2024 21:44:08 +0200
Subject: [PATCH 016/225] feat: add oauth token option for fetch action

Signed-off-by: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
---
 .../urlReader/lib/GitlabUrlReader.ts          | 26 +++++++--------
 packages/integration/src/gitlab/core.test.ts  | 32 ++++++++++++++++++-
 packages/integration/src/gitlab/core.ts       | 17 +++++++---
 3 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
index 615eeb20a2..35123da851 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
@@ -23,21 +23,21 @@ import {
   UrlReaderServiceSearchOptions,
   UrlReaderServiceSearchResponse,
 } from '@backstage/backend-plugin-api';
+import { NotFoundError, NotModifiedError } from '@backstage/errors';
 import {
+  GitLabIntegration,
+  ScmIntegrations,
   getGitLabFileFetchUrl,
   getGitLabIntegrationRelativePath,
   getGitLabRequestOptions,
-  GitLabIntegration,
-  ScmIntegrations,
 } from '@backstage/integration';
-import fetch, { Response } from 'node-fetch';
 import parseGitUrl from 'git-url-parse';
-import { Minimatch } from 'minimatch';
-import { Readable } from 'stream';
-import { NotFoundError, NotModifiedError } from '@backstage/errors';
-import { ReadTreeResponseFactory, ReaderFactory } from './types';
 import { trimEnd, trimStart } from 'lodash';
+import { Minimatch } from 'minimatch';
+import fetch, { Response } from 'node-fetch';
+import { Readable } from 'stream';
 import { ReadUrlResponseFactory } from './ReadUrlResponseFactory';
+import { ReadTreeResponseFactory, ReaderFactory } from './types';
 import { parseLastModified } from './util';
 
 /**
@@ -71,14 +71,14 @@ export class GitlabUrlReader implements UrlReaderService {
     url: string,
     options?: UrlReaderServiceReadUrlOptions,
   ): Promise<UrlReaderServiceReadUrlResponse> {
-    const { etag, lastModifiedAfter, signal } = options ?? {};
+    const { etag, lastModifiedAfter, signal, token } = options ?? {};
     const builtUrl = await this.getGitlabFetchUrl(url);
 
     let response: Response;
     try {
       response = await fetch(builtUrl, {
         headers: {
-          ...getGitLabRequestOptions(this.integration.config).headers,
+          ...getGitLabRequestOptions(this.integration.config, token).headers,
           ...(etag && { 'If-None-Match': etag }),
           ...(lastModifiedAfter && {
             'If-Modified-Since': lastModifiedAfter.toUTCString(),
@@ -120,7 +120,7 @@ export class GitlabUrlReader implements UrlReaderService {
     url: string,
     options?: UrlReaderServiceReadTreeOptions,
   ): Promise<UrlReaderServiceReadTreeResponse> {
-    const { etag, signal } = options ?? {};
+    const { etag, signal, token } = options ?? {};
     const { ref, full_name, filepath } = parseGitUrl(url);
 
     let repoFullName = full_name;
@@ -147,7 +147,7 @@ export class GitlabUrlReader implements UrlReaderService {
           repoFullName,
         )}`,
       ).toString(),
-      getGitLabRequestOptions(this.integration.config),
+      getGitLabRequestOptions(this.integration.config, token),
     );
     if (!projectGitlabResponse.ok) {
       const msg = `Failed to read tree from ${url}, ${projectGitlabResponse.status} ${projectGitlabResponse.statusText}`;
@@ -175,7 +175,7 @@ export class GitlabUrlReader implements UrlReaderService {
         )}/repository/commits?${commitsReqParams.toString()}`,
       ).toString(),
       {
-        ...getGitLabRequestOptions(this.integration.config),
+        ...getGitLabRequestOptions(this.integration.config, token),
         // TODO(freben): The signal cast is there because pre-3.x versions of
         // node-fetch have a very slightly deviating AbortSignal type signature.
         // The difference does not affect us in practice however. The cast can
@@ -209,7 +209,7 @@ export class GitlabUrlReader implements UrlReaderService {
         repoFullName,
       )}/repository/archive?${archiveReqParams.toString()}`,
       {
-        ...getGitLabRequestOptions(this.integration.config),
+        ...getGitLabRequestOptions(this.integration.config, token),
         // TODO(freben): The signal cast is there because pre-3.x versions of
         // node-fetch have a very slightly deviating AbortSignal type signature.
         // The difference does not affect us in practice however. The cast can
diff --git a/packages/integration/src/gitlab/core.test.ts b/packages/integration/src/gitlab/core.test.ts
index 98fd9b7c13..fd374ea56f 100644
--- a/packages/integration/src/gitlab/core.test.ts
+++ b/packages/integration/src/gitlab/core.test.ts
@@ -17,7 +17,7 @@
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { GitLabIntegrationConfig } from './config';
-import { getGitLabFileFetchUrl } from './core';
+import { getGitLabFileFetchUrl, getGitLabRequestOptions } from './core';
 
 const worker = setupServer();
 
@@ -186,4 +186,34 @@ describe('gitlab core', () => {
       });
     });
   });
+
+  describe('getGitLabRequestOptions', () => {
+    it('should return Authorization header when oauthToken is provided', () => {
+      const oauthToken = 'mock-oauth-token';
+      const result = getGitLabRequestOptions(
+        configSelfHosteWithRelativePath,
+        oauthToken,
+      );
+
+      expect(result).toEqual({
+        headers: {
+          Authorization: `Bearer ${oauthToken}`,
+        },
+      });
+    });
+
+    it('should return private-token header when oauthToken is undefined', () => {
+      const oauthToken = undefined;
+      const result = getGitLabRequestOptions(
+        configSelfHosteWithRelativePath,
+        oauthToken,
+      );
+
+      expect(result).toEqual({
+        headers: {
+          'PRIVATE-TOKEN': configSelfHosteWithRelativePath.token,
+        },
+      });
+    });
+  });
 });
diff --git a/packages/integration/src/gitlab/core.ts b/packages/integration/src/gitlab/core.ts
index 040ca202d6..e940440ea4 100644
--- a/packages/integration/src/gitlab/core.ts
+++ b/packages/integration/src/gitlab/core.ts
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+import fetch from 'cross-fetch';
 import {
   getGitLabIntegrationRelativePath,
   GitLabIntegrationConfig,
 } from './config';
-import fetch from 'cross-fetch';
 
 /**
  * Given a URL pointing to a file on a provider, returns a URL that is suitable
@@ -51,9 +51,18 @@ export async function getGitLabFileFetchUrl(
  * @param config - The relevant provider config
  * @public
  */
-export function getGitLabRequestOptions(config: GitLabIntegrationConfig): {
-  headers: Record<string, string>;
-} {
+export function getGitLabRequestOptions(
+  config: GitLabIntegrationConfig,
+  oauthToken?: string,
+): { headers: Record<string, string> } {
+  if (oauthToken) {
+    return {
+      headers: {
+        Authorization: `Bearer ${oauthToken}`,
+      },
+    };
+  }
+
   const { token = '' } = config;
   return {
     headers: {

From 2f7a7df46b557ddb747e2952cc657aa9f46be133 Mon Sep 17 00:00:00 2001
From: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
Date: Thu, 27 Jun 2024 22:10:40 +0200
Subject: [PATCH 017/225] feat: add possibility of a user provided glpat

Signed-off-by: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
---
 packages/integration/src/gitlab/core.test.ts | 22 ++++++++++++++++----
 packages/integration/src/gitlab/core.ts      | 18 ++++++++--------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/packages/integration/src/gitlab/core.test.ts b/packages/integration/src/gitlab/core.test.ts
index fd374ea56f..c6e7410932 100644
--- a/packages/integration/src/gitlab/core.test.ts
+++ b/packages/integration/src/gitlab/core.test.ts
@@ -189,15 +189,30 @@ describe('gitlab core', () => {
 
   describe('getGitLabRequestOptions', () => {
     it('should return Authorization header when oauthToken is provided', () => {
-      const oauthToken = 'mock-oauth-token';
+      const token =
+        'de6780bc506a0446309bd9362820ba8aed28aa506c71eedbe1c5c4f9dd350e54';
       const result = getGitLabRequestOptions(
         configSelfHosteWithRelativePath,
-        oauthToken,
+        token,
       );
 
       expect(result).toEqual({
         headers: {
-          Authorization: `Bearer ${oauthToken}`,
+          Authorization: `Bearer ${token}`,
+        },
+      });
+    });
+
+    it('should return private-token header when gl-token is provided', () => {
+      const token = 'glpat-1234566';
+      const result = getGitLabRequestOptions(
+        configSelfHosteWithRelativePath,
+        token,
+      );
+
+      expect(result).toEqual({
+        headers: {
+          'PRIVATE-TOKEN': token,
         },
       });
     });
@@ -208,7 +223,6 @@ describe('gitlab core', () => {
         configSelfHosteWithRelativePath,
         oauthToken,
       );
-
       expect(result).toEqual({
         headers: {
           'PRIVATE-TOKEN': configSelfHosteWithRelativePath.token,
diff --git a/packages/integration/src/gitlab/core.ts b/packages/integration/src/gitlab/core.ts
index e940440ea4..94f4b65d9f 100644
--- a/packages/integration/src/gitlab/core.ts
+++ b/packages/integration/src/gitlab/core.ts
@@ -53,21 +53,21 @@ export async function getGitLabFileFetchUrl(
  */
 export function getGitLabRequestOptions(
   config: GitLabIntegrationConfig,
-  oauthToken?: string,
+  token?: string,
 ): { headers: Record<string, string> } {
-  if (oauthToken) {
+  if (token) {
+    // If token comes from the user and starts with "gl", it's a private token (see https://docs.gitlab.com/ee/security/token_overview.html#token-prefixes)
     return {
-      headers: {
-        Authorization: `Bearer ${oauthToken}`,
-      },
+      headers: token.startsWith('gl')
+        ? { 'PRIVATE-TOKEN': token }
+        : { Authorization: `Bearer ${token}` }, // Otherwise, it's a bearer token
     };
   }
 
-  const { token = '' } = config;
+  // If token not provided, fetch the integration token
+  const { token: configToken = '' } = config;
   return {
-    headers: {
-      'PRIVATE-TOKEN': token,
-    },
+    headers: { 'PRIVATE-TOKEN': configToken },
   };
 }
 

From 78c13290e470387e4e490bece3362fe86f115bc6 Mon Sep 17 00:00:00 2001
From: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
Date: Thu, 27 Jun 2024 22:21:59 +0200
Subject: [PATCH 018/225] chore: add changeset and api-report

Signed-off-by: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
---
 .changeset/nice-peas-retire.md     | 6 ++++++
 packages/integration/api-report.md | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/nice-peas-retire.md

diff --git a/.changeset/nice-peas-retire.md b/.changeset/nice-peas-retire.md
new file mode 100644
index 0000000000..7b7b13706d
--- /dev/null
+++ b/.changeset/nice-peas-retire.md
@@ -0,0 +1,6 @@
+---
+'@backstage/integration': minor
+'@backstage/backend-defaults': patch
+---
+
+Updated `GitlabUrlReader.readUrl` and `GitlabUrlReader.readTree` to accept a user-provided token, supporting both bearer and private tokens.
diff --git a/packages/integration/api-report.md b/packages/integration/api-report.md
index 4c8e8accf2..cf4b380ad9 100644
--- a/packages/integration/api-report.md
+++ b/packages/integration/api-report.md
@@ -508,7 +508,10 @@ export function getGitLabIntegrationRelativePath(
 ): string;
 
 // @public
-export function getGitLabRequestOptions(config: GitLabIntegrationConfig): {
+export function getGitLabRequestOptions(
+  config: GitLabIntegrationConfig,
+  token?: string,
+): {
   headers: Record<string, string>;
 };
 

From 28d3cf8c9db6f72f1d7f14c0c5d34d53a0599d80 Mon Sep 17 00:00:00 2001
From: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
Date: Thu, 27 Jun 2024 22:42:29 +0200
Subject: [PATCH 019/225] fix: change mocked bearer token format

Signed-off-by: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
---
 packages/integration/src/gitlab/core.test.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/integration/src/gitlab/core.test.ts b/packages/integration/src/gitlab/core.test.ts
index c6e7410932..81adc29701 100644
--- a/packages/integration/src/gitlab/core.test.ts
+++ b/packages/integration/src/gitlab/core.test.ts
@@ -189,8 +189,7 @@ describe('gitlab core', () => {
 
   describe('getGitLabRequestOptions', () => {
     it('should return Authorization header when oauthToken is provided', () => {
-      const token =
-        'de6780bc506a0446309bd9362820ba8aed28aa506c71eedbe1c5c4f9dd350e54';
+      const token = '1234567890';
       const result = getGitLabRequestOptions(
         configSelfHosteWithRelativePath,
         token,

From 92583daf57de6cb64b0ed889deba220c66b933c7 Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Thu, 27 Jun 2024 16:43:38 -0500
Subject: [PATCH 020/225] Update heroku deploy docs

Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 99 ++++++++++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 33 deletions(-)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index 1545c34733..a70ff66ca5 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -5,40 +5,40 @@ sidebar_label: Heroku
 description: How to deploy Backstage to Heroku
 ---
 
-Heroku is a Platform as a Service (PaaS) designed to handle application
-deployment in a hands-off way. Heroku supports container deployment of Docker
-images, a natural fit for Backstage.
+Heroku is a Platform as a Service (PaaS) designed to simplify application deployment.
 
-## Configuring the CLI
+## Create App
 
-First, install the
-[heroku-cli](https://devcenter.heroku.com/articles/heroku-cli) and login:
+Start with an exisiting Backstage app or follow the [getting started guide](https://backstage.io/docs/getting-started/) to create a new one:
 
 ```shell
-$ heroku login
+$ npx @backstage/create-app@latest
+  Enter a name <your-app>
 ```
 
-If you have not yet created a project through the Heroku interface, you can create it through the CLI.
+Install the
+[Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli) and create a new Heroku app:
 
 ```shell
-$ heroku create <your-app>
+$ cd your-app/
+$ heroku apps:create <your-app>
 ```
 
-You _might_ also need to set your Heroku app's stack to `container`:
+## Domain
 
-```bash
-$ heroku stack:set container -a <your-app>
+Get Heroku app URL:
+```shell
+$ heroku domains -a <your-app>
+<your-app-123>.herokuapp.com
 ```
 
-Configuring your `app-config.yaml`:
-
+Update `baseUrl` and `port` in `app-config.yaml`. The core [app-backend plugin](https://www.npmjs.com/package/@backstage/plugin-app-backend) allows a single Heroku app to serve the frontend and backend:
 ```yaml
 app:
-  # Should be the same as backend.baseUrl when using the `app-backend` plugin
-  baseUrl: https://<your-app>.herokuapp.com
+  baseUrl: https://<your-app-123>.herokuapp.com
 
 backend:
-  baseUrl: https://<your-app>.herokuapp.com
+  baseUrl: https://<your-app-123>.herokuapp.com
   listen:
     port:
       $env: PORT
@@ -46,28 +46,61 @@ backend:
       # https://devcenter.heroku.com/articles/dynos#web-dynos
 ```
 
-> Make sure your file is being copied into your container in the `Dockerfile`.
+## Build Script
 
-Before building the Docker image, run the [backstage host build commands](https://backstage.io/docs/deployment/docker#host-build). They must be run whenever you are going to publish a new image.
+Add a build script in `package.json` to compile frontend during deployment:
+```json
+"scripts": {
+  "build": "yarn build:backend --config ../../app-config.yaml"
+```
 
-Heroku runs a container registry on `registry.heroku.com`. To push Backstage
-Docker images, log in to the container registry also:
+## Start Command
+
+Create a [Procfile](https://devcenter.heroku.com/articles/procfile) in the app's root:
+```shell
+$ echo "web: yarn workspace backend start --config ../../app-config.yaml" > Procfile
+```
+
+## Database
+
+Provision a [Heroku Postgres](https://elements.heroku.com/addons/heroku-postgresql) database:
+```shell
+$ heroku addons:create heroku-postgresql -a <your-app>
+```
+
+Update `database` in `app-config.yaml`:
+```yaml
+backend:
+  database:
+    client: pg
+    pluginDivisionMode: schema
+    ensureExists: false
+    ensureSchemaExists: true
+    connection: ${DATABASE_URL}
+```
+
+Allow postgres self-signed certificates:
+```shell
+$ heroku config:set PGSSLMODE=no-verify -a <your-app>
+```
+
+## Deployment
+
+Commit changes and push to Heroku to build and deploy:
 
 ```shell
-$ heroku container:login
+$ git add Procfile && git commit -am "configure heroku"
+$ git push heroku main
 ```
 
-## Push and deploy a Docker image
+View the app in the browser:
 
-Now we can push a Backstage [Docker image](docker.md) to Heroku's container
-registry and release it to the `web` worker:
-
-```bash
-$ docker image build . -f packages/backend/Dockerfile --tag registry.heroku.com/<your-app>/web
-
-$ docker push registry.heroku.com/<your-app>/web
-
-$ heroku container:release web -a <your-app>
+```shell
+$ heroku open -a <your-app>
 ```
 
-Now you should have Backstage up and running! 🎉
+View logs:
+
+```shell
+$ heroku heroku -a <your-app>
+```

From 19d495939d23984987ac1097e61faadb3b0fd2aa Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Thu, 27 Jun 2024 23:20:51 -0400
Subject: [PATCH 021/225] Extract condition check to function

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .../components/ReviewState/ReviewState.tsx    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
index ac7ac989e3..202e0c0fbf 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
@@ -47,11 +47,8 @@ function flattenObject(
 
       // Recurse into nested objects
       if (
-        backstageReviewOptions &&
-        backstageReviewOptions.explode &&
-        typeof value === 'object' &&
-        value !== null &&
-        !Array.isArray(value)
+        backstageReviewOptions?.explode &&
+        isJsonObject(value)
       ) {
         return flattenObject(value, prefixedKey, schema, formState);
       }
@@ -61,6 +58,14 @@ function flattenObject(
   });
 }
 
+function isJsonObject(value?: JsonValue): value is JsonObject {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    !Array.isArray(value)
+  );
+}
+
 /**
  * The component used by the {@link Stepper} to render the review step.
  * @alpha
@@ -89,9 +94,7 @@ export const ReviewState = (props: ReviewStateProps) => {
               }
               if (
                 backstageReviewOptions.explode &&
-                typeof value === 'object' &&
-                value !== null &&
-                !Array.isArray(value)
+                isJsonObject(value)
               ) {
                 return flattenObject(value, key, parsedSchema, props.formState);
               }
@@ -106,7 +109,7 @@ export const ReviewState = (props: ReviewStateProps) => {
                 [
                   key,
                   definitionInSchema.enumNames[
-                    definitionInSchema.enum.indexOf(value)
+                  definitionInSchema.enum.indexOf(value)
                   ] || value,
                 ],
               ];

From 7193d02b32b27eed9519875a03456b687e738936 Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Fri, 28 Jun 2024 01:18:20 -0400
Subject: [PATCH 022/225] Fix formatting

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .../components/ReviewState/ReviewState.tsx     | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
index 202e0c0fbf..22ec54ac26 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
@@ -46,10 +46,7 @@ function flattenObject(
       const backstageReviewOptions = definitionInSchema['ui:backstage']?.review;
 
       // Recurse into nested objects
-      if (
-        backstageReviewOptions?.explode &&
-        isJsonObject(value)
-      ) {
+      if (backstageReviewOptions?.explode && isJsonObject(value)) {
         return flattenObject(value, prefixedKey, schema, formState);
       }
     }
@@ -59,11 +56,7 @@ function flattenObject(
 }
 
 function isJsonObject(value?: JsonValue): value is JsonObject {
-  return (
-    typeof value === 'object' &&
-    value !== null &&
-    !Array.isArray(value)
-  );
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
 /**
@@ -92,10 +85,7 @@ export const ReviewState = (props: ReviewStateProps) => {
               if (backstageReviewOptions.show === false) {
                 return [];
               }
-              if (
-                backstageReviewOptions.explode &&
-                isJsonObject(value)
-              ) {
+              if (backstageReviewOptions.explode && isJsonObject(value)) {
                 return flattenObject(value, key, parsedSchema, props.formState);
               }
             }
@@ -109,7 +99,7 @@ export const ReviewState = (props: ReviewStateProps) => {
                 [
                   key,
                   definitionInSchema.enumNames[
-                  definitionInSchema.enum.indexOf(value)
+                    definitionInSchema.enum.indexOf(value)
                   ] || value,
                 ],
               ];

From c59167016378de2b5206737ab283b43d5b77887a Mon Sep 17 00:00:00 2001
From: Calvin Lee <cjlee@ualberta.ca>
Date: Wed, 26 Jun 2024 16:07:06 -0600
Subject: [PATCH 023/225] fix: enable support for account and org level urls

Signed-off-by: Calvin Lee <cjlee@ualberta.ca>
---
 .changeset/witty-bears-behave.md         |  5 ++
 packages/integration/src/harness/core.ts | 71 +++++++++++++++++-------
 2 files changed, 55 insertions(+), 21 deletions(-)
 create mode 100644 .changeset/witty-bears-behave.md

diff --git a/.changeset/witty-bears-behave.md b/.changeset/witty-bears-behave.md
new file mode 100644
index 0000000000..33b4c0b187
--- /dev/null
+++ b/.changeset/witty-bears-behave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Updated function for getHarnessEditContentsUrl, getHarnessFileContentsUrl, getHarnessArchiveUrl, getHarnessLatestCommitUrl and parseHarnessUrl to handle account and org level urls
diff --git a/packages/integration/src/harness/core.ts b/packages/integration/src/harness/core.ts
index 81281eaa6e..1887a5c0d8 100644
--- a/packages/integration/src/harness/core.ts
+++ b/packages/integration/src/harness/core.ts
@@ -34,7 +34,12 @@ export function getHarnessEditContentsUrl(
   url: string,
 ) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/ng/account/${parsedUrl.accountId}/module/code/orgs/${parsedUrl.orgName}/projects/${parsedUrl.projectName}/repos/${parsedUrl.repoName}/files/${parsedUrl.branch}/~/${parsedUrl.path}`;
+
+  return `${parsedUrl.baseUrl}/ng/account/${parsedUrl.accountId}/module/code${
+    parsedUrl.orgName !== '' ? `/orgs/${parsedUrl.orgName}` : ''
+  }${
+    parsedUrl.projectName !== '' ? `/projects/${parsedUrl.projectName}` : ''
+  }/repos/${parsedUrl.repoName}/files/${parsedUrl.branch}/~/${parsedUrl.path}`;
 }
 
 /**
@@ -44,6 +49,7 @@ export function getHarnessEditContentsUrl(
  *
  * Converts
  * from: https://app.harness.io/ng/account/accountId/module/code/orgs/orgName/projects/projName/repos/repoName/files/refMain/~/all-apis.yaml
+ *       https://qa.harness.io/ng/account/bDCAuAjFSJCLFj_0ug3lCg/module/code/orgs/HiteshTest/repos/impoorter/files/main/~/catalog.yaml
  * to:   https://app.harness.io/gateway/code/api/v1/repos/accountId/orgName/projName/repoName/+/content/all-apis.yaml?routingId=accountId&include_commit=false&ref=refMain
  *
  * @param url - A URL pointing to a file
@@ -55,7 +61,14 @@ export function getHarnessFileContentsUrl(
   url: string,
 ) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/raw/${parsedUrl.path}?routingId=${parsedUrl.accountId}&git_ref=refs/heads/${parsedUrl.refString}`;
+
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${
+    parsedUrl.accountId
+  }/${parsedUrl.orgName}${
+    parsedUrl.projectName !== '' ? `/${parsedUrl.projectName}/` : '/'
+  }${parsedUrl.repoName}/+/raw/${parsedUrl.path}?routingId=${
+    parsedUrl.accountId
+  }&git_ref=refs/heads/${parsedUrl.refString}`;
 }
 
 /**
@@ -77,7 +90,13 @@ export function getHarnessArchiveUrl(
   url: string,
 ) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/archive/${parsedUrl.branch}.zip?routingId=${parsedUrl.accountId}`;
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${
+    parsedUrl.accountId
+  }/${parsedUrl.orgName}${
+    parsedUrl.projectName !== '' ? `/${parsedUrl.projectName}/` : '/'
+  }${parsedUrl.repoName}/+/archive/${parsedUrl.branch}.zip?routingId=${
+    parsedUrl.accountId
+  }`;
 }
 
 /**
@@ -99,7 +118,13 @@ export function getHarnessLatestCommitUrl(
   url: string,
 ) {
   const parsedUrl = parseHarnessUrl(config, url);
-  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${parsedUrl.accountId}/${parsedUrl.orgName}/${parsedUrl.projectName}/${parsedUrl.repoName}/+/content?routingId=${parsedUrl.accountId}&include_commit=true&git_ref=refs/heads/${parsedUrl.branch}`;
+  return `${parsedUrl.baseUrl}/gateway/code/api/v1/repos/${
+    parsedUrl.accountId
+  }/${parsedUrl.orgName}${
+    parsedUrl.projectName !== '' ? `/${parsedUrl.projectName}/` : '/'
+  }${parsedUrl.repoName}/+/content?routingId=${
+    parsedUrl.accountId
+  }&include_commit=true&git_ref=refs/heads/${parsedUrl.branch}`;
 }
 
 /**
@@ -153,27 +178,30 @@ export function parseHarnessUrl(
       .split('/')
       .filter(segment => segment !== '');
     const urlParts = pathUrl.pathname.split('/');
-    const [
-      _ng,
-      _account,
-      accountId,
-      _module,
-      _moduleName,
-      _org,
-      orgName,
-      _projects,
-      projectName,
-      _repos,
-      repoName,
-      _files,
-      _ref,
-      _branch,
-      ..._path
-    ] = pathSegments;
+
+    const accountIdIndex =
+      pathSegments.findIndex(segment => segment === 'account') + 1;
+    const accountId = pathSegments[accountIdIndex];
+
+    const orgNameIndex = pathSegments.findIndex(segment => segment === 'orgs');
+    const orgName = orgNameIndex !== -1 ? pathSegments[orgNameIndex + 1] : '';
+
+    const projectNameIndex = pathSegments.findIndex(
+      segment => segment === 'projects',
+    );
+
+    const projectName =
+      projectNameIndex !== -1 ? pathSegments[projectNameIndex + 1] : '';
+
+    const repoNameIndex =
+      pathSegments.findIndex(segment => segment === 'repos') + 1;
+    const repoName = pathSegments[repoNameIndex];
+
     const refAndPath = urlParts.slice(
       urlParts.findIndex(i => i === 'files' || i === 'edit') + 1,
     );
     const refIndex = refAndPath.findIndex(item => item === '~');
+
     const refString = refAndPath.slice(0, refIndex).join('/');
     const pathWithoutSlash =
       refIndex !== -1
@@ -182,6 +210,7 @@ export function parseHarnessUrl(
             .join('/')
             .replace(/^\//, '')
         : '';
+
     return {
       baseUrl: baseUrl,
       accountId: accountId,

From a840355a10f9ad1b47975b65b30e89a4e7181876 Mon Sep 17 00:00:00 2001
From: Calvin Lee <cjlee@ualberta.ca>
Date: Fri, 28 Jun 2024 11:41:43 -0600
Subject: [PATCH 024/225] fix: update changeset

Signed-off-by: Calvin Lee <cjlee@ualberta.ca>
---
 .changeset/witty-bears-behave.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/witty-bears-behave.md b/.changeset/witty-bears-behave.md
index 33b4c0b187..7514759189 100644
--- a/.changeset/witty-bears-behave.md
+++ b/.changeset/witty-bears-behave.md
@@ -2,4 +2,4 @@
 '@backstage/integration': patch
 ---
 
-Updated function for getHarnessEditContentsUrl, getHarnessFileContentsUrl, getHarnessArchiveUrl, getHarnessLatestCommitUrl and parseHarnessUrl to handle account and org level urls
+Updated functions for getHarnessEditContentsUrl, getHarnessFileContentsUrl, getHarnessArchiveUrl, getHarnessLatestCommitUrl and parseHarnessUrl to handle account and org level urls

From 1edd6c27ee943747bd58e0bf35c86944902287e6 Mon Sep 17 00:00:00 2001
From: Tim Klever <tim.v.klever@aexp.com>
Date: Sat, 29 Jun 2024 11:29:38 -0700
Subject: [PATCH 025/225] feat: update ConfigSources options to match
 process.env typings

Signed-off-by: Tim Klever <tim.v.klever@aexp.com>
---
 .changeset/neat-bears-divide.md               | 28 +++++++++++++++++++
 packages/config-loader/api-report.md          |  2 +-
 .../src/sources/ConfigSources.ts              |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/neat-bears-divide.md

diff --git a/.changeset/neat-bears-divide.md b/.changeset/neat-bears-divide.md
new file mode 100644
index 0000000000..b40db6c7bd
--- /dev/null
+++ b/.changeset/neat-bears-divide.md
@@ -0,0 +1,28 @@
+---
+'@backstage/config-loader': major
+---
+
+**BREAKING** The `env` property on the `ConfigSourcesDefaultOptions` interface allows for undefined members.
+
+This change makes `ConfigSourcesDefaultOptions.env` consistent with other parts of this package and the wider
+`node` ecosystem. Specifically, with this update `ConfigSourcesDefaultOptions.env`'s types match:
+
+#### EnvConfigSource
+
+- [`EnvConfigSource.constructor`](https://github.com/backstage/backstage/blob/c780320418b7775f18fc0d2cc279ee7db9c7cb25/packages/config-loader/src/sources/EnvConfigSource.ts#L68)
+- [`EnvConfigSourceOptions`](https://github.com/backstage/backstage/blob/c780320418b7775f18fc0d2cc279ee7db9c7cb25/packages/config-loader/src/sources/EnvConfigSource.ts#L31)
+- [`readEnvConfig`](https://github.com/backstage/backstage/blob/c780320418b7775f18fc0d2cc279ee7db9c7cb25/packages/config-loader/src/sources/EnvConfigSource.ts#L114)
+
+#### NodeJS process.env
+
+- [`ProcessEnv`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/aa121ee3a7a3caa16433b66c1103df5904f612ea/types/node/v18/process.d.ts#L137)
+  which extends [`Dict`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/aa121ee3a7a3caa16433b66c1103df5904f612ea/types/node/v18/globals.d.ts#L333-L335)
+
+While this is a somewhat trivial change, it does loosen typings on a public interface, so by definition it's a breaking
+change and a major version bump.
+
+You may meed to update your backstage instance if you have built an implementation of `ConfigSources` or any other
+functionality that relies on `ConfigSourcesDefaultOptions`. This change means you'll have to update that code to account
+for the possibility of `undefined` values inside `ConfigSourcesDefaultOptions.env`, although it is very likely already
+accounted for as the typings for [`process.env`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/aa121ee3a7a3caa16433b66c1103df5904f612ea/types/node/v18/process.d.ts#L137)
+already include the possibility of [`undefined`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/aa121ee3a7a3caa16433b66c1103df5904f612ea/types/node/v18/globals.d.ts#L333-L335).
diff --git a/packages/config-loader/api-report.md b/packages/config-loader/api-report.md
index bc8f217bbb..da836ffd21 100644
--- a/packages/config-loader/api-report.md
+++ b/packages/config-loader/api-report.md
@@ -87,7 +87,7 @@ export interface ConfigSourcesDefaultOptions extends BaseConfigSourcesOptions {
   // (undocumented)
   argv?: string[];
   // (undocumented)
-  env?: Record<string, string>;
+  env?: Record<string, string | undefined>;
 }
 
 // @public
diff --git a/packages/config-loader/src/sources/ConfigSources.ts b/packages/config-loader/src/sources/ConfigSources.ts
index ecff39da2d..15eede736e 100644
--- a/packages/config-loader/src/sources/ConfigSources.ts
+++ b/packages/config-loader/src/sources/ConfigSources.ts
@@ -102,7 +102,7 @@ export interface ConfigSourcesDefaultForTargetsOptions
  */
 export interface ConfigSourcesDefaultOptions extends BaseConfigSourcesOptions {
   argv?: string[];
-  env?: Record<string, string>;
+  env?: Record<string, string | undefined>;
 }
 
 /**

From b141c20b53082ad16af942c2574040d4b83921c6 Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Sun, 30 Jun 2024 00:53:24 -0400
Subject: [PATCH 026/225] Move review object explode function into utils

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .../components/ReviewState/ReviewState.tsx    |  34 +---
 .../next/components/ReviewState/util.test.ts  | 187 ++++++++++++++++++
 .../src/next/components/ReviewState/util.ts   |  49 +++++
 3 files changed, 238 insertions(+), 32 deletions(-)
 create mode 100644 plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
 create mode 100644 plugins/scaffolder-react/src/next/components/ReviewState/util.ts

diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
index 22ec54ac26..95f5d76212 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
@@ -15,9 +15,10 @@
  */
 import React from 'react';
 import { StructuredMetadataTable } from '@backstage/core-components';
-import { JsonObject, JsonValue } from '@backstage/types';
+import { JsonObject } from '@backstage/types';
 import { Draft07 as JSONSchema } from 'json-schema-library';
 import { ParsedTemplateSchema } from '../../hooks/useTemplateSchema';
+import { flattenObject, isJsonObject } from './util';
 
 /**
  * The props for the {@link ReviewState} component.
@@ -28,37 +29,6 @@ export type ReviewStateProps = {
   formState: JsonObject;
 };
 
-function flattenObject(
-  obj: JsonObject,
-  prefix: string,
-  schema: JSONSchema,
-  formState: JsonObject,
-): [string, JsonValue | undefined][] {
-  return Object.entries(obj).flatMap(([key, value]) => {
-    const prefixedKey = prefix ? `${prefix}/${key}` : key;
-
-    const definitionInSchema = schema.getSchema({
-      pointer: `#/${prefixedKey}`,
-      data: formState,
-    });
-
-    if (definitionInSchema) {
-      const backstageReviewOptions = definitionInSchema['ui:backstage']?.review;
-
-      // Recurse into nested objects
-      if (backstageReviewOptions?.explode && isJsonObject(value)) {
-        return flattenObject(value, prefixedKey, schema, formState);
-      }
-    }
-
-    return [[key, value]];
-  });
-}
-
-function isJsonObject(value?: JsonValue): value is JsonObject {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
 /**
  * The component used by the {@link Stepper} to render the review step.
  * @alpha
diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts b/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
new file mode 100644
index 0000000000..c468c1a055
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
@@ -0,0 +1,187 @@
+/* eslint-disable no-console */
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { flattenObject, isJsonObject } from './util';
+import { Draft07 as JSONSchema } from 'json-schema-library';
+import { ParsedTemplateSchema } from '../../hooks/useTemplateSchema';
+
+describe('isJsonObject', () => {
+  it('should return true for non-null objects', () => {
+    expect(isJsonObject({})).toBe(true);
+    expect(isJsonObject({ key: 'value' })).toBe(true);
+  });
+
+  it('should return false for null', () => {
+    expect(isJsonObject(null)).toBe(false);
+  });
+
+  it('should return false for arrays', () => {
+    expect(isJsonObject([])).toBe(false);
+    expect(isJsonObject([1, 2, 3])).toBe(false);
+  });
+
+  it('should return false for non-objects', () => {
+    expect(isJsonObject('string')).toBe(false);
+    expect(isJsonObject(123)).toBe(false);
+    expect(isJsonObject(true)).toBe(false);
+    expect(isJsonObject(undefined)).toBe(false);
+  });
+});
+
+describe('flattenObject', () => {
+  it('should handle an empty object', () => {
+    const schemas: ParsedTemplateSchema[] = [
+      {
+        mergedSchema: {
+          type: 'object',
+          properties: {
+            name: {
+              type: 'object',
+              'ui:backstage': {
+                review: {
+                  explode: true,
+                },
+              },
+              properties: {},
+            },
+          },
+        },
+        schema: {},
+        title: 'test',
+        uiSchema: {},
+      },
+    ];
+
+    const parsedSchema = new JSONSchema(schemas[0].mergedSchema);
+
+    const result = flattenObject({}, '', parsedSchema, {});
+
+    expect(result).toEqual([]);
+  });
+
+  it('should flatten a simple object', () => {
+    const formState = {
+      name: {
+        foo: 'value1',
+        bar: 'value2',
+      },
+    };
+
+    const schemas: ParsedTemplateSchema[] = [
+      {
+        mergedSchema: {
+          type: 'object',
+          properties: {
+            name: {
+              type: 'object',
+              'ui:backstage': {
+                review: {
+                  explode: true,
+                },
+              },
+              properties: {
+                foo: {
+                  type: 'string',
+                },
+                bar: {
+                  type: 'string',
+                },
+              },
+            },
+          },
+        },
+        schema: {},
+        title: 'test',
+        uiSchema: {},
+      },
+    ];
+
+    const [key, value] = Object.entries(formState)[0];
+    const parsedSchema = new JSONSchema(schemas[0].mergedSchema);
+
+    const result = flattenObject(value, key, parsedSchema, formState);
+
+    expect(result).toEqual([
+      ['foo', 'value1'],
+      ['bar', 'value2'],
+    ]);
+  });
+
+  it('should recurse into a nested object', () => {
+    const formState = {
+      name: {
+        foo: 'value1',
+        bar: 'value2',
+        example: {
+          test: 'value3',
+        },
+      },
+    };
+    const schemas: ParsedTemplateSchema[] = [
+      {
+        mergedSchema: {
+          type: 'object',
+          properties: {
+            name: {
+              type: 'object',
+              'ui:backstage': {
+                review: {
+                  explode: true,
+                },
+              },
+              properties: {
+                foo: {
+                  type: 'string',
+                },
+                bar: {
+                  type: 'string',
+                },
+                example: {
+                  type: 'object',
+                  'ui:backstage': {
+                    review: {
+                      explode: true,
+                    },
+                  },
+                  properties: {
+                    test: {
+                      type: 'string',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        schema: {},
+        title: 'test',
+        uiSchema: {},
+      },
+    ];
+
+    const [key, value] = Object.entries(formState)[0];
+    const parsedSchema = new JSONSchema(schemas[0].mergedSchema);
+
+    const result = flattenObject(value, key, parsedSchema, formState);
+
+    expect(result).toEqual([
+      ['foo', 'value1'],
+      ['bar', 'value2'],
+      ['test', 'value3'],
+    ]);
+  });
+});
diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/util.ts b/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
new file mode 100644
index 0000000000..0bb6fc08d2
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { JsonObject, JsonValue } from '@backstage/types';
+import { Draft07 as JSONSchema } from 'json-schema-library';
+
+export function flattenObject(
+  obj: JsonObject,
+  prefix: string,
+  schema: JSONSchema,
+  formState: JsonObject,
+): [string, JsonValue | undefined][] {
+  return Object.entries(obj).flatMap(([key, value]) => {
+    const prefixedKey = prefix ? `${prefix}/${key}` : key;
+
+    const definitionInSchema = schema.getSchema({
+      pointer: `#/${prefixedKey}`,
+      data: formState,
+    });
+
+    if (definitionInSchema) {
+      const backstageReviewOptions = definitionInSchema['ui:backstage']?.review;
+
+      // Recurse into nested objects
+      if (backstageReviewOptions?.explode && isJsonObject(value)) {
+        return flattenObject(value, prefixedKey, schema, formState);
+      }
+    }
+
+    return [[key, value]];
+  });
+}
+
+export function isJsonObject(value?: JsonValue): value is JsonObject {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}

From 08b7c3e1802702b456d4b51c69ddfa5d327e1f13 Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Sun, 30 Jun 2024 01:29:30 -0400
Subject: [PATCH 027/225] Remove debug code

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .../src/next/components/ReviewState/util.test.ts                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts b/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
index c468c1a055..e2a10587dc 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 /*
  * Copyright 2022 The Backstage Authors
  *

From fad1b903a8e166492837c003916adb1f59be788e Mon Sep 17 00:00:00 2001
From: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
Date: Wed, 3 Jul 2024 19:47:37 +0200
Subject: [PATCH 028/225] feat: allow the oauth token to be used in the
 gitlab:projectVariableAction:create action

Signed-off-by: ElaineDeMattosSilvaB <elaine.de-mattos-silva-bezerra@deutschebahn.com>
---
 .changeset/grumpy-owls-suffer.md              |  5 ++
 ...tlabProjectVariableCreate.examples.test.ts | 61 ++++++++++---------
 .../actions/gitlabProjectVariableCreate.ts    | 27 ++++----
 3 files changed, 49 insertions(+), 44 deletions(-)
 create mode 100644 .changeset/grumpy-owls-suffer.md

diff --git a/.changeset/grumpy-owls-suffer.md b/.changeset/grumpy-owls-suffer.md
new file mode 100644
index 0000000000..977055eb33
--- /dev/null
+++ b/.changeset/grumpy-owls-suffer.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': patch
+---
+
+Allow the `createGitlabProjectVariableAction` to use oauth tokens
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectVariableCreate.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectVariableCreate.examples.test.ts
index 1eeb01ca91..99b26682d8 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectVariableCreate.examples.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectVariableCreate.examples.test.ts
@@ -26,7 +26,7 @@ const mockGitlabClient = {
     create: jest.fn(),
   },
 };
-jest.mock('@gitbeaker/node', () => ({
+jest.mock('@gitbeaker/rest', () => ({
   Gitlab: class {
     constructor() {
       return mockGitlabClient;
@@ -41,7 +41,7 @@ describe('gitlab:projectVariableAction: create examples', () => {
         {
           host: 'gitlab.com',
           token: 'tokenlols',
-          apiBaseUrl: 'https://api.gitlab.com',
+          apiBaseUrl: 'https://api.gitlab.com/api/v4',
         },
         {
           host: 'hosted.gitlab.com',
@@ -79,17 +79,18 @@ describe('gitlab:projectVariableAction: create examples', () => {
 
     expect(mockGitlabClient.ProjectVariables.create).toHaveBeenCalledWith(
       '123',
+      'MY_VARIABLE',
+      'my_value',
       {
-        key: 'MY_VARIABLE',
-        value: 'my_value',
-        variable_type: 'env_var',
-        environment_scope: '*',
+        variableType: 'env_var', // Correctly using variableType
+        environmentScope: '*',
         masked: false,
         protected: false,
         raw: false,
       },
     );
   });
+
   it(`Should ${examples[1].description}`, async () => {
     mockGitlabClient.ProjectVariables.create.mockResolvedValue({
       token: 'TOKEN',
@@ -102,14 +103,14 @@ describe('gitlab:projectVariableAction: create examples', () => {
 
     expect(mockGitlabClient.ProjectVariables.create).toHaveBeenCalledWith(
       '123',
+      'MY_VARIABLE',
+      'my-file-content',
       {
-        key: 'MY_VARIABLE',
-        value: 'my-file-content',
+        variableType: 'file', // Correctly using variableType
         protected: false,
         masked: false,
         raw: false,
-        environment_scope: '*',
-        variable_type: 'file',
+        environmentScope: '*',
       },
     );
   });
@@ -126,13 +127,13 @@ describe('gitlab:projectVariableAction: create examples', () => {
 
     expect(mockGitlabClient.ProjectVariables.create).toHaveBeenCalledWith(
       '456',
+      'MY_VARIABLE',
+      'my_value',
       {
-        key: 'MY_VARIABLE',
-        value: 'my_value',
         masked: false,
         raw: false,
-        environment_scope: '*',
-        variable_type: 'env_var',
+        environmentScope: '*',
+        variableType: 'env_var', // Correctly using variableType
         protected: true,
       },
     );
@@ -150,13 +151,13 @@ describe('gitlab:projectVariableAction: create examples', () => {
 
     expect(mockGitlabClient.ProjectVariables.create).toHaveBeenCalledWith(
       '789',
+      'DB_PASSWORD',
+      'password123',
       {
-        key: 'DB_PASSWORD',
-        value: 'password123',
         protected: false,
         raw: false,
-        environment_scope: '*',
-        variable_type: 'env_var',
+        environmentScope: '*',
+        variableType: 'env_var', // Correctly using variableType
         masked: true,
       },
     );
@@ -174,12 +175,12 @@ describe('gitlab:projectVariableAction: create examples', () => {
 
     expect(mockGitlabClient.ProjectVariables.create).toHaveBeenCalledWith(
       '123',
+      'MY_VARIABLE',
+      'my_value',
       {
-        key: 'MY_VARIABLE',
-        value: 'my_value',
         protected: false,
-        environment_scope: '*',
-        variable_type: 'env_var',
+        environmentScope: '*',
+        variableType: 'env_var', // Correctly using variableType
         masked: false,
         raw: true,
       },
@@ -198,14 +199,14 @@ describe('gitlab:projectVariableAction: create examples', () => {
 
     expect(mockGitlabClient.ProjectVariables.create).toHaveBeenCalledWith(
       '123',
+      'MY_VARIABLE',
+      'my_value',
       {
-        key: 'MY_VARIABLE',
-        value: 'my_value',
         protected: false,
-        variable_type: 'env_var',
+        variableType: 'env_var', // Correctly using variableType
         masked: false,
         raw: false,
-        environment_scope: 'production',
+        environmentScope: 'production',
       },
     );
   });
@@ -222,14 +223,14 @@ describe('gitlab:projectVariableAction: create examples', () => {
 
     expect(mockGitlabClient.ProjectVariables.create).toHaveBeenCalledWith(
       '123',
+      'MY_VARIABLE',
+      'my_value',
       {
-        key: 'MY_VARIABLE',
-        value: 'my_value',
         protected: false,
-        variable_type: 'env_var',
+        variableType: 'env_var', // Correctly using variableType
         masked: false,
         raw: false,
-        environment_scope: '*',
+        environmentScope: '*',
       },
     );
   });
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectVariableCreate.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectVariableCreate.ts
index a07ec747fa..3a9eeec0a1 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectVariableCreate.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectVariableCreate.ts
@@ -16,10 +16,10 @@
 
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
-import { Gitlab } from '@gitbeaker/node';
+import { VariableType } from '@gitbeaker/rest';
 import { z } from 'zod';
 import commonGitlabConfig from '../commonGitlabConfig';
-import { getToken } from '../util';
+import { getClient, parseRepoUrl } from '../util';
 import { examples } from './gitlabProjectVariableCreate.examples';
 
 /**
@@ -72,6 +72,7 @@ export const createGitlabProjectVariableAction = (options: {
     },
     async handler(ctx) {
       const {
+        repoUrl,
         projectId,
         key,
         value,
@@ -80,21 +81,19 @@ export const createGitlabProjectVariableAction = (options: {
         masked = false,
         raw = false,
         environmentScope = '*',
+        token,
       } = ctx.input;
-      const { token, integrationConfig } = getToken(ctx.input, integrations);
 
-      const api = new Gitlab({
-        host: integrationConfig.config.baseUrl,
-        token: token,
-      });
-      await api.ProjectVariables.create(projectId, {
-        key: key,
-        value: value,
-        variable_type: variableType,
+      const { host } = parseRepoUrl(repoUrl, integrations);
+
+      const api = getClient({ host, integrations, token });
+
+      await api.ProjectVariables.create(projectId, key, value, {
+        variableType: variableType as VariableType,
         protected: variableProtected,
-        masked: masked,
-        raw: raw,
-        environment_scope: environmentScope,
+        masked,
+        raw,
+        environmentScope,
       });
     },
   });

From bc2700cbf962e3f3a4554d664a193943224b3f27 Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Mon, 8 Jul 2024 08:26:47 -0500
Subject: [PATCH 029/225] recommend updating config in
 app-config.production.yaml

Co-authored-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com>
Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index a70ff66ca5..23dff683f8 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -32,7 +32,7 @@ $ heroku domains -a <your-app>
 <your-app-123>.herokuapp.com
 ```
 
-Update `baseUrl` and `port` in `app-config.yaml`. The core [app-backend plugin](https://www.npmjs.com/package/@backstage/plugin-app-backend) allows a single Heroku app to serve the frontend and backend:
+The core [app-backend plugin](https://www.npmjs.com/package/@backstage/plugin-app-backend) allows a single Heroku app to serve the frontend and backend. To make this work you need to update the `baseUrl` and `port` in `app-config.production.yaml`:
 ```yaml
 app:
   baseUrl: https://<your-app-123>.herokuapp.com

From fb6a5d5f6ba90edb6152c20d4c111b93a9182d16 Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Mon, 8 Jul 2024 08:27:20 -0500
Subject: [PATCH 030/225] Typo in docs

Co-authored-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com>
Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index 23dff683f8..5e6eb59a82 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -9,7 +9,7 @@ Heroku is a Platform as a Service (PaaS) designed to simplify application deploy
 
 ## Create App
 
-Start with an exisiting Backstage app or follow the [getting started guide](https://backstage.io/docs/getting-started/) to create a new one:
+Starting with an existing Backstage app or follow the [getting started guide](https://backstage.io/docs/getting-started/) to create a new one:
 
 ```shell
 $ npx @backstage/create-app@latest

From 6b56a1921925517006e8cbdecffccc3f74814916 Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Mon, 8 Jul 2024 08:27:45 -0500
Subject: [PATCH 031/225] add app-config.production to build script

Co-authored-by: Andre Wanlin <67169551+awanlin@users.noreply.github.com>
Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index 5e6eb59a82..c5042c732c 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -51,7 +51,7 @@ backend:
 Add a build script in `package.json` to compile frontend during deployment:
 ```json
 "scripts": {
-  "build": "yarn build:backend --config ../../app-config.yaml"
+  "build": "yarn build:backend --config ../../app-config.yaml --config app-config.production.yaml"
 ```
 
 ## Start Command

From 32b73f957c7ee8379e190f66640a4a9ec7ced9ab Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Mon, 8 Jul 2024 08:32:26 -0500
Subject: [PATCH 032/225] remove command to create new backstage app

Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index c5042c732c..9629dbb212 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -9,12 +9,7 @@ Heroku is a Platform as a Service (PaaS) designed to simplify application deploy
 
 ## Create App
 
-Starting with an existing Backstage app or follow the [getting started guide](https://backstage.io/docs/getting-started/) to create a new one:
-
-```shell
-$ npx @backstage/create-app@latest
-  Enter a name <your-app>
-```
+Starting with an existing Backstage app or follow the [getting started guide](https://backstage.io/docs/getting-started/) to create a new one.
 
 Install the
 [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli) and create a new Heroku app:

From e80a94f5c31aad63840c36bf592a072310d787c2 Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Mon, 8 Jul 2024 09:50:17 -0500
Subject: [PATCH 033/225] add docker instructions to heroku.md

Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index 9629dbb212..8f173578c5 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -46,14 +46,14 @@ backend:
 Add a build script in `package.json` to compile frontend during deployment:
 ```json
 "scripts": {
-  "build": "yarn build:backend --config ../../app-config.yaml --config app-config.production.yaml"
+  "build": "yarn build:backend --config ../../app-config.yaml --config ../../app-config.production.yaml"
 ```
 
 ## Start Command
 
 Create a [Procfile](https://devcenter.heroku.com/articles/procfile) in the app's root:
 ```shell
-$ echo "web: yarn workspace backend start --config ../../app-config.yaml" > Procfile
+$ echo "web: yarn workspace backend start --config ../../app-config.yaml --config ../../app-config.production.yaml" > Procfile
 ```
 
 ## Database
@@ -63,7 +63,7 @@ Provision a [Heroku Postgres](https://elements.heroku.com/addons/heroku-postgres
 $ heroku addons:create heroku-postgresql -a <your-app>
 ```
 
-Update `database` in `app-config.yaml`:
+Update `database` in `app-config.production.yaml`:
 ```yaml
 backend:
   database:
@@ -99,3 +99,33 @@ View logs:
 ```shell
 $ heroku heroku -a <your-app>
 ```
+
+## Docker
+
+As an alternative to git deploys, Heroku also [supports container images](https://devcenter.heroku.com/articles/container-registry-and-runtime).
+
+Login to Heroku's container registry:
+
+```shell
+$ heroku container:login
+```
+
+Configure the Heroku app to run a container image:
+
+```shell
+$ heroku stack:set container -a <your-app>
+```
+
+Locally run the [host build command](https://backstage.io/docs/deployment/docker/#host-build):
+```shell
+$ yarn build:backend --config ../../app-config.yaml --config ../../app-config.production.yaml
+```
+
+Build, push, and release the container image:
+```shell
+$ docker image build . -f packages/backend/Dockerfile --tag registry.heroku.com/<your-app>/web
+
+$ docker push registry.heroku.com/<your-app>/web
+
+$ heroku container:release web -a <your-app>
+```

From dc41795dd508275e8d95a89b81861dd1ea636500 Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Mon, 8 Jul 2024 11:15:28 -0500
Subject: [PATCH 034/225] prettier fixes

Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index 8f173578c5..74732bb431 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -22,12 +22,14 @@ $ heroku apps:create <your-app>
 ## Domain
 
 Get Heroku app URL:
+
 ```shell
 $ heroku domains -a <your-app>
 <your-app-123>.herokuapp.com
 ```
 
 The core [app-backend plugin](https://www.npmjs.com/package/@backstage/plugin-app-backend) allows a single Heroku app to serve the frontend and backend. To make this work you need to update the `baseUrl` and `port` in `app-config.production.yaml`:
+
 ```yaml
 app:
   baseUrl: https://<your-app-123>.herokuapp.com
@@ -44,6 +46,7 @@ backend:
 ## Build Script
 
 Add a build script in `package.json` to compile frontend during deployment:
+
 ```json
 "scripts": {
   "build": "yarn build:backend --config ../../app-config.yaml --config ../../app-config.production.yaml"
@@ -52,6 +55,7 @@ Add a build script in `package.json` to compile frontend during deployment:
 ## Start Command
 
 Create a [Procfile](https://devcenter.heroku.com/articles/procfile) in the app's root:
+
 ```shell
 $ echo "web: yarn workspace backend start --config ../../app-config.yaml --config ../../app-config.production.yaml" > Procfile
 ```
@@ -59,11 +63,13 @@ $ echo "web: yarn workspace backend start --config ../../app-config.yaml --confi
 ## Database
 
 Provision a [Heroku Postgres](https://elements.heroku.com/addons/heroku-postgresql) database:
+
 ```shell
 $ heroku addons:create heroku-postgresql -a <your-app>
 ```
 
 Update `database` in `app-config.production.yaml`:
+
 ```yaml
 backend:
   database:
@@ -75,6 +81,7 @@ backend:
 ```
 
 Allow postgres self-signed certificates:
+
 ```shell
 $ heroku config:set PGSSLMODE=no-verify -a <your-app>
 ```
@@ -117,11 +124,13 @@ $ heroku stack:set container -a <your-app>
 ```
 
 Locally run the [host build command](https://backstage.io/docs/deployment/docker/#host-build):
+
 ```shell
 $ yarn build:backend --config ../../app-config.yaml --config ../../app-config.production.yaml
 ```
 
 Build, push, and release the container image:
+
 ```shell
 $ docker image build . -f packages/backend/Dockerfile --tag registry.heroku.com/<your-app>/web
 

From 9d9a391cfb92796faf192a0f60fdba01bb7ce5f0 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 9 Jul 2024 14:21:33 +0200
Subject: [PATCH 035/225] beps/0009: move to implemented

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 beps/0009-plugin-metadata/README.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/beps/0009-plugin-metadata/README.md b/beps/0009-plugin-metadata/README.md
index c0ae487daa..59101f121c 100644
--- a/beps/0009-plugin-metadata/README.md
+++ b/beps/0009-plugin-metadata/README.md
@@ -1,6 +1,6 @@
 ---
 title: Plugin Metadata
-status: implementable
+status: implemented
 authors:
   - '@Rugvip'
 owners:
@@ -10,16 +10,8 @@ project-areas:
 creation-date: yyyy-mm-dd
 ---
 
-<!--
-**Note:** When your BEP is complete, all these pre-existing comments should be removed
-
-When editing BEPs, aim for tightly-scoped, single-topic PRs to keep discussions focused. If you disagree with what is already in a document, open a new PR with suggested changes.
--->
-
 # BEP: Plugin Metadata
 
-<!-- Before merging the initial BEP PR, create a feature issue and update the below link. You can wait with this step until the BEP is ready to be merged. -->
-
 [**Discussion Issue**](https://github.com/backstage/backstage/issues/25076)
 
 - [Summary](#summary)

From bebd569c565516fb411c276bf47b1aef80c5bc9e Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Wed, 10 Jul 2024 20:44:25 -0400
Subject: [PATCH 036/225] Fix extra divider displayed on user list picker
 component

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .changeset/pink-gorillas-brake.md                            | 5 +++++
 .../src/components/UserListPicker/UserListPicker.tsx         | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/pink-gorillas-brake.md

diff --git a/.changeset/pink-gorillas-brake.md b/.changeset/pink-gorillas-brake.md
new file mode 100644
index 0000000000..188884f13c
--- /dev/null
+++ b/.changeset/pink-gorillas-brake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Fix extra divider displayed on user list picker component
diff --git a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
index 7f0ff8be74..c6b515aa67 100644
--- a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx
@@ -247,11 +247,11 @@ export const UserListPicker = (props: UserListPickerProps) => {
           </Typography>
           <Card className={classes.groupWrapper}>
             <List disablePadding dense role="menu" aria-label={group.name}>
-              {group.items.map(item => (
+              {group.items.map((item, index) => (
                 <MenuItem
                   role="none presentation"
                   key={item.id}
-                  divider
+                  divider={index !== group.items.length - 1}
                   onClick={() => setSelectedUserFilter(item.id)}
                   selected={item.id === filters.user?.value}
                   className={classes.menuItem}

From b652b6de1fb647cc8fe65af2f6e6baa71574c9ac Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Thu, 11 Jul 2024 08:16:21 -0500
Subject: [PATCH 037/225] add deploy buttuon to heroku.md

Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index 74732bb431..faf1c2106e 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -7,6 +7,8 @@ description: How to deploy Backstage to Heroku
 
 Heroku is a Platform as a Service (PaaS) designed to simplify application deployment.
 
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/chap/backstage-button)
+
 ## Create App
 
 Starting with an existing Backstage app or follow the [getting started guide](https://backstage.io/docs/getting-started/) to create a new one.

From a3449e0767d0ce17bee320341ec1309e6830dc88 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 07:40:53 +0000
Subject: [PATCH 038/225] chore(deps): update snyk/actions digest to 640e317

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/sync_snyk-github-issues.yml | 2 +-
 .github/workflows/sync_snyk-monitor.yml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sync_snyk-github-issues.yml b/.github/workflows/sync_snyk-github-issues.yml
index fb3456bfb6..1cdc0cb22a 100644
--- a/.github/workflows/sync_snyk-github-issues.yml
+++ b/.github/workflows/sync_snyk-github-issues.yml
@@ -29,7 +29,7 @@ jobs:
           cache-prefix: ${{ runner.os }}-v18.x
 
       - name: Create Snyk report
-        uses: snyk/actions/node@d406fd286b663eb8c6f8adcced4f7bcd199c0a3f # master
+        uses: snyk/actions/node@640e31719aac3e44867d239dc86c20c3e34c8e4f # master
         continue-on-error: true # Snyk CLI exits with error when vulnerabilities are found
         with:
           args: >
diff --git a/.github/workflows/sync_snyk-monitor.yml b/.github/workflows/sync_snyk-monitor.yml
index a3c72c1d7b..b1e50397ce 100644
--- a/.github/workflows/sync_snyk-monitor.yml
+++ b/.github/workflows/sync_snyk-monitor.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Monitor and Synchronize Snyk Policies
-        uses: snyk/actions/node@d406fd286b663eb8c6f8adcced4f7bcd199c0a3f # master
+        uses: snyk/actions/node@640e31719aac3e44867d239dc86c20c3e34c8e4f # master
         with:
           command: monitor
           args: >
@@ -46,7 +46,7 @@ jobs:
       # Above we run the `monitor` command, this runs the `test` command which is
       # the one that generates the SARIF report that we can upload to GitHub.
       - name: Create Snyk report
-        uses: snyk/actions/node@d406fd286b663eb8c6f8adcced4f7bcd199c0a3f # master
+        uses: snyk/actions/node@640e31719aac3e44867d239dc86c20c3e34c8e4f # master
         continue-on-error: true # To make sure that SARIF upload gets called
         with:
           args: >

From dae85dfd213b1711fd850e48777361065725b1e4 Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sat, 13 Jul 2024 14:07:56 +0530
Subject: [PATCH 039/225] Add examples for fetch:cookiecutter scaffolder action
 & improve related tests

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .changeset/stupid-dots-relate.md              |   5 +
 .../package.json                              |   1 +
 .../fetch/cookiecutter.examples.test.ts       | 274 ++++++++++++++++++
 .../actions/fetch/cookiecutter.examples.ts    | 119 ++++++++
 .../src/actions/fetch/cookiecutter.ts         |   2 +
 5 files changed, 401 insertions(+)
 create mode 100644 .changeset/stupid-dots-relate.md
 create mode 100644 plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.test.ts
 create mode 100644 plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.ts

diff --git a/.changeset/stupid-dots-relate.md b/.changeset/stupid-dots-relate.md
new file mode 100644
index 0000000000..a83777bff9
--- /dev/null
+++ b/.changeset/stupid-dots-relate.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
+---
+
+Add examples for `fetch:cookiecutter` scaffolder action & improve related tests
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index 43a7e348a4..261010f681 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -53,6 +53,7 @@
     "command-exists": "^1.2.9",
     "fs-extra": "^11.2.0",
     "winston": "^3.2.1",
+    "yaml": "^2.0.0",
     "yn": "^4.0.0"
   },
   "devDependencies": {
diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.test.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.test.ts
new file mode 100644
index 0000000000..ae46ef1bd6
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.test.ts
@@ -0,0 +1,274 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { UrlReader, ContainerRunner } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
+import { ScmIntegrations } from '@backstage/integration';
+import { createMockDirectory } from '@backstage/backend-test-utils';
+import { createFetchCookiecutterAction } from './cookiecutter';
+import { join } from 'path';
+import type { ActionContext } from '@backstage/plugin-scaffolder-node';
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
+import { examples } from './cookiecutter.examples';
+import yaml from 'yaml';
+
+const executeShellCommand = jest.fn();
+const commandExists = jest.fn();
+const fetchContents = jest.fn();
+
+jest.mock('@backstage/plugin-scaffolder-node', () => ({
+  ...jest.requireActual('@backstage/plugin-scaffolder-node'),
+  fetchContents: (...args: any[]) => fetchContents(...args),
+  executeShellCommand: (...args: any[]) => executeShellCommand(...args),
+}));
+
+jest.mock(
+  'command-exists',
+  () =>
+    (...args: any[]) =>
+      commandExists(...args),
+);
+
+describe('fetch:cookiecutter', () => {
+  const mockDir = createMockDirectory({ mockOsTmpDir: true });
+  const integrations = ScmIntegrations.fromConfig(
+    new ConfigReader({
+      integrations: {
+        azure: [
+          { host: 'dev.azure.com', token: 'tokenlols' },
+          { host: 'myazurehostnotoken.com' },
+        ],
+      },
+    }),
+  );
+
+  const mockTmpDir = mockDir.path;
+
+  let mockContext: ActionContext<{
+    url: string;
+    targetPath?: string;
+    values: JsonObject;
+    copyWithoutRender?: string[];
+    extensions?: string[];
+    imageName?: string;
+  }>;
+
+  const containerRunner: jest.Mocked<ContainerRunner> = {
+    runContainer: jest.fn(),
+  };
+
+  const mockReader: UrlReader = {
+    readUrl: jest.fn(),
+    readTree: jest.fn(),
+    search: jest.fn(),
+  };
+
+  const action = createFetchCookiecutterAction({
+    integrations,
+    containerRunner,
+    reader: mockReader,
+  });
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    mockContext = createMockActionContext({
+      input: {
+        url: 'https://google.com/cookie/cutter',
+        targetPath: 'something',
+        values: {
+          help: 'me',
+        },
+      },
+      templateInfo: {
+        entityRef: 'template:default/cookiecutter',
+        baseUrl: 'somebase',
+      },
+      workspacePath: mockTmpDir,
+    });
+    mockDir.setContent({ template: {} });
+
+    commandExists.mockResolvedValue(null);
+
+    // Mock when run container is called it creates some new files in the mock filesystem
+    containerRunner.runContainer.mockImplementation(async () => {
+      mockDir.setContent({
+        'intermediate/testfile.json': '{}',
+      });
+    });
+
+    // Mock when executeShellCommand is called it creates some new files in the mock filesystem
+    executeShellCommand.mockImplementation(async () => {
+      mockDir.setContent({
+        'intermediate/testfile.json': '{}',
+      });
+    });
+  });
+
+  it(`should ${examples[0].description}`, async () => {
+    const input = yaml.parse(examples[0].example).steps[0].input;
+
+    commandExists.mockResolvedValue(false);
+
+    fetchContents.mockImplementation(() => Promise.resolve());
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith(
+      expect.objectContaining({
+        reader: mockReader,
+        integrations,
+        baseUrl: mockContext.templateInfo?.baseUrl,
+        fetchUrl: mockContext.input.url,
+        outputPath: join(
+          mockTmpDir,
+          'template',
+          "{{cookiecutter and 'contents'}}",
+        ),
+      }),
+    );
+    expect(containerRunner.runContainer).toHaveBeenCalled();
+  });
+
+  it(`should ${examples[1].description}`, async () => {
+    const input = yaml.parse(examples[1].example).steps[0].input;
+
+    commandExists.mockResolvedValue(false);
+
+    fetchContents.mockImplementation(() => Promise.resolve());
+
+    await action.handler({
+      ...mockContext,
+      input: input,
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith(
+      expect.objectContaining({
+        reader: mockReader,
+        integrations,
+        baseUrl: mockContext.templateInfo?.baseUrl,
+        fetchUrl: mockContext.input.url,
+        outputPath: join(
+          mockTmpDir,
+          'template',
+          "{{cookiecutter and 'contents'}}",
+        ),
+      }),
+    );
+    expect(containerRunner.runContainer).toHaveBeenCalled();
+  });
+
+  it(`should ${examples[2].description}`, async () => {
+    const input = yaml.parse(examples[2].example).steps[0].input;
+
+    commandExists.mockResolvedValue(false);
+
+    fetchContents.mockImplementation(() => Promise.resolve());
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith(
+      expect.objectContaining({
+        reader: mockReader,
+        integrations,
+        baseUrl: mockContext.templateInfo?.baseUrl,
+        fetchUrl: mockContext.input.url,
+        outputPath: join(
+          mockTmpDir,
+          'template',
+          "{{cookiecutter and 'contents'}}",
+        ),
+      }),
+    );
+
+    expect(containerRunner.runContainer).toHaveBeenCalled();
+  });
+
+  it(`should ${examples[3].description}`, async () => {
+    const input = yaml.parse(examples[3].example).steps[0].input;
+
+    commandExists.mockResolvedValue(false);
+
+    fetchContents.mockImplementation(() => Promise.resolve());
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith(
+      expect.objectContaining({
+        reader: mockReader,
+        integrations,
+        baseUrl: mockContext.templateInfo?.baseUrl,
+        fetchUrl: mockContext.input.url,
+        outputPath: join(
+          mockTmpDir,
+          'template',
+          "{{cookiecutter and 'contents'}}",
+        ),
+      }),
+    );
+    expect(containerRunner.runContainer).toHaveBeenCalled();
+  });
+
+  it(`should ${examples[4].description}`, async () => {
+    const input = yaml.parse(examples[4].example).steps[0].input;
+
+    commandExists.mockResolvedValue(false);
+
+    fetchContents.mockImplementation(() => Promise.resolve());
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith(
+      expect.objectContaining({
+        reader: mockReader,
+        integrations,
+        baseUrl: mockContext.templateInfo?.baseUrl,
+        fetchUrl: mockContext.input.url,
+        outputPath: join(
+          mockTmpDir,
+          'template',
+          "{{cookiecutter and 'contents'}}",
+        ),
+      }),
+    );
+    expect(containerRunner.runContainer).toHaveBeenCalled();
+  });
+});
diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.ts
new file mode 100644
index 0000000000..6ebada50f0
--- /dev/null
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.examples.ts
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Fetch and template using cookiecutter with minimal options.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:cookiecutter',
+          name: 'Fetch and Template Using Cookiecutter',
+          input: {
+            url: 'https://google.com/cookie/cutter',
+            values: {
+              help: 'me',
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template using cookiecutter with custom target path.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:cookiecutter',
+          name: 'Fetch and Template Using Cookiecutter',
+          input: {
+            url: 'https://google.com/cookie/cutter',
+            targetPath: 'custom-path',
+            values: {
+              help: 'me',
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template using cookiecutter with copyWithoutRender.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:cookiecutter',
+          name: 'Fetch and Template Using Cookiecutter',
+          input: {
+            url: 'https://google.com/cookie/cutter',
+            values: {
+              help: 'me',
+            },
+            copyWithoutRender: ['.github/*', '*.md'],
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template using cookiecutter with custom extensions.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:cookiecutter',
+          name: 'Fetch and Template Using Cookiecutter',
+          input: {
+            url: 'https://google.com/cookie/cutter',
+            values: {
+              help: 'me',
+            },
+            extensions: ['jinja2_time.TimeExtension'],
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template using cookiecutter with a custom Docker image.',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:cookiecutter',
+          name: 'Fetch and Template Using Cookiecutter',
+          input: {
+            url: 'https://google.com/cookie/cutter',
+            values: {
+              help: 'me',
+            },
+            imageName: 'custom/cookiecutter-image',
+          },
+        },
+      ],
+    }),
+  },
+];
diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
index d170acb5d0..efbe0a07cf 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
@@ -28,6 +28,7 @@ import {
   fetchContents,
   executeShellCommand,
 } from '@backstage/plugin-scaffolder-node';
+import { examples } from './cookiecutter.examples';
 
 export class CookiecutterRunner {
   private readonly containerRunner?: ContainerRunner;
@@ -156,6 +157,7 @@ export function createFetchCookiecutterAction(options: {
     id: 'fetch:cookiecutter',
     description:
       'Downloads a template from the given URL into the workspace, and runs cookiecutter on it.',
+    examples,
     schema: {
       input: {
         type: 'object',

From 6fc03c7d3ab0b1ff75ea037c113314bf47fecb99 Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sat, 13 Jul 2024 16:06:42 +0530
Subject: [PATCH 040/225] Add examples for notification:send scaffolder action
 & improve related tests

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .changeset/cool-insects-remember.md           |   5 +
 .../package.json                              |   3 +-
 .../actions/sendNotification.examples.test.ts | 272 ++++++++++++++++++
 .../src/actions/sendNotification.examples.ts  | 255 ++++++++++++++++
 .../src/actions/sendNotification.ts           |   2 +
 5 files changed, 536 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/cool-insects-remember.md
 create mode 100644 plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.examples.test.ts
 create mode 100644 plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.examples.ts

diff --git a/.changeset/cool-insects-remember.md b/.changeset/cool-insects-remember.md
new file mode 100644
index 0000000000..ab33015377
--- /dev/null
+++ b/.changeset/cool-insects-remember.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-notifications': patch
+---
+
+Add examples for notification:send scaffolder action & improve related tests
diff --git a/plugins/scaffolder-backend-module-notifications/package.json b/plugins/scaffolder-backend-module-notifications/package.json
index 7c983c36ce..5e45676f99 100644
--- a/plugins/scaffolder-backend-module-notifications/package.json
+++ b/plugins/scaffolder-backend-module-notifications/package.json
@@ -38,7 +38,8 @@
     "@backstage/plugin-notifications-common": "workspace:^",
     "@backstage/plugin-notifications-node": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
-    "octokit": "^3.0.0"
+    "octokit": "^3.0.0",
+    "yaml": "^2.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.examples.test.ts b/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.examples.test.ts
new file mode 100644
index 0000000000..84473335e0
--- /dev/null
+++ b/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.examples.test.ts
@@ -0,0 +1,272 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { createSendNotificationAction } from './sendNotification';
+import { NotificationService } from '@backstage/plugin-notifications-node';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
+import { examples } from './sendNotification.examples';
+import yaml from 'yaml';
+
+describe('notification:send', () => {
+  const notificationService: jest.Mocked<NotificationService> = {
+    send: jest.fn(),
+  };
+
+  let action: TemplateAction<any>;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    action = createSendNotificationAction({
+      notifications: notificationService,
+    });
+  });
+
+  const mockContext = createMockActionContext({
+    input: {
+      recipients: 'broadcast',
+      title: 'Test notification',
+    },
+  });
+
+  it(`should ${examples[0].description}`, async () => {
+    const input = yaml.parse(examples[0].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: { type: 'broadcast' },
+      payload: {
+        title: 'Test notification',
+      },
+    });
+  });
+
+  it(`should ${examples[1].description}`, async () => {
+    const input = yaml.parse(examples[1].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: {
+        entityRef: ['entity:component:1'],
+        type: 'entity',
+      },
+      payload: {
+        description: 'A security update has been applied. Please review.',
+        title: 'Security Update',
+        link: 'https://example.com/security/update',
+        severity: 'high',
+        scope: 'internal',
+      },
+    });
+  });
+
+  it(`should ${examples[2].description}`, async () => {
+    const input = yaml.parse(examples[2].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: {
+        type: 'entity',
+        entityRef: ['entity:component:1'],
+      },
+      payload: {
+        description: 'Here is your weekly update.',
+        link: undefined,
+        severity: 'low',
+        scope: undefined,
+        title: 'Weekly Update',
+      },
+    });
+  });
+
+  it(`should ${examples[3].description}`, async () => {
+    const input = yaml.parse(examples[3].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: { type: 'broadcast' },
+      payload: {
+        description: 'Version 2.0.0 is now available. Upgrade now!',
+        link: undefined,
+        severity: 'normal',
+        scope: 'public',
+        title: 'New Release Available',
+      },
+    });
+  });
+
+  it(`should ${examples[4].description}`, async () => {
+    const input = yaml.parse(examples[4].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: {
+        type: 'entity',
+        entityRef: ['entity:component:1'],
+      },
+      payload: {
+        description:
+          'A critical bug has been identified. Immediate action required.',
+        link: undefined,
+        scope: 'internal',
+        severity: 'critical',
+        title: 'Critical Bug Found',
+      },
+    });
+  });
+
+  it(`should ${examples[5].description}`, async () => {
+    const input = yaml.parse(examples[5].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: {
+        type: 'broadcast',
+      },
+      payload: {
+        description: 'Server maintenance will occur tonight at 11 PM.',
+        link: undefined,
+        scope: 'internal',
+        severity: 'normal',
+        title: 'Server Maintenance Scheduled',
+      },
+    });
+  });
+
+  it(`should ${examples[6].description}`, async () => {
+    const input = yaml.parse(examples[6].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: { type: 'broadcast' },
+      payload: {
+        description: 'New features have been deployed. Explore them now!',
+        link: undefined,
+        scope: undefined,
+        severity: 'normal',
+        title: 'New Feature Deployment',
+      },
+    });
+  });
+
+  it(`should ${examples[7].description}`, async () => {
+    const input = yaml.parse(examples[7].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: { type: 'broadcast' },
+      payload: {
+        description: undefined,
+        link: undefined,
+        scope: 'internal',
+        severity: 'low',
+        title: 'Holiday Office Closure',
+      },
+    });
+  });
+
+  it(`should ${examples[8].description}`, async () => {
+    const input = yaml.parse(examples[8].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: { type: 'broadcast' },
+      payload: {
+        description:
+          "Don't forget, the weekly meeting is scheduled for tomorrow.",
+        link: undefined,
+        scope: 'internal',
+        severity: undefined,
+        title: 'Reminder: Weekly Meeting Tomorrow',
+      },
+    });
+  });
+
+  it(`should ${examples[9].description}`, async () => {
+    const input = yaml.parse(examples[9].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: { type: 'broadcast' },
+      payload: {
+        title: 'Important Announcement',
+        description:
+          'Please read the latest announcement regarding the upcoming changes.',
+        link: undefined,
+        scope: undefined,
+        severity: 'high',
+      },
+    });
+  });
+
+  it(`should ${examples[10].description}`, async () => {
+    const input = yaml.parse(examples[10].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: { type: 'broadcast' },
+      payload: {
+        title: 'Broadcast Notification',
+        description: 'This is a broadcast notification',
+        link: undefined,
+        scope: undefined,
+        severity: 'low',
+      },
+    });
+  });
+
+  it(`should ${examples[11].description}`, async () => {
+    const input = yaml.parse(examples[11].example).steps[0].input;
+    const ctx = Object.assign({}, mockContext, {
+      input: input,
+    });
+    await action.handler(ctx);
+    expect(notificationService.send).toHaveBeenCalledWith({
+      recipients: {
+        type: 'entity',
+        entityRef: ['entity:service1'],
+      },
+      payload: {
+        title: 'Entity Notification',
+        description: 'This is a notification for entity service1',
+        link: undefined,
+        scope: undefined,
+        severity: 'normal',
+      },
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.examples.ts b/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.examples.ts
new file mode 100644
index 0000000000..05bbd368f8
--- /dev/null
+++ b/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.examples.ts
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Sends a notification with minimal options',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'broadcast',
+            title: 'Test notification',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Sends a notification with entity recipients and link',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'entity',
+            entityRefs: ['entity:component:1'],
+            title: 'Security Update',
+            info: 'A security update has been applied. Please review.',
+            link: 'https://example.com/security/update',
+            severity: 'high',
+            scope: 'internal',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Sends a notification with entity recipients and optional flag',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'entity',
+            entityRefs: ['entity:component:1'],
+            title: 'Weekly Update',
+            info: 'Here is your weekly update.',
+            severity: 'low',
+            optional: true,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Sends a notification with broadcast recipients and custom scope',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'broadcast',
+            title: 'New Release Available',
+            info: 'Version 2.0.0 is now available. Upgrade now!',
+            severity: 'normal',
+            scope: 'public',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Sends a notification with entity recipients and custom severity',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'entity',
+            entityRefs: ['entity:component:1'],
+            title: 'Critical Bug Found',
+            info: 'A critical bug has been identified. Immediate action required.',
+            severity: 'critical',
+            scope: 'internal',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Sends a notification with broadcast recipients and no link',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'broadcast',
+            title: 'Server Maintenance Scheduled',
+            info: 'Server maintenance will occur tonight at 11 PM.',
+            severity: 'normal',
+            scope: 'internal',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Sends a notification with broadcast recipients and optional flag',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'broadcast',
+            title: 'New Feature Deployment',
+            info: 'New features have been deployed. Explore them now!',
+            severity: 'normal',
+            optional: true,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Sends a notification with broadcast recipients and no description',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'broadcast',
+            title: 'Holiday Office Closure',
+            severity: 'low',
+            scope: 'internal',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Sends a notification with broadcast recipients and no severity',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'broadcast',
+            title: 'Reminder: Weekly Meeting Tomorrow',
+            info: "Don't forget, the weekly meeting is scheduled for tomorrow.",
+            scope: 'internal',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Sends a notification with broadcast recipients and no scope',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'broadcast',
+            title: 'Important Announcement',
+            info: 'Please read the latest announcement regarding the upcoming changes.',
+            severity: 'high',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Sends a notification with optional parameters',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification',
+          input: {
+            recipients: 'broadcast',
+            title: 'Broadcast Notification',
+            info: 'This is a broadcast notification',
+            severity: 'low',
+            optional: true,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Sends a notification with entity recipients and optional set to false',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'sendNotification',
+          action: 'notification:send',
+          name: 'Send Notification to Entity',
+          input: {
+            recipients: 'entity',
+            entityRefs: ['entity:service1'],
+            title: 'Entity Notification',
+            info: 'This is a notification for entity service1',
+            severity: 'normal',
+            optional: false,
+          },
+        },
+      ],
+    }),
+  },
+];
diff --git a/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.ts b/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.ts
index f50e178174..9646de0001 100644
--- a/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.ts
+++ b/plugins/scaffolder-backend-module-notifications/src/actions/sendNotification.ts
@@ -22,6 +22,7 @@ import {
   NotificationSeverity,
 } from '@backstage/plugin-notifications-common';
 import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
+import { examples } from './sendNotification.examples';
 
 /**
  * @public
@@ -42,6 +43,7 @@ export function createSendNotificationAction(options: {
   }>({
     id: 'notification:send',
     description: 'Sends a notification using NotificationService',
+    examples,
     schema: {
       input: {
         type: 'object',

From 449def7c2c3445f234106becf9e8b74291758ddf Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sat, 13 Jul 2024 17:30:14 +0530
Subject: [PATCH 041/225] Add examples for fetch:rails scaffolder action &
 improve related tests

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .changeset/friendly-feet-refuse.md            |   5 +
 .../package.json                              |   3 +-
 .../fetch/rails/index.examples.test.ts        | 292 ++++++++++++++
 .../src/actions/fetch/rails/index.examples.ts | 370 ++++++++++++++++++
 .../src/actions/fetch/rails/index.ts          |   2 +
 5 files changed, 671 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/friendly-feet-refuse.md
 create mode 100644 plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
 create mode 100644 plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.ts

diff --git a/.changeset/friendly-feet-refuse.md b/.changeset/friendly-feet-refuse.md
new file mode 100644
index 0000000000..677d21d48a
--- /dev/null
+++ b/.changeset/friendly-feet-refuse.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-rails': patch
+---
+
+Add examples for fetch:rails scaffolder action & improve related tests
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index c15815d2fa..fb917f4e25 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -51,7 +51,8 @@
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "command-exists": "^1.2.9",
-    "fs-extra": "^11.0.0"
+    "fs-extra": "^11.0.0",
+    "yaml": "^2.0.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
new file mode 100644
index 0000000000..d35cb3f319
--- /dev/null
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
@@ -0,0 +1,292 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const mockRailsTemplater = { run: jest.fn() };
+jest.mock('@backstage/plugin-scaffolder-node', () => ({
+  ...jest.requireActual('@backstage/plugin-scaffolder-node'),
+  fetchContents: jest.fn(),
+}));
+jest.mock('./railsNewRunner', () => {
+  return {
+    RailsNewRunner: jest.fn().mockImplementation(() => {
+      return mockRailsTemplater;
+    }),
+  };
+});
+
+import { ContainerRunner, UrlReader } from '@backstage/backend-common';
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
+import { resolve as resolvePath } from 'path';
+import { createFetchRailsAction } from './index';
+import { fetchContents } from '@backstage/plugin-scaffolder-node';
+import { createMockDirectory } from '@backstage/backend-test-utils';
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
+import { Writable } from 'stream';
+import { examples } from './index.examples';
+import yaml from 'yaml';
+
+describe('fetch:rails', () => {
+  const mockDir = createMockDirectory();
+  const integrations = ScmIntegrations.fromConfig(
+    new ConfigReader({
+      integrations: {
+        azure: [
+          { host: 'dev.azure.com', token: 'tokenlols' },
+          { host: 'myazurehostnotoken.com' },
+        ],
+      },
+    }),
+  );
+
+  const mockContext = createMockActionContext({
+    input: {
+      url: 'https://rubyonrails.org/generator',
+      targetPath: 'something',
+      values: {
+        help: 'me',
+      },
+    },
+    templateInfo: {
+      baseUrl: 'somebase',
+      entityRef: 'template:default/myTemplate',
+    },
+    workspacePath: mockDir.path,
+  });
+
+  const mockReader: UrlReader = {
+    readUrl: jest.fn(),
+    readTree: jest.fn(),
+    search: jest.fn(),
+  };
+  const containerRunner: ContainerRunner = {
+    runContainer: jest.fn(),
+  };
+
+  const action = createFetchRailsAction({
+    integrations,
+    reader: mockReader,
+    containerRunner,
+    allowedImageNames: ['foo/rails-custom-image'],
+  });
+
+  beforeEach(() => {
+    mockDir.setContent({
+      result: '{}',
+    });
+    jest.clearAllMocks();
+  });
+
+  it(`should ${examples[0].description}`, async () => {
+    const input = yaml.parse(examples[0].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[1].description}`, async () => {
+    const input = yaml.parse(examples[1].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[2].description}`, async () => {
+    const input = yaml.parse(examples[2].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[3].description}`, async () => {
+    const input = yaml.parse(examples[3].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[4].description}`, async () => {
+    const input = yaml.parse(examples[4].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[5].description}`, async () => {
+    const input = yaml.parse(examples[5].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[6].description}`, async () => {
+    const input = yaml.parse(examples[6].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[7].description}`, async () => {
+    const input = yaml.parse(examples[7].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[8].description}`, async () => {
+    const input = yaml.parse(examples[8].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+
+  it(`should ${examples[9].description}`, async () => {
+    const input = yaml.parse(examples[9].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(fetchContents).toHaveBeenCalledWith({
+      reader: mockReader,
+      integrations,
+      baseUrl: mockContext.templateInfo?.baseUrl,
+      fetchUrl: input.url,
+      outputPath: resolvePath(mockContext.workspacePath),
+    });
+  });
+});
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.ts
new file mode 100644
index 0000000000..4c77eb3c1b
--- /dev/null
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.ts
@@ -0,0 +1,370 @@
+/*
+ * Copyright 2021 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { TemplateExample } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+export const examples: TemplateExample[] = [
+  {
+    description: 'Fetch and template a minimal Rails app',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: true,
+                skipBundle: true,
+                skipWebpackInstall: true,
+                skipTest: true,
+                skipActionCable: true,
+                skipActionMailer: true,
+                skipActionMailbox: true,
+                skipActiveStorage: true,
+                skipActionText: true,
+                skipActiveRecord: true,
+                force: true,
+                api: true,
+                webpacker: 'react',
+                database: 'postgresql',
+                railsVersion: 'dev',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Fetch and template a Rails app with custom options',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            targetPath: 'custom-path',
+            values: {
+              railsArguments: {
+                minimal: false,
+                skipBundle: false,
+                skipWebpackInstall: false,
+                skipTest: false,
+                skipActionCable: false,
+                skipActionMailer: false,
+                skipActionMailbox: false,
+                skipActiveStorage: false,
+                skipActionText: false,
+                skipActiveRecord: false,
+                force: false,
+                api: false,
+                webpacker: 'vue',
+                database: 'mysql',
+                railsVersion: 'edge',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Fetch and template a Rails app with Docker image',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: true,
+                skipBundle: true,
+                skipWebpackInstall: true,
+                skipTest: true,
+                skipActionCable: true,
+                skipActionMailer: true,
+                skipActionMailbox: true,
+                skipActiveStorage: true,
+                skipActionText: true,
+                skipActiveRecord: true,
+                force: true,
+                api: true,
+                webpacker: 'react',
+                database: 'postgresql',
+                railsVersion: 'dev',
+              },
+              imageName: 'custom/rails-image',
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template a Rails app with different database and action mailer settings',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: false,
+                skipBundle: false,
+                skipWebpackInstall: false,
+                skipTest: false,
+                skipActionCable: false,
+                skipActionMailer: false,
+                skipActionMailbox: true,
+                skipActiveStorage: false,
+                skipActionText: false,
+                skipActiveRecord: false,
+                force: true,
+                api: true,
+                webpacker: 'angular',
+                database: 'sqlite3',
+                railsVersion: 'master',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template a Rails app with full options including action mailer and active storage',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: false,
+                skipBundle: false,
+                skipWebpackInstall: false,
+                skipTest: false,
+                skipActionCable: false,
+                skipActionMailer: false,
+                skipActionMailbox: false,
+                skipActiveStorage: false,
+                skipActionText: false,
+                skipActiveRecord: false,
+                force: false,
+                api: false,
+                webpacker: 'stimulus',
+                database: 'postgresql',
+                railsVersion: 'fromImage',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template a Rails app with API-only stack and custom template path',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: false,
+                skipBundle: true,
+                skipWebpackInstall: true,
+                skipTest: true,
+                skipActionCable: true,
+                skipActionMailer: true,
+                skipActionMailbox: true,
+                skipActiveStorage: true,
+                skipActionText: true,
+                skipActiveRecord: true,
+                force: true,
+                api: true,
+                webpacker: 'elm',
+                database: 'mysql',
+                railsVersion: 'dev',
+                template: 'path/to/custom/template',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Fetch and template a Rails app with custom Webpack setup',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: false,
+                skipBundle: false,
+                skipWebpackInstall: false,
+                skipTest: false,
+                skipActionCable: false,
+                skipActionMailer: false,
+                skipActionMailbox: false,
+                skipActiveStorage: false,
+                skipActionText: false,
+                skipActiveRecord: false,
+                force: false,
+                api: false,
+                webpacker: 'angular',
+                database: 'postgresql',
+                railsVersion: 'dev',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template a Rails app with specific Rails version and Action Mailer enabled',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: false,
+                skipBundle: false,
+                skipWebpackInstall: false,
+                skipTest: false,
+                skipActionCable: false,
+                skipActionMailer: false,
+                skipActionMailbox: false,
+                skipActiveStorage: false,
+                skipActionText: false,
+                skipActiveRecord: false,
+                force: true,
+                api: true,
+                webpacker: 'react',
+                database: 'sqlite3',
+                railsVersion: 'master',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template a Rails app with specific database and Active Storage enabled',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: false,
+                skipBundle: false,
+                skipWebpackInstall: false,
+                skipTest: false,
+                skipActionCable: false,
+                skipActionMailer: false,
+                skipActionMailbox: false,
+                skipActiveStorage: false,
+                skipActionText: false,
+                skipActiveRecord: false,
+                force: true,
+                api: true,
+                webpacker: 'vue',
+                database: 'postgresql',
+                railsVersion: 'fromImage',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Fetch and template a Rails app with full options including database and skip options',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'fetchTemplate',
+          action: 'fetch:rails',
+          name: 'Fetch and Template Rails App',
+          input: {
+            url: 'https://github.com/backstage/backstage',
+            values: {
+              railsArguments: {
+                minimal: false,
+                skipBundle: true,
+                skipWebpackInstall: true,
+                skipTest: true,
+                skipActionCable: true,
+                skipActionMailer: true,
+                skipActionMailbox: true,
+                skipActiveStorage: true,
+                skipActionText: true,
+                skipActiveRecord: true,
+                force: false,
+                api: false,
+                webpacker: 'stimulus',
+                database: 'sqlite3',
+                railsVersion: 'dev',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+];
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
index 394d0fb02c..94a2a3539b 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
@@ -27,6 +27,7 @@ import {
 import { resolve as resolvePath } from 'path';
 import { RailsNewRunner } from './railsNewRunner';
 import { PassThrough } from 'stream';
+import { examples } from './index.examples';
 
 /**
  * Creates the `fetch:rails` Scaffolder action.
@@ -56,6 +57,7 @@ export function createFetchRailsAction(options: {
     id: 'fetch:rails',
     description:
       'Downloads a template from the given `url` into the workspace, and runs a rails new generator on it.',
+    examples,
     schema: {
       input: {
         type: 'object',

From b9e73a0e5a7545bb659f626b02fba9a6d82e7c3e Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sun, 14 Jul 2024 10:45:49 +0530
Subject: [PATCH 042/225] chore: run yarn install to update dependencies

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 yarn.lock | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yarn.lock b/yarn.lock
index b0bff82017..574792b052 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7055,6 +7055,7 @@ __metadata:
     command-exists: ^1.2.9
     fs-extra: ^11.0.0
     jest-when: ^3.1.0
+    yaml: ^2.0.0
   languageName: unknown
   linkType: soft
 

From b687beb2dcc16eddc89b85675b425fec7cc02c51 Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sun, 14 Jul 2024 10:52:16 +0530
Subject: [PATCH 043/225] chore: run yarn install to update dependencies

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 yarn.lock | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yarn.lock b/yarn.lock
index b0bff82017..18f51570ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7032,6 +7032,7 @@ __metadata:
     "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     octokit: ^3.0.0
+    yaml: ^2.0.0
   languageName: unknown
   linkType: soft
 

From b084597b3299049b92c9cbc3e76c704ec8f41a7e Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sun, 14 Jul 2024 10:55:19 +0530
Subject: [PATCH 044/225] chore: run yarn install to update dependencies

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 yarn.lock | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yarn.lock b/yarn.lock
index b0bff82017..4dcfba4743 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6917,6 +6917,7 @@ __metadata:
     command-exists: ^1.2.9
     fs-extra: ^11.2.0
     winston: ^3.2.1
+    yaml: ^2.0.0
     yn: ^4.0.0
   languageName: unknown
   linkType: soft

From 065353f144c00589e5f4cbb427738ccc6f74deb4 Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sun, 14 Jul 2024 10:58:53 +0530
Subject: [PATCH 045/225] chore: removed unused imports

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .../src/actions/fetch/rails/index.examples.test.ts               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
index d35cb3f319..a80985321e 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
@@ -35,7 +35,6 @@ import { createFetchRailsAction } from './index';
 import { fetchContents } from '@backstage/plugin-scaffolder-node';
 import { createMockDirectory } from '@backstage/backend-test-utils';
 import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
-import { Writable } from 'stream';
 import { examples } from './index.examples';
 import yaml from 'yaml';
 

From 0ab868dfd1510b6ef85d1967db2ac3688de496bd Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Sun, 14 Jul 2024 04:00:51 -0400
Subject: [PATCH 046/225] Wip

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .../components/ReviewState/ReviewState.tsx    | 42 +---------
 .../src/next/components/ReviewState/util.ts   | 84 +++++++++++++------
 2 files changed, 59 insertions(+), 67 deletions(-)

diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
index 95f5d76212..d320ad80a6 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
@@ -18,7 +18,7 @@ import { StructuredMetadataTable } from '@backstage/core-components';
 import { JsonObject } from '@backstage/types';
 import { Draft07 as JSONSchema } from 'json-schema-library';
 import { ParsedTemplateSchema } from '../../hooks/useTemplateSchema';
-import { flattenObject, isJsonObject } from './util';
+import { processEntry } from './util';
 
 /**
  * The props for the {@link ReviewState} component.
@@ -38,49 +38,11 @@ export const ReviewState = (props: ReviewStateProps) => {
     Object.entries(props.formState)
       .flatMap(([key, value]) => {
         for (const step of props.schemas) {
-          const parsedSchema = new JSONSchema(step.mergedSchema);
-          const definitionInSchema = parsedSchema.getSchema({
-            pointer: `#/${key}`,
-            data: props.formState,
-          });
-
-          if (definitionInSchema) {
-            const backstageReviewOptions =
-              definitionInSchema['ui:backstage']?.review;
-
-            if (backstageReviewOptions) {
-              if (backstageReviewOptions.mask) {
-                return [[key, backstageReviewOptions.mask]];
-              }
-              if (backstageReviewOptions.show === false) {
-                return [];
-              }
-              if (backstageReviewOptions.explode && isJsonObject(value)) {
-                return flattenObject(value, key, parsedSchema, props.formState);
-              }
-            }
-
-            if (definitionInSchema['ui:widget'] === 'password') {
-              return [[key, '******']];
-            }
-
-            if (definitionInSchema.enum && definitionInSchema.enumNames) {
-              return [
-                [
-                  key,
-                  definitionInSchema.enumNames[
-                    definitionInSchema.enum.indexOf(value)
-                  ] || value,
-                ],
-              ];
-            }
-          }
+          return processEntry(key, value, step, props.formState);
         }
-
         return [[key, value]];
       })
       .filter(prop => prop.length > 0),
   );
-
   return <StructuredMetadataTable metadata={reviewData} />;
 };
diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/util.ts b/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
index 0bb6fc08d2..e040b851d3 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 /*
  * Copyright 2022 The Backstage Authors
  *
@@ -16,34 +17,63 @@
 
 import { JsonObject, JsonValue } from '@backstage/types';
 import { Draft07 as JSONSchema } from 'json-schema-library';
-
-export function flattenObject(
-  obj: JsonObject,
-  prefix: string,
-  schema: JSONSchema,
-  formState: JsonObject,
-): [string, JsonValue | undefined][] {
-  return Object.entries(obj).flatMap(([key, value]) => {
-    const prefixedKey = prefix ? `${prefix}/${key}` : key;
-
-    const definitionInSchema = schema.getSchema({
-      pointer: `#/${prefixedKey}`,
-      data: formState,
-    });
-
-    if (definitionInSchema) {
-      const backstageReviewOptions = definitionInSchema['ui:backstage']?.review;
-
-      // Recurse into nested objects
-      if (backstageReviewOptions?.explode && isJsonObject(value)) {
-        return flattenObject(value, prefixedKey, schema, formState);
-      }
-    }
-
-    return [[key, value]];
-  });
-}
+import { ParsedTemplateSchema } from '../../hooks';
 
 export function isJsonObject(value?: JsonValue): value is JsonObject {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
+
+export function processEntry(
+  key: string,
+  value: JsonValue | undefined,
+  schema: ParsedTemplateSchema,
+  formState: JsonObject,
+): [string, JsonValue | undefined][] {
+  const parsedSchema = new JSONSchema(schema.mergedSchema);
+  const definitionInSchema = parsedSchema.getSchema({
+    pointer: `#/${key}`,
+    data: formState,
+  });
+
+  if (definitionInSchema) {
+    const backstageReviewOptions = definitionInSchema['ui:backstage']?.review;
+    if (backstageReviewOptions) {
+      if (backstageReviewOptions.mask) {
+        return [[getLastKey(key), backstageReviewOptions.mask]];
+      }
+      if (backstageReviewOptions.show === false) {
+        return [];
+      }
+    }
+
+    if (isJsonObject(value)) {
+      // Process nested objects
+      return Object.entries(value).flatMap(([nestedKey, nestedValue]) =>
+        processEntry(`${key}/${nestedKey}`, nestedValue, schema, formState),
+      );
+    }
+
+    if (definitionInSchema['ui:widget'] === 'password') {
+      return [[getLastKey(key), '******']];
+    }
+
+    if (definitionInSchema.enum && definitionInSchema.enumNames) {
+      return [
+        [
+          getLastKey(key),
+          definitionInSchema.enumNames[
+            definitionInSchema.enum.indexOf(value)
+          ] || value,
+        ],
+      ];
+    }
+  }
+
+  return [[getLastKey(key), value]];
+}
+
+// Helper function to get the last part of the key
+function getLastKey(key: string): string {
+  const parts = key.split('/');
+  return parts[parts.length - 1];
+}

From c0a705d44298c5274f1d94b230d642a86cada2c9 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@spotify.com>
Date: Fri, 14 Jun 2024 10:49:04 -0500
Subject: [PATCH 047/225] Added the Kubernetes plugin to `create-app`

Signed-off-by: Andre Wanlin <awanlin@spotify.com>
---
 .changeset/blue-pumas-cheer.md                |  5 +++++
 packages/create-app/src/lib/versions.ts       |  4 ++++
 .../templates/default-app/app-config.yaml.hbs |  3 +++
 .../default-app/packages/app/package.json.hbs |  1 +
 .../app/src/components/catalog/EntityPage.tsx | 21 +++++++++++++++++++
 .../packages/backend/package.json.hbs         |  1 +
 .../default-app/packages/backend/src/index.ts |  3 +++
 7 files changed, 38 insertions(+)
 create mode 100644 .changeset/blue-pumas-cheer.md

diff --git a/.changeset/blue-pumas-cheer.md b/.changeset/blue-pumas-cheer.md
new file mode 100644
index 0000000000..f6cbf180ff
--- /dev/null
+++ b/.changeset/blue-pumas-cheer.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Added the Kubernetes plugin to `create-app`
diff --git a/packages/create-app/src/lib/versions.ts b/packages/create-app/src/lib/versions.ts
index 25fd7b7c3c..194ffa21d9 100644
--- a/packages/create-app/src/lib/versions.ts
+++ b/packages/create-app/src/lib/versions.ts
@@ -62,6 +62,8 @@ import { version as pluginCatalogBackendModuleLogs } from '../../../../plugins/c
 import { version as pluginCatalogBackendModuleScaffolderEntityModel } from '../../../../plugins/catalog-backend-module-scaffolder-entity-model/package.json';
 import { version as pluginCatalogGraph } from '../../../../plugins/catalog-graph/package.json';
 import { version as pluginCatalogImport } from '../../../../plugins/catalog-import/package.json';
+import { version as pluginKubernetes } from '../../../../plugins/kubernetes/package.json';
+import { version as pluginKubernetesBackend } from '../../../../plugins/kubernetes-backend/package.json';
 import { version as pluginOrg } from '../../../../plugins/org/package.json';
 import { version as pluginPermissionBackend } from '../../../../plugins/permission-backend/package.json';
 import { version as pluginPermissionBackendModulePolicyAllowAll } from '../../../../plugins/permission-backend-module-policy-allow-all/package.json';
@@ -118,6 +120,8 @@ export const packageVersions = {
     pluginCatalogBackendModuleScaffolderEntityModel,
   '@backstage/plugin-catalog-graph': pluginCatalogGraph,
   '@backstage/plugin-catalog-import': pluginCatalogImport,
+  '@backstage/plugin-kubernetes': pluginKubernetes,
+  '@backstage/plugin-kubernetes-backend': pluginKubernetesBackend,
   '@backstage/plugin-org': pluginOrg,
   '@backstage/plugin-permission-backend': pluginPermissionBackend,
   '@backstage/plugin-permission-backend-module-allow-all-policy':
diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index 248cff137a..a4797d4c41 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -103,3 +103,6 @@ catalog:
     #   target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
     #   rules:
     #     - allow: [User, Group]
+
+kubernetes:
+  # see https://backstage.io/docs/features/kubernetes/configuration for kubernetes configuration options
\ No newline at end of file
diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs
index d4db9e5885..08a1d58362 100644
--- a/packages/create-app/templates/default-app/packages/app/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs
@@ -27,6 +27,7 @@
     "@backstage/plugin-catalog-graph": "^{{version '@backstage/plugin-catalog-graph'}}",
     "@backstage/plugin-catalog-import": "^{{version '@backstage/plugin-catalog-import'}}",
     "@backstage/plugin-catalog-react": "^{{version '@backstage/plugin-catalog-react'}}",
+    "@backstage/plugin-kubernetes": "^{{version '@backstage/plugin-kubernetes'}}",
     "@backstage/plugin-org": "^{{version '@backstage/plugin-org'}}",
     "@backstage/plugin-permission-react": "^{{version '@backstage/plugin-permission-react'}}",
     "@backstage/plugin-scaffolder": "^{{version '@backstage/plugin-scaffolder'}}",
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
index 53b6685c3f..6164c76004 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
@@ -54,6 +54,11 @@ import {
 import { TechDocsAddons } from '@backstage/plugin-techdocs-react';
 import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
 
+import {
+  EntityKubernetesContent,
+  isKubernetesAvailable,
+} from '@backstage/plugin-kubernetes';
+
 const techdocsContent = (
   <EntityTechdocsContent>
     <TechDocsAddons>
@@ -150,6 +155,14 @@ const serviceEntityPage = (
       {cicdContent}
     </EntityLayout.Route>
 
+    <EntityLayout.Route
+      path="/kubernetes"
+      title="Kubernetes"
+      if={isKubernetesAvailable}
+    >
+      <EntityKubernetesContent />
+    </EntityLayout.Route>
+
     <EntityLayout.Route path="/api" title="API">
       <Grid container spacing={3} alignItems="stretch">
         <Grid item md={6}>
@@ -188,6 +201,14 @@ const websiteEntityPage = (
       {cicdContent}
     </EntityLayout.Route>
 
+    <EntityLayout.Route
+      path="/kubernetes"
+      title="Kubernetes"
+      if={isKubernetesAvailable}
+    >
+      <EntityKubernetesContent />
+    </EntityLayout.Route>
+
     <EntityLayout.Route path="/dependencies" title="Dependencies">
       <Grid container spacing={3} alignItems="stretch">
         <Grid item md={6}>
diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
index e26c788496..8aad8a4b5d 100644
--- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
@@ -28,6 +28,7 @@
     "@backstage/plugin-catalog-backend": "^{{version '@backstage/plugin-catalog-backend'}}",
     "@backstage/plugin-catalog-backend-module-logs": "^{{version '@backstage/plugin-catalog-backend-module-logs'}}",
     "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^{{version '@backstage/plugin-catalog-backend-module-scaffolder-entity-model'}}",
+    "@backstage/plugin-kubernetes-backend": "^{{version '@backstage/plugin-kubernetes-backend'}}",
     "@backstage/plugin-permission-backend": "^{{version '@backstage/plugin-permission-backend'}}",
     "@backstage/plugin-permission-backend-module-allow-all-policy": "^{{version '@backstage/plugin-permission-backend-module-allow-all-policy'}}",
     "@backstage/plugin-permission-common": "^{{version '@backstage/plugin-permission-common'}}",
diff --git a/packages/create-app/templates/default-app/packages/backend/src/index.ts b/packages/create-app/templates/default-app/packages/backend/src/index.ts
index 239269288e..983202caa6 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/index.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/index.ts
@@ -41,4 +41,7 @@ backend.add(import('@backstage/plugin-search-backend/alpha'));
 backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
 backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
 
+// kubernetes
+backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
+
 backend.start();

From dba4a14ee9b4ec8e2b99f94e9271cc9c26c951b8 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@spotify.com>
Date: Fri, 14 Jun 2024 11:17:30 -0500
Subject: [PATCH 048/225] Added new line

Signed-off-by: Andre Wanlin <awanlin@spotify.com>
---
 packages/create-app/templates/default-app/app-config.yaml.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index a4797d4c41..f784d5ba88 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -105,4 +105,4 @@ catalog:
     #     - allow: [User, Group]
 
 kubernetes:
-  # see https://backstage.io/docs/features/kubernetes/configuration for kubernetes configuration options
\ No newline at end of file
+  # see https://backstage.io/docs/features/kubernetes/configuration for kubernetes configuration options

From f26905d7a88559eb5ca5472a3842afe745e15059 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@spotify.com>
Date: Fri, 14 Jun 2024 11:48:09 -0500
Subject: [PATCH 049/225] Fixed test

Signed-off-by: Andre Wanlin <awanlin@spotify.com>
---
 packages/create-app/src/lib/tasks.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/create-app/src/lib/tasks.test.ts b/packages/create-app/src/lib/tasks.test.ts
index 1f507b95ed..7b17307721 100644
--- a/packages/create-app/src/lib/tasks.test.ts
+++ b/packages/create-app/src/lib/tasks.test.ts
@@ -88,6 +88,8 @@ jest.mock('./versions', () => ({
     '@backstage/plugin-catalog-graph': '1.0.0',
     '@backstage/plugin-catalog-import': '1.0.0',
     '@backstage/plugin-catalog-react': '1.0.0',
+    '@backstage/plugin-kubernetes': '1.0.0',
+    '@backstage/plugin-kubernetes-backend': '1.0.0',
     '@backstage/plugin-org': '1.0.0',
     '@backstage/plugin-scaffolder': '1.0.0',
     '@backstage/plugin-permission-react': '1.0.0',

From fe6ab86d9207cd1c2586aa016efdfbc007915ade Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Sun, 14 Jul 2024 15:24:38 -0400
Subject: [PATCH 050/225] Refactor review state schema processing code to
 support nested objects

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .../ReviewState/ReviewState.test.tsx          | 179 +++++++++++-------
 .../components/ReviewState/ReviewState.tsx    |  55 +++++-
 .../next/components/ReviewState/util.test.ts  | 170 +++--------------
 .../src/next/components/ReviewState/util.ts   |  55 +-----
 4 files changed, 189 insertions(+), 270 deletions(-)

diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
index dfa1c9c097..194c5f3e77 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
@@ -69,6 +69,9 @@ describe('ReviewState', () => {
     const formState = {
       name: 'John Doe',
       test: 'bob',
+      nest: {
+        foo: 'bar',
+      },
     };
 
     const schemas: ParsedTemplateSchema[] = [
@@ -85,6 +88,20 @@ describe('ReviewState', () => {
                 },
               },
             },
+            nest: {
+              type: 'object',
+              properties: {
+                foo: {
+                  type: 'string',
+                  'ui:widget': 'password',
+                  'ui:backstage': {
+                    review: {
+                      show: false,
+                    },
+                  },
+                },
+              },
+            },
           },
         },
         schema: {},
@@ -99,12 +116,16 @@ describe('ReviewState', () => {
     );
     expect(getAllByRole('row').length).toEqual(1);
     expect(queryByRole('row', { name: 'Name ******' })).not.toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Foo ******' })).not.toBeInTheDocument();
   });
 
   it('should allow for masking an option with a set text', () => {
     const formState = {
       name: 'John Doe',
       test: 'bob',
+      nest: {
+        foo: 'bar',
+      },
     };
 
     const schemas: ParsedTemplateSchema[] = [
@@ -121,6 +142,20 @@ describe('ReviewState', () => {
                 },
               },
             },
+            nest: {
+              type: 'object',
+              properties: {
+                foo: {
+                  type: 'string',
+                  'ui:widget': 'password',
+                  'ui:backstage': {
+                    review: {
+                      mask: 'lols',
+                    },
+                  },
+                },
+              },
+            },
           },
         },
         schema: {},
@@ -135,11 +170,15 @@ describe('ReviewState', () => {
     );
 
     expect(getByRole('row', { name: 'Name lols' })).toBeInTheDocument();
+    expect(getByRole('row', { name: 'Foo lols' })).toBeInTheDocument();
   });
 
   it('should display enum label from enumNames', async () => {
     const formState = {
       name: 'type2',
+      nest: {
+        foo: 'type2',
+      },
     };
 
     const schemas: ParsedTemplateSchema[] = [
@@ -153,6 +192,17 @@ describe('ReviewState', () => {
               enum: ['type1', 'type2', 'type3'],
               enumNames: ['Label-type1', 'Label-type2', 'Label-type3'],
             },
+            nest: {
+              type: 'object',
+              properties: {
+                foo: {
+                  type: 'string',
+                  default: 'type1',
+                  enum: ['type1', 'type2', 'type3'],
+                  enumNames: ['Label-type1', 'Label-type2', 'Label-type3'],
+                },
+              },
+            },
           },
         },
         schema: {},
@@ -169,6 +219,7 @@ describe('ReviewState', () => {
     expect(
       queryByRole('row', { name: 'Name Label-type2' }),
     ).toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Foo Label-type2' })).toBeInTheDocument();
   });
 
   it('should display enum value if no corresponding enumNames', async () => {
@@ -203,7 +254,7 @@ describe('ReviewState', () => {
     expect(queryByRole('row', { name: 'Name type4' })).toBeInTheDocument();
   });
 
-  it('should display exploded object in separate rows', async () => {
+  it('should display object in separate rows', async () => {
     const formState = {
       name: {
         foo: 'type3',
@@ -218,11 +269,6 @@ describe('ReviewState', () => {
           properties: {
             name: {
               type: 'object',
-              'ui:backstage': {
-                review: {
-                  explode: true,
-                },
-              },
               properties: {
                 foo: {
                   type: 'string',
@@ -239,7 +285,6 @@ describe('ReviewState', () => {
         schema: {},
         title: 'test',
         uiSchema: {},
-        description: 'asd',
       },
     ];
 
@@ -251,7 +296,7 @@ describe('ReviewState', () => {
     expect(queryByRole('row', { name: 'Bar type4' })).toBeInTheDocument();
   });
 
-  it('should display exploded nested objects', async () => {
+  it('should display nested objects in separate rows', async () => {
     const formState = {
       name: {
         foo: 'type3',
@@ -269,11 +314,60 @@ describe('ReviewState', () => {
           properties: {
             name: {
               type: 'object',
-              'ui:backstage': {
-                review: {
-                  explode: true,
+              properties: {
+                foo: {
+                  type: 'string',
+                  default: 'type1',
+                },
+                bar: {
+                  type: 'string',
+                  default: 'type2',
+                },
+                example: {
+                  type: 'object',
+                  properties: {
+                    test: {
+                      type: 'string',
+                    },
+                  },
                 },
               },
+            },
+          },
+        },
+        schema: {},
+        title: 'test',
+        uiSchema: {},
+      },
+    ];
+
+    const { queryByRole } = render(
+      <ReviewState formState={formState} schemas={schemas} />,
+    );
+
+    expect(queryByRole('row', { name: 'Foo type3' })).toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Bar type4' })).toBeInTheDocument();
+    expect(queryByRole('row', { name: 'Test type6' })).toBeInTheDocument();
+  });
+
+  it('should display partially nested objects', async () => {
+    const formState = {
+      name: {
+        foo: 'type3',
+        bar: 'type4',
+        example: {
+          test: 'type6',
+        },
+      },
+    };
+
+    const schemas: ParsedTemplateSchema[] = [
+      {
+        mergedSchema: {
+          type: 'object',
+          properties: {
+            name: {
+              type: 'object',
               properties: {
                 foo: {
                   type: 'string',
@@ -287,7 +381,7 @@ describe('ReviewState', () => {
                   type: 'object',
                   'ui:backstage': {
                     review: {
-                      explode: true,
+                      explode: false,
                     },
                   },
                   properties: {
@@ -303,67 +397,6 @@ describe('ReviewState', () => {
         schema: {},
         title: 'test',
         uiSchema: {},
-        description: 'asd',
-      },
-    ];
-
-    const { queryByRole } = render(
-      <ReviewState formState={formState} schemas={schemas} />,
-    );
-
-    expect(queryByRole('row', { name: 'Foo type3' })).toBeInTheDocument();
-    expect(queryByRole('row', { name: 'Bar type4' })).toBeInTheDocument();
-    expect(queryByRole('row', { name: 'Test type6' })).toBeInTheDocument();
-  });
-
-  it('should display partially exploded nested objects', async () => {
-    const formState = {
-      name: {
-        foo: 'type3',
-        bar: 'type4',
-        example: {
-          test: 'type6',
-        },
-      },
-    };
-
-    const schemas: ParsedTemplateSchema[] = [
-      {
-        mergedSchema: {
-          type: 'object',
-          properties: {
-            name: {
-              type: 'object',
-              'ui:backstage': {
-                review: {
-                  explode: true,
-                },
-              },
-              properties: {
-                foo: {
-                  type: 'string',
-                  default: 'type1',
-                },
-                bar: {
-                  type: 'string',
-                  default: 'type2',
-                },
-                example: {
-                  type: 'object',
-                  properties: {
-                    test: {
-                      type: 'string',
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-        schema: {},
-        title: 'test',
-        uiSchema: {},
-        description: 'asd',
       },
     ];
 
diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
index d320ad80a6..d87584afff 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
@@ -15,10 +15,10 @@
  */
 import React from 'react';
 import { StructuredMetadataTable } from '@backstage/core-components';
-import { JsonObject } from '@backstage/types';
+import { JsonObject, JsonValue } from '@backstage/types';
 import { Draft07 as JSONSchema } from 'json-schema-library';
 import { ParsedTemplateSchema } from '../../hooks/useTemplateSchema';
-import { processEntry } from './util';
+import { isJsonObject, getLastKey } from './util';
 
 /**
  * The props for the {@link ReviewState} component.
@@ -29,6 +29,55 @@ export type ReviewStateProps = {
   formState: JsonObject;
 };
 
+function processSchema(
+  key: string,
+  value: JsonValue | undefined,
+  schema: ParsedTemplateSchema,
+  formState: JsonObject,
+): [string, JsonValue | undefined][] {
+  const parsedSchema = new JSONSchema(schema.mergedSchema);
+  const definitionInSchema = parsedSchema.getSchema({
+    pointer: `#/${key}`,
+    data: formState,
+  });
+
+  if (definitionInSchema) {
+    const backstageReviewOptions = definitionInSchema['ui:backstage']?.review;
+    if (backstageReviewOptions) {
+      if (backstageReviewOptions.mask) {
+        return [[getLastKey(key), backstageReviewOptions.mask]];
+      }
+      if (backstageReviewOptions.show === false) {
+        return [];
+      }
+    }
+
+    if (definitionInSchema['ui:widget'] === 'password') {
+      return [[getLastKey(key), '******']];
+    }
+
+    if (definitionInSchema.enum && definitionInSchema.enumNames) {
+      return [
+        [
+          getLastKey(key),
+          definitionInSchema.enumNames[
+            definitionInSchema.enum.indexOf(value)
+          ] || value,
+        ],
+      ];
+    }
+
+    if (backstageReviewOptions?.explode !== false && isJsonObject(value)) {
+      // Recurse nested objects
+      return Object.entries(value).flatMap(([nestedKey, nestedValue]) =>
+        processSchema(`${key}/${nestedKey}`, nestedValue, schema, formState),
+      );
+    }
+  }
+
+  return [[getLastKey(key), value]];
+}
+
 /**
  * The component used by the {@link Stepper} to render the review step.
  * @alpha
@@ -38,7 +87,7 @@ export const ReviewState = (props: ReviewStateProps) => {
     Object.entries(props.formState)
       .flatMap(([key, value]) => {
         for (const step of props.schemas) {
-          return processEntry(key, value, step, props.formState);
+          return processSchema(key, value, step, props.formState);
         }
         return [[key, value]];
       })
diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts b/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
index e2a10587dc..9b88ff157e 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/util.test.ts
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import { flattenObject, isJsonObject } from './util';
-import { Draft07 as JSONSchema } from 'json-schema-library';
-import { ParsedTemplateSchema } from '../../hooks/useTemplateSchema';
+import { isJsonObject, getLastKey } from './util';
 
 describe('isJsonObject', () => {
   it('should return true for non-null objects', () => {
@@ -24,10 +22,6 @@ describe('isJsonObject', () => {
     expect(isJsonObject({ key: 'value' })).toBe(true);
   });
 
-  it('should return false for null', () => {
-    expect(isJsonObject(null)).toBe(false);
-  });
-
   it('should return false for arrays', () => {
     expect(isJsonObject([])).toBe(false);
     expect(isJsonObject([1, 2, 3])).toBe(false);
@@ -41,146 +35,40 @@ describe('isJsonObject', () => {
   });
 });
 
-describe('flattenObject', () => {
-  it('should handle an empty object', () => {
-    const schemas: ParsedTemplateSchema[] = [
-      {
-        mergedSchema: {
-          type: 'object',
-          properties: {
-            name: {
-              type: 'object',
-              'ui:backstage': {
-                review: {
-                  explode: true,
-                },
-              },
-              properties: {},
-            },
-          },
-        },
-        schema: {},
-        title: 'test',
-        uiSchema: {},
-      },
-    ];
-
-    const parsedSchema = new JSONSchema(schemas[0].mergedSchema);
-
-    const result = flattenObject({}, '', parsedSchema, {});
-
-    expect(result).toEqual([]);
+describe('getLastKey', () => {
+  it('should return the last part of a simple key', () => {
+    expect(getLastKey('simple')).toBe('simple');
   });
 
-  it('should flatten a simple object', () => {
-    const formState = {
-      name: {
-        foo: 'value1',
-        bar: 'value2',
-      },
-    };
-
-    const schemas: ParsedTemplateSchema[] = [
-      {
-        mergedSchema: {
-          type: 'object',
-          properties: {
-            name: {
-              type: 'object',
-              'ui:backstage': {
-                review: {
-                  explode: true,
-                },
-              },
-              properties: {
-                foo: {
-                  type: 'string',
-                },
-                bar: {
-                  type: 'string',
-                },
-              },
-            },
-          },
-        },
-        schema: {},
-        title: 'test',
-        uiSchema: {},
-      },
-    ];
-
-    const [key, value] = Object.entries(formState)[0];
-    const parsedSchema = new JSONSchema(schemas[0].mergedSchema);
-
-    const result = flattenObject(value, key, parsedSchema, formState);
-
-    expect(result).toEqual([
-      ['foo', 'value1'],
-      ['bar', 'value2'],
-    ]);
+  it('should return the last part of a nested key', () => {
+    expect(getLastKey('parent/child')).toBe('child');
   });
 
-  it('should recurse into a nested object', () => {
-    const formState = {
-      name: {
-        foo: 'value1',
-        bar: 'value2',
-        example: {
-          test: 'value3',
-        },
-      },
-    };
-    const schemas: ParsedTemplateSchema[] = [
-      {
-        mergedSchema: {
-          type: 'object',
-          properties: {
-            name: {
-              type: 'object',
-              'ui:backstage': {
-                review: {
-                  explode: true,
-                },
-              },
-              properties: {
-                foo: {
-                  type: 'string',
-                },
-                bar: {
-                  type: 'string',
-                },
-                example: {
-                  type: 'object',
-                  'ui:backstage': {
-                    review: {
-                      explode: true,
-                    },
-                  },
-                  properties: {
-                    test: {
-                      type: 'string',
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-        schema: {},
-        title: 'test',
-        uiSchema: {},
-      },
-    ];
+  it('should return the last part of a deeply nested key', () => {
+    expect(getLastKey('grandparent/parent/child')).toBe('child');
+  });
 
-    const [key, value] = Object.entries(formState)[0];
-    const parsedSchema = new JSONSchema(schemas[0].mergedSchema);
+  it('should handle keys with trailing slash', () => {
+    expect(getLastKey('parent/child/')).toBe('');
+  });
 
-    const result = flattenObject(value, key, parsedSchema, formState);
+  it('should handle empty string', () => {
+    expect(getLastKey('')).toBe('');
+  });
 
-    expect(result).toEqual([
-      ['foo', 'value1'],
-      ['bar', 'value2'],
-      ['test', 'value3'],
-    ]);
+  it('should handle keys with multiple consecutive slashes', () => {
+    expect(getLastKey('parent//child')).toBe('child');
+  });
+
+  it('should handle keys with only slashes', () => {
+    expect(getLastKey('////')).toBe('');
+  });
+
+  it('should handle keys with spaces', () => {
+    expect(getLastKey('parent/child with spaces')).toBe('child with spaces');
+  });
+
+  it('should handle keys with special characters', () => {
+    expect(getLastKey('parent/child@!#$%^&*()')).toBe('child@!#$%^&*()');
   });
 });
diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/util.ts b/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
index e040b851d3..52503bedfd 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
@@ -16,64 +16,13 @@
  */
 
 import { JsonObject, JsonValue } from '@backstage/types';
-import { Draft07 as JSONSchema } from 'json-schema-library';
-import { ParsedTemplateSchema } from '../../hooks';
 
 export function isJsonObject(value?: JsonValue): value is JsonObject {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
-export function processEntry(
-  key: string,
-  value: JsonValue | undefined,
-  schema: ParsedTemplateSchema,
-  formState: JsonObject,
-): [string, JsonValue | undefined][] {
-  const parsedSchema = new JSONSchema(schema.mergedSchema);
-  const definitionInSchema = parsedSchema.getSchema({
-    pointer: `#/${key}`,
-    data: formState,
-  });
-
-  if (definitionInSchema) {
-    const backstageReviewOptions = definitionInSchema['ui:backstage']?.review;
-    if (backstageReviewOptions) {
-      if (backstageReviewOptions.mask) {
-        return [[getLastKey(key), backstageReviewOptions.mask]];
-      }
-      if (backstageReviewOptions.show === false) {
-        return [];
-      }
-    }
-
-    if (isJsonObject(value)) {
-      // Process nested objects
-      return Object.entries(value).flatMap(([nestedKey, nestedValue]) =>
-        processEntry(`${key}/${nestedKey}`, nestedValue, schema, formState),
-      );
-    }
-
-    if (definitionInSchema['ui:widget'] === 'password') {
-      return [[getLastKey(key), '******']];
-    }
-
-    if (definitionInSchema.enum && definitionInSchema.enumNames) {
-      return [
-        [
-          getLastKey(key),
-          definitionInSchema.enumNames[
-            definitionInSchema.enum.indexOf(value)
-          ] || value,
-        ],
-      ];
-    }
-  }
-
-  return [[getLastKey(key), value]];
+  return typeof value === 'object' && !Array.isArray(value);
 }
 
 // Helper function to get the last part of the key
-function getLastKey(key: string): string {
+export function getLastKey(key: string): string {
   const parts = key.split('/');
   return parts[parts.length - 1];
 }

From ba67e2884712d3036c10e3d9b19c126305a5d16d Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Sun, 14 Jul 2024 15:37:16 -0400
Subject: [PATCH 051/225] Remove comment

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 plugins/scaffolder-react/src/next/components/ReviewState/util.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/scaffolder-react/src/next/components/ReviewState/util.ts b/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
index 52503bedfd..49c3b30e7a 100644
--- a/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/util.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 /*
  * Copyright 2022 The Backstage Authors
  *

From e6e293ca30256d8d7641f5c9ff27e29b76f149de Mon Sep 17 00:00:00 2001
From: Benjamin Janssens <benji.janssens@gmail.com>
Date: Mon, 15 Jul 2024 10:22:21 +0200
Subject: [PATCH 052/225] chore: extract BaseRepoUrlPickerProps

Signed-off-by: Benjamin Janssens <benji.janssens@gmail.com>
---
 .../fields/RepoUrlPicker/AzureRepoPicker.tsx    | 15 +++++++--------
 .../RepoUrlPicker/BitbucketRepoPicker.tsx       | 17 ++++++++---------
 .../fields/RepoUrlPicker/GerritRepoPicker.tsx   |  8 ++------
 .../fields/RepoUrlPicker/GiteaRepoPicker.tsx    | 15 +++++++--------
 .../fields/RepoUrlPicker/GithubRepoPicker.tsx   | 13 ++++++-------
 .../fields/RepoUrlPicker/GitlabRepoPicker.tsx   | 15 +++++++--------
 .../components/fields/RepoUrlPicker/types.ts    |  6 ++++++
 7 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/AzureRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/AzureRepoPicker.tsx
index 833a0849fb..48fcb4f6af 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/AzureRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/AzureRepoPicker.tsx
@@ -19,16 +19,15 @@ import FormControl from '@material-ui/core/FormControl';
 import FormHelperText from '@material-ui/core/FormHelperText';
 import Input from '@material-ui/core/Input';
 import InputLabel from '@material-ui/core/InputLabel';
-import { RepoUrlPickerState } from './types';
+import { BaseRepoUrlPickerProps } from './types';
 import { Select, SelectItem } from '@backstage/core-components';
 
-export const AzureRepoPicker = (props: {
-  allowedOrganizations?: string[];
-  allowedProject?: string[];
-  rawErrors: string[];
-  state: RepoUrlPickerState;
-  onChange: (state: RepoUrlPickerState) => void;
-}) => {
+export const AzureRepoPicker = (
+  props: BaseRepoUrlPickerProps<{
+    allowedOrganizations?: string[];
+    allowedProject?: string[];
+  }>,
+) => {
   const {
     allowedOrganizations = [],
     allowedProject = [],
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
index 10d4a6e6c3..5d627e9512 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
@@ -17,7 +17,7 @@ import React, { useEffect, useState } from 'react';
 import FormControl from '@material-ui/core/FormControl';
 import FormHelperText from '@material-ui/core/FormHelperText';
 import { Select, SelectItem } from '@backstage/core-components';
-import { RepoUrlPickerState } from './types';
+import { BaseRepoUrlPickerProps } from './types';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import TextField from '@material-ui/core/TextField';
 import useDebounce from 'react-use/esm/useDebounce';
@@ -33,14 +33,13 @@ import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
  * @param allowedProjects - Allowed projects for the Bitbucket cloud repository
  *
  */
-export const BitbucketRepoPicker = (props: {
-  allowedOwners?: string[];
-  allowedProjects?: string[];
-  onChange: (state: RepoUrlPickerState) => void;
-  state: RepoUrlPickerState;
-  rawErrors: string[];
-  accessToken?: string;
-}) => {
+export const BitbucketRepoPicker = (
+  props: BaseRepoUrlPickerProps<{
+    allowedOwners?: string[];
+    allowedProjects?: string[];
+    accessToken?: string;
+  }>,
+) => {
   const {
     allowedOwners = [],
     allowedProjects = [],
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.tsx
index 13af966c25..1b13c5eb29 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GerritRepoPicker.tsx
@@ -18,13 +18,9 @@ import FormControl from '@material-ui/core/FormControl';
 import FormHelperText from '@material-ui/core/FormHelperText';
 import Input from '@material-ui/core/Input';
 import InputLabel from '@material-ui/core/InputLabel';
-import { RepoUrlPickerState } from './types';
+import { BaseRepoUrlPickerProps } from './types';
 
-export const GerritRepoPicker = (props: {
-  onChange: (state: RepoUrlPickerState) => void;
-  state: RepoUrlPickerState;
-  rawErrors: string[];
-}) => {
+export const GerritRepoPicker = (props: BaseRepoUrlPickerProps) => {
   const { onChange, rawErrors, state } = props;
   const { workspace, owner } = state;
   return (
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GiteaRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GiteaRepoPicker.tsx
index 566a2732e3..9fb3af211f 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GiteaRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GiteaRepoPicker.tsx
@@ -19,15 +19,14 @@ import FormHelperText from '@material-ui/core/FormHelperText';
 import Input from '@material-ui/core/Input';
 import InputLabel from '@material-ui/core/InputLabel';
 import { Select, SelectItem } from '@backstage/core-components';
-import { RepoUrlPickerState } from './types';
+import { BaseRepoUrlPickerProps } from './types';
 
-export const GiteaRepoPicker = (props: {
-  allowedOwners?: string[];
-  allowedRepos?: string[];
-  state: RepoUrlPickerState;
-  onChange: (state: RepoUrlPickerState) => void;
-  rawErrors: string[];
-}) => {
+export const GiteaRepoPicker = (
+  props: BaseRepoUrlPickerProps<{
+    allowedOwners?: string[];
+    allowedRepos?: string[];
+  }>,
+) => {
   const { allowedOwners = [], state, onChange, rawErrors } = props;
   const ownerItems: SelectItem[] = allowedOwners
     ? allowedOwners.map(i => ({ label: i, value: i }))
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GithubRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GithubRepoPicker.tsx
index ec59d89ef8..5d46dc4333 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GithubRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GithubRepoPicker.tsx
@@ -19,14 +19,13 @@ import FormHelperText from '@material-ui/core/FormHelperText';
 import Input from '@material-ui/core/Input';
 import InputLabel from '@material-ui/core/InputLabel';
 import { Select, SelectItem } from '@backstage/core-components';
-import { RepoUrlPickerState } from './types';
+import { BaseRepoUrlPickerProps } from './types';
 
-export const GithubRepoPicker = (props: {
-  allowedOwners?: string[];
-  rawErrors: string[];
-  state: RepoUrlPickerState;
-  onChange: (state: RepoUrlPickerState) => void;
-}) => {
+export const GithubRepoPicker = (
+  props: BaseRepoUrlPickerProps<{
+    allowedOwners?: string[];
+  }>,
+) => {
   const { allowedOwners = [], rawErrors, state, onChange } = props;
   const ownerItems: SelectItem[] = allowedOwners
     ? allowedOwners.map(i => ({ label: i, value: i }))
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
index fbcc13c846..12ae37bf15 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
@@ -19,15 +19,14 @@ import FormHelperText from '@material-ui/core/FormHelperText';
 import Input from '@material-ui/core/Input';
 import InputLabel from '@material-ui/core/InputLabel';
 import { Select, SelectItem } from '@backstage/core-components';
-import { RepoUrlPickerState } from './types';
+import { BaseRepoUrlPickerProps } from './types';
 
-export const GitlabRepoPicker = (props: {
-  allowedOwners?: string[];
-  allowedRepos?: string[];
-  state: RepoUrlPickerState;
-  onChange: (state: RepoUrlPickerState) => void;
-  rawErrors: string[];
-}) => {
+export const GitlabRepoPicker = (
+  props: BaseRepoUrlPickerProps<{
+    allowedOwners?: string[];
+    allowedRepos?: string[];
+  }>,
+) => {
   const { allowedOwners = [], state, onChange, rawErrors } = props;
   const ownerItems: SelectItem[] = allowedOwners
     ? allowedOwners.map(i => ({ label: i, value: i }))
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts b/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
index 1430b10b84..9489901d61 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/types.ts
@@ -22,3 +22,9 @@ export interface RepoUrlPickerState {
   project?: string;
   availableRepos?: string[];
 }
+
+export type BaseRepoUrlPickerProps<T extends {} = {}> = T & {
+  onChange: (state: RepoUrlPickerState) => void;
+  state: RepoUrlPickerState;
+  rawErrors: string[];
+};

From 6b8bab93beaee731a7db18b818cb13af21e848c3 Mon Sep 17 00:00:00 2001
From: Benjamin Janssens <benji.janssens@gmail.com>
Date: Mon, 15 Jul 2024 10:40:19 +0200
Subject: [PATCH 053/225] refactor: use useCallback for autocompletion updates
 in BitbucketRepoPicker

Signed-off-by: Benjamin Janssens <benji.janssens@gmail.com>
---
 .../RepoUrlPicker/BitbucketRepoPicker.tsx     | 153 +++++++++---------
 1 file changed, 75 insertions(+), 78 deletions(-)

diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
index 5d627e9512..0b7ee49525 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import FormControl from '@material-ui/core/FormControl';
 import FormHelperText from '@material-ui/core/FormHelperText';
 import { Select, SelectItem } from '@backstage/core-components';
@@ -68,93 +68,90 @@ export const BitbucketRepoPicker = (
   const [availableProjects, setAvailableProjects] = useState<string[]>([]);
 
   // Update available workspaces when client is available
-  useDebounce(
-    () => {
-      const updateAvailableWorkspaces = async () => {
-        if (
-          host === 'bitbucket.org' &&
-          accessToken &&
-          scaffolderApi.autocomplete
-        ) {
-          const { results } = await scaffolderApi.autocomplete({
-            token: accessToken,
-            resource: 'workspaces',
-            context: {},
-            provider: 'bitbucket-cloud',
-          });
+  const updateAvailableWorkspaces = useCallback(() => {
+    if (
+      !scaffolderApi.autocomplete ||
+      !accessToken ||
+      host !== 'bitbucket.org'
+    ) {
+      setAvailableWorkspaces([]);
+      return;
+    }
 
-          setAvailableWorkspaces(results.map(r => r.title));
-        } else {
-          setAvailableWorkspaces([]);
-        }
-      };
+    scaffolderApi
+      .autocomplete({
+        token: accessToken,
+        resource: 'workspaces',
+        provider: 'bitbucket-cloud',
+      })
+      .then(({ results }) => {
+        setAvailableWorkspaces(results.map(r => r.title));
+      })
+      .catch(() => {
+        setAvailableWorkspaces([]);
+      });
+  }, [scaffolderApi, accessToken, host]);
 
-      updateAvailableWorkspaces().catch(() => setAvailableWorkspaces([]));
-    },
-    500,
-    [host, accessToken],
-  );
+  useDebounce(updateAvailableWorkspaces, 500, [updateAvailableWorkspaces]);
 
   // Update available projects when client is available and workspace changes
-  useDebounce(
-    () => {
-      const updateAvailableProjects = async () => {
-        if (
-          host === 'bitbucket.org' &&
-          accessToken &&
-          workspace &&
-          scaffolderApi.autocomplete
-        ) {
-          const { results } = await scaffolderApi.autocomplete({
-            token: accessToken,
-            resource: 'projects',
-            context: { workspace },
-            provider: 'bitbucket-cloud',
-          });
+  const updateAvailableProjects = useCallback(() => {
+    if (
+      !scaffolderApi.autocomplete ||
+      !accessToken ||
+      host !== 'bitbucket.org' ||
+      !workspace
+    ) {
+      setAvailableProjects([]);
+      return;
+    }
 
-          setAvailableProjects(results.map(r => r.title));
-        } else {
-          setAvailableProjects([]);
-        }
-      };
+    scaffolderApi
+      .autocomplete({
+        token: accessToken,
+        resource: 'projects',
+        context: { workspace },
+        provider: 'bitbucket-cloud',
+      })
+      .then(({ results }) => {
+        setAvailableProjects(results.map(r => r.title));
+      })
+      .catch(() => {
+        setAvailableProjects([]);
+      });
+  }, [scaffolderApi, accessToken, host, workspace]);
 
-      updateAvailableProjects().catch(() => setAvailableProjects([]));
-    },
-    500,
-    [host, accessToken, workspace],
-  );
+  useDebounce(updateAvailableProjects, 500, [updateAvailableProjects]);
 
   // Update available repositories when client is available and workspace or project changes
-  useDebounce(
-    () => {
-      const updateAvailableRepositories = async () => {
-        if (
-          host === 'bitbucket.org' &&
-          accessToken &&
-          workspace &&
-          project &&
-          scaffolderApi.autocomplete
-        ) {
-          const { results } = await scaffolderApi.autocomplete({
-            token: accessToken,
-            resource: 'repositories',
-            context: { workspace, project },
-            provider: 'bitbucket-cloud',
-          });
+  const updateAvailableRepositories = useCallback(() => {
+    if (
+      !scaffolderApi.autocomplete ||
+      !accessToken ||
+      host !== 'bitbucket.org' ||
+      !workspace ||
+      !project
+    ) {
+      onChange({ availableRepos: [] });
+      return;
+    }
 
-          onChange({ availableRepos: results.map(r => r.title) });
-        } else {
-          onChange({ availableRepos: [] });
-        }
-      };
+    scaffolderApi
+      .autocomplete({
+        token: accessToken,
+        resource: 'repositories',
+        context: { workspace, project },
+        provider: 'bitbucket-cloud',
+      })
+      .then(({ results }) => {
+        onChange({ availableRepos: results.map(r => r.title) });
+      })
+      .catch(() => {
+        onChange({ availableRepos: [] });
+      });
+  }, [scaffolderApi, accessToken, host, workspace, project, onChange]);
 
-      updateAvailableRepositories().catch(() =>
-        onChange({ availableRepos: [] }),
-      );
-    },
-    500,
-    [host, accessToken, workspace, project],
-  );
+  useDebounce(updateAvailableRepositories, 500, [updateAvailableRepositories]);
 
   return (
     <>

From 7f153f94c1c3d1849e418109e097b03914941113 Mon Sep 17 00:00:00 2001
From: Benjamin Janssens <benji.janssens@gmail.com>
Date: Mon, 15 Jul 2024 10:44:22 +0200
Subject: [PATCH 054/225] test: simplify checking for the secret in the
 document; remove SecretsComponent from test that didn't use it

Signed-off-by: Benjamin Janssens <benji.janssens@gmail.com>
---
 .../RepoUrlPicker/RepoUrlPicker.test.tsx      | 47 ++++++-------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
index 002652cfab..f0e47a2504 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
@@ -214,13 +214,14 @@ describe('RepoUrlPicker', () => {
 
   describe('requestUserCredentials', () => {
     it('should call the scmAuthApi with the correct params', async () => {
+      const secretsKey = 'testKey';
+
       const SecretsComponent = () => {
         const { secrets } = useTemplateSecrets();
-        return (
-          <div data-testid="current-secrets">{JSON.stringify({ secrets })}</div>
-        );
+        const secret = secrets[secretsKey];
+        return secret ? <div>{secret}</div> : null;
       };
-      const { getByTestId } = await renderInTestApp(
+      const { getByText } = await renderInTestApp(
         <TestApiProvider
           apis={[
             [scmIntegrationsApiRef, mockIntegrationsApi],
@@ -236,7 +237,7 @@ describe('RepoUrlPicker', () => {
                 'ui:field': 'RepoUrlPicker',
                 'ui:options': {
                   requestUserCredentials: {
-                    secretsKey: 'testKey',
+                    secretsKey,
                     additionalScopes: { github: ['workflow'] },
                   },
                 },
@@ -265,21 +266,9 @@ describe('RepoUrlPicker', () => {
         },
       });
 
-      const currentSecrets = JSON.parse(
-        getByTestId('current-secrets').textContent!,
-      );
-
-      expect(currentSecrets).toEqual({
-        secrets: { testKey: 'abc123' },
-      });
+      expect(getByText('abc123')).toBeInTheDocument();
     });
     it('should call the scmAuthApi with the correct params if workspace is nested', async () => {
-      const SecretsComponent = () => {
-        const { secrets } = useTemplateSecrets();
-        return (
-          <div data-testid="current-secrets">{JSON.stringify({ secrets })}</div>
-        );
-      };
       await renderInTestApp(
         <TestApiProvider
           apis={[
@@ -305,7 +294,6 @@ describe('RepoUrlPicker', () => {
                 RepoUrlPicker: RepoUrlPicker as ScaffolderRJSFField<string>,
               }}
             />
-            <SecretsComponent />
           </SecretsContextProvider>
         </TestApiProvider>,
       );
@@ -324,13 +312,14 @@ describe('RepoUrlPicker', () => {
     });
 
     it('should not call the scmAuthApi if secret is available in the state', async () => {
+      const secretsKey = 'testKey';
+
       const SecretsComponent = () => {
         const { secrets } = useTemplateSecrets();
-        return (
-          <div data-testid="current-secrets">{JSON.stringify({ secrets })}</div>
-        );
+        const secret = secrets[secretsKey];
+        return secret ? <div>{secret}</div> : null;
       };
-      const { getByTestId } = await renderInTestApp(
+      const { getByText } = await renderInTestApp(
         <TestApiProvider
           apis={[
             [scmIntegrationsApiRef, mockIntegrationsApi],
@@ -338,7 +327,7 @@ describe('RepoUrlPicker', () => {
             [scaffolderApiRef, mockScaffolderApi],
           ]}
         >
-          <SecretsContextProvider initialSecrets={{ testKey: 'abc123' }}>
+          <SecretsContextProvider initialSecrets={{ [secretsKey]: 'abc123' }}>
             <Form
               validator={validator}
               schema={{ type: 'string' }}
@@ -346,7 +335,7 @@ describe('RepoUrlPicker', () => {
                 'ui:field': 'RepoUrlPicker',
                 'ui:options': {
                   requestUserCredentials: {
-                    secretsKey: 'testKey',
+                    secretsKey,
                     additionalScopes: { github: ['workflow'] },
                   },
                 },
@@ -368,13 +357,7 @@ describe('RepoUrlPicker', () => {
       // as we already have a secret in the state, getCredentials should not be called again.
       expect(mockScmAuthApi.getCredentials).toHaveBeenCalledTimes(0);
 
-      const currentSecrets = JSON.parse(
-        getByTestId('current-secrets').textContent!,
-      );
-
-      expect(currentSecrets).toEqual({
-        secrets: { testKey: 'abc123' },
-      });
+      expect(getByText('abc123')).toBeInTheDocument();
     });
   });
 });

From bbd9f56c764b3fc22c79a279bca48f70d6c83dea Mon Sep 17 00:00:00 2001
From: Benjamin Janssens <benji.janssens@gmail.com>
Date: Mon, 15 Jul 2024 10:49:56 +0200
Subject: [PATCH 055/225] chore: add changeset

Signed-off-by: Benjamin Janssens <benji.janssens@gmail.com>
---
 .changeset/spotty-planets-accept.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/spotty-planets-accept.md

diff --git a/.changeset/spotty-planets-accept.md b/.changeset/spotty-planets-accept.md
new file mode 100644
index 0000000000..db262dd8b5
--- /dev/null
+++ b/.changeset/spotty-planets-accept.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Cleaned up codebase

From 9a5e7f1c36934b6eca39c8c13fbc35bcc43fefb2 Mon Sep 17 00:00:00 2001
From: Benjamin Janssens <benji.janssens@gmail.com>
Date: Mon, 15 Jul 2024 10:51:24 +0200
Subject: [PATCH 056/225] chore: update changeset

Signed-off-by: Benjamin Janssens <benji.janssens@gmail.com>
---
 .changeset/spotty-planets-accept.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/spotty-planets-accept.md b/.changeset/spotty-planets-accept.md
index db262dd8b5..7342f89bd1 100644
--- a/.changeset/spotty-planets-accept.md
+++ b/.changeset/spotty-planets-accept.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder': patch
 ---
 
-Cleaned up codebase
+Cleaned up codebase of RepoUrlPicker

From c4a4a69912e004dbfa622d9f2107410af8fffd34 Mon Sep 17 00:00:00 2001
From: Benjamin Janssens <benji.janssens@gmail.com>
Date: Mon, 15 Jul 2024 11:15:21 +0200
Subject: [PATCH 057/225] test: fix BitbucketRepoPicker tests

Signed-off-by: Benjamin Janssens <benji.janssens@gmail.com>
---
 .../fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
index 2ae89233ff..570c5bd664 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
@@ -27,9 +27,11 @@ import { act } from 'react-dom/test-utils';
 
 describe('BitbucketRepoPicker', () => {
   const scaffolderApiMock: Partial<ScaffolderApi> = {
-    autocomplete: jest.fn().mockImplementation(opts => ({
-      results: [{ title: `${opts.resource}_example` }],
-    })),
+    autocomplete: jest.fn().mockImplementation(opts =>
+      Promise.resolve({
+        results: [{ title: `${opts.resource}_example` }],
+      }),
+    ),
   };
 
   it('renders a select if there is a list of allowed owners', async () => {

From a5bcb9c4d59af4c50bff0160bec566e49753a3a0 Mon Sep 17 00:00:00 2001
From: Niall Thomson <thomson.niall@gmail.com>
Date: Mon, 15 Jul 2024 05:58:02 -0600
Subject: [PATCH 058/225] Update
 plugins/catalog-backend-module-aws/src/awsOrganization/config.ts

Co-authored-by: Vincenzo Scamporlino <vincenzos@spotify.com>
Signed-off-by: Niall Thomson <thomson.niall@gmail.com>
---
 plugins/catalog-backend-module-aws/src/awsOrganization/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/catalog-backend-module-aws/src/awsOrganization/config.ts b/plugins/catalog-backend-module-aws/src/awsOrganization/config.ts
index ff00af48e4..ea16394e0a 100644
--- a/plugins/catalog-backend-module-aws/src/awsOrganization/config.ts
+++ b/plugins/catalog-backend-module-aws/src/awsOrganization/config.ts
@@ -22,6 +22,7 @@ import { Config } from '@backstage/config';
 export type AwsOrganizationProviderConfig = {
   /**
    * The role to assume for the processor.
+   * @deprecated Use `accountId` instead.
    */
   roleArn?: string;
 

From 24a98c940b384efa245d044e07fae5ac37bc2ee7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 08:08:47 +0000
Subject: [PATCH 059/225] Bump ws from 8.8.1 to 8.18.0 in /storybook

Bumps [ws](https://github.com/websockets/ws) from 8.8.1 to 8.18.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.8.1...8.18.0)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 storybook/yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index 1702d6f4cc..28bbe4b144 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -11912,17 +11912,17 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.2.3":
-  version: 8.8.1
-  resolution: "ws@npm:8.8.1"
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
   peerDependencies:
     bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
+    utf-8-validate: ">=5.0.2"
   peerDependenciesMeta:
     bufferutil:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 2152cf862cae0693f3775bc688a6afb2e989d19d626d215e70f5fcd8eb55b1c3b0d3a6a4052905ec320e2d7734e20aeedbf9744496d62f15a26ad79cf4cf7dae
+  checksum: 91d4d35bc99ff6df483bdf029b9ea4bfd7af1f16fc91231a96777a63d263e1eabf486e13a2353970efc534f9faa43bdbf9ee76525af22f4752cbc5ebda333975
   languageName: node
   linkType: hard
 

From 392b26a0ed848730e5c332136d391a6726763d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Pi=C4=85tkiewicz?= <piatkiewicz.piotr@gmail.com>
Date: Tue, 16 Jul 2024 15:17:07 +0200
Subject: [PATCH 060/225] Update writing-custom-actions.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Piotr Piątkiewicz <piatkiewicz.piotr@gmail.com>
---
 docs/features/software-templates/writing-custom-actions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features/software-templates/writing-custom-actions.md b/docs/features/software-templates/writing-custom-actions.md
index 6c1ea573db..98457d2e8d 100644
--- a/docs/features/software-templates/writing-custom-actions.md
+++ b/docs/features/software-templates/writing-custom-actions.md
@@ -195,7 +195,7 @@ const scaffolderModuleCustomExtensions = createBackendModule({
 const backend = createBackend();
 backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
 /* highlight-add-next-line */
-backend.add(scaffolderModuleCustomExtensions());
+backend.add(scaffolderModuleCustomExtensions);
 ```
 
 If your custom action requires core services such as `config` or `cache` they can be imported in the dependencies and passed to the custom action function.

From d5e567efff47e2756c6e17a85df9ea52812c4cf0 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 16 Jul 2024 17:27:24 +0200
Subject: [PATCH 061/225] docs: update threat model and auth docs to mention
 public entry point

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 docs/auth/index.md            | 7 +------
 docs/overview/threat-model.md | 2 ++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/docs/auth/index.md b/docs/auth/index.md
index 4a0e56a36e..5188d7e2a4 100644
--- a/docs/auth/index.md
+++ b/docs/auth/index.md
@@ -12,12 +12,7 @@ access to external resources.
 
 :::note Note
 
-Identity management and the Sign-In page in Backstage is NOT a method for blocking
-access for unauthorized users. The identity system only serves to provide a personalized
-experience and access to a Backstage Identity Token, which can be passed to backend plugins.
-This also means that your Backstage backend APIs are by default unauthenticated.
-Thus, if your Backstage instance is exposed to the Internet, anyone can access
-information in the Backstage. You can learn more [here](../overview/threat-model.md#integrator-responsibilities).
+Identity management and the Sign-In page in Backstage will only block external access when using the new backend system, without setting `backend.auth.dangerouslyDisableDefaultAuthPolicy` in configuration. Even so, the frontend bundle is not protected from external access, protecting it requires the use of the [experimental public entry point](https://backstage.io/docs/tutorials/enable-public-entry/). You can learn more about this in the [Threat Model](../overview/threat-model.md#operator-responsibilities).
 
 :::
 
diff --git a/docs/overview/threat-model.md b/docs/overview/threat-model.md
index da97f3fc83..c0e2d61e25 100644
--- a/docs/overview/threat-model.md
+++ b/docs/overview/threat-model.md
@@ -37,6 +37,8 @@ The operator is ultimately responsible for auditing usage of internal and extern
 
 The operator is also responsible for maintaining the resolved NPM dependencies of their Backstage project. This involves ensuring that `yarn.lock` receives updated versions of packages that have vulnerabilities, when those fixed versions are in range of what the Backstage packages request in their respective `package.json` files. This is commonly done by employing automated tooling such as [Dependabot](https://dependabot.com/), [Snyk](https://snyk.io/), and/or [Renovate](https://docs.renovatebot.com/) on your own repository. When fixed versions exist that are _not_ in range of what Backstage packages request, or when larger operations such as switching out an entire dependency for another one is required, maintainers collaborate with contributors to try to address those dependency declarations in the main project as soon as possible.
 
+The built-in protection against unauthorized access does not by default include protection of the frontend bundle. The frontend bundle includes all the code of your frontend plugins and code in minified form, as well as any other frontend resources like images, fonts, etc. If this is a concern, you can use the [experimental public entry point](https://backstage.io/docs/tutorials/enable-public-entry/) to create two separate frontend builds, where authenticated users only have access to the full one.
+
 ## Common Backend Configuration
 
 There are many common facilities that are configured centrally and available to all Backstage backend plugins. For example there is a `DatabaseManager` that provides access to a SQL database, `TaskScheduler` for scheduling long-running tasks, `Logger` as a general logging facility, and `UrlReader` for reading content from external sources. These are all configured either directly in code, or within the `backend` block of the static configuration. The appropriate care needs to be taken to ensure that any secrets remain confidential and no malicious configuration is injected.

From 7e13b7af04b24105619e34b17ea2b2547b1a6e12 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 16 Jul 2024 15:30:50 +0200
Subject: [PATCH 062/225] backend-common: deprecate remaining methods

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/nine-cherries-decide.md                 | 14 ++++++++++++++
 packages/backend-common/api-report.md              | 12 ++++++------
 .../src/compat/auth/createLegacyAuthAdapters.ts    |  1 +
 .../src/compat/cache/cacheToPluginCacheManager.ts  |  1 +
 .../backend-common/src/compat/legacy/legacy.ts     |  3 +++
 .../src/compat/logging/loggerToWinstonLogger.ts    |  5 ++++-
 6 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/nine-cherries-decide.md

diff --git a/.changeset/nine-cherries-decide.md b/.changeset/nine-cherries-decide.md
new file mode 100644
index 0000000000..b20c24aa85
--- /dev/null
+++ b/.changeset/nine-cherries-decide.md
@@ -0,0 +1,14 @@
+---
+'@backstage/backend-common': patch
+---
+
+The remaining exports in the package have now been deprecated:
+
+- `cacheToPluginCacheManager`
+- `createLegacyAuthAdapters`
+- `LegacyCreateRouter`
+- `legacyPlugin`
+- `loggerToWinstonLogger`
+- `makeLegacyPlugin`
+
+Users of these export should fully [migrate to the new backend system](https://backstage.io/docs/backend-system/building-backends/migrating).
diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index 52b661bcaf..23ed13b62c 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -129,7 +129,7 @@ export class CacheManager extends CacheManager_2 {}
 // @public @deprecated (undocumented)
 export type CacheManagerOptions = CacheManagerOptions_2;
 
-// @public
+// @public @deprecated
 export function cacheToPluginCacheManager(cache: CacheService): {
   getClient(options?: CacheServiceOptions): CacheService;
 };
@@ -142,7 +142,7 @@ export interface ContainerRunner {
   runContainer(opts: RunContainerOptions): Promise<void>;
 }
 
-// @public
+// @public @deprecated
 export function createLegacyAuthAdapters<
   TOptions extends {
     auth?: AuthService;
@@ -401,10 +401,10 @@ export type KubernetesContainerRunnerOptions = {
   timeoutMs?: number;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type LegacyCreateRouter<TEnv> = (deps: TEnv) => Promise<RequestHandler>;
 
-// @public
+// @public @deprecated
 export const legacyPlugin: (
   name: string,
   createRouterImport: Promise<{
@@ -447,13 +447,13 @@ export function loadBackendConfig(options: {
   watch?: boolean;
 }): Promise<Config>;
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export function loggerToWinstonLogger(
   logger: LoggerService,
   opts?: TransportStreamOptions,
 ): Logger;
 
-// @public
+// @public @deprecated
 export function makeLegacyPlugin<
   TEnv extends Record<string, unknown>,
   TEnvTransforms extends {
diff --git a/packages/backend-common/src/compat/auth/createLegacyAuthAdapters.ts b/packages/backend-common/src/compat/auth/createLegacyAuthAdapters.ts
index 0f591eac6c..15cd881649 100644
--- a/packages/backend-common/src/compat/auth/createLegacyAuthAdapters.ts
+++ b/packages/backend-common/src/compat/auth/createLegacyAuthAdapters.ts
@@ -292,6 +292,7 @@ export class UserInfoCompat implements UserInfoService {
 /**
  * An adapter that ensures presence of the auth and/or httpAuth services.
  * @public
+ * @deprecated Migrate to use the new backend system and auth services instead.
  */
 export function createLegacyAuthAdapters<
   TOptions extends {
diff --git a/packages/backend-common/src/compat/cache/cacheToPluginCacheManager.ts b/packages/backend-common/src/compat/cache/cacheToPluginCacheManager.ts
index 2654934804..2ae55b016f 100644
--- a/packages/backend-common/src/compat/cache/cacheToPluginCacheManager.ts
+++ b/packages/backend-common/src/compat/cache/cacheToPluginCacheManager.ts
@@ -24,6 +24,7 @@ import {
  * old-backend plugin cache manager.
  *
  * @public
+ * @deprecated Migrate to use the new CacheService instead.
  */
 export function cacheToPluginCacheManager(cache: CacheService): {
   getClient(options?: CacheServiceOptions): CacheService;
diff --git a/packages/backend-common/src/compat/legacy/legacy.ts b/packages/backend-common/src/compat/legacy/legacy.ts
index 57220a8430..c779daacd2 100644
--- a/packages/backend-common/src/compat/legacy/legacy.ts
+++ b/packages/backend-common/src/compat/legacy/legacy.ts
@@ -27,6 +27,7 @@ import { TokenManager } from '../../deprecated';
 
 /**
  * @public
+ * @deprecated Fully use the new backend system instead.
  */
 export type LegacyCreateRouter<TEnv> = (deps: TEnv) => Promise<RequestHandler>;
 
@@ -69,6 +70,7 @@ function wrapTokenManager(tokenManager: TokenManager, auth: AuthService) {
  * Creates a new custom plugin compatibility wrapper.
  *
  * @public
+ * @deprecated Fully use the new backend system instead.
  * @remarks
  *
  * Usually you can use {@link legacyPlugin} directly instead, but you might
@@ -128,6 +130,7 @@ export function makeLegacyPlugin<
  * register it with the http router based on the plugin id.
  *
  * @public
+ * @deprecated Fully use the new backend system instead.
  * @remarks
  *
  * This is intended to be used by plugin authors to ease the transition to the
diff --git a/packages/backend-common/src/compat/logging/loggerToWinstonLogger.ts b/packages/backend-common/src/compat/logging/loggerToWinstonLogger.ts
index 4ba88358d2..83871f48e3 100644
--- a/packages/backend-common/src/compat/logging/loggerToWinstonLogger.ts
+++ b/packages/backend-common/src/compat/logging/loggerToWinstonLogger.ts
@@ -53,7 +53,10 @@ class BackstageLoggerTransport extends Transport {
   }
 }
 
-/** @public */
+/**
+ * @public
+ * @deprecated Migrate to use the new LoggerService instead.
+ */
 export function loggerToWinstonLogger(
   logger: LoggerService,
   opts?: TransportStreamOptions,

From b3769f14b3f3fa767546d0d806e0a1967fc0a940 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 16 Jul 2024 18:37:01 +0200
Subject: [PATCH 063/225] changesets: enter prerelease

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/pre.json | 192 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)
 create mode 100644 .changeset/pre.json

diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 0000000000..be1b694c9e
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,192 @@
+{
+  "mode": "pre",
+  "tag": "next",
+  "initialVersions": {
+    "example-app": "0.2.99",
+    "@backstage/app-defaults": "1.5.8",
+    "example-app-next": "0.0.13",
+    "app-next-example-plugin": "0.0.13",
+    "example-backend": "0.0.28",
+    "@backstage/backend-app-api": "0.8.0",
+    "@backstage/backend-common": "0.23.3",
+    "@backstage/backend-defaults": "0.4.0",
+    "@backstage/backend-dev-utils": "0.1.4",
+    "@backstage/backend-dynamic-feature-service": "0.2.15",
+    "example-backend-legacy": "0.2.100",
+    "@backstage/backend-openapi-utils": "0.1.15",
+    "@backstage/backend-plugin-api": "0.7.0",
+    "@backstage/backend-tasks": "0.5.27",
+    "@backstage/backend-test-utils": "0.4.4",
+    "@backstage/catalog-client": "1.6.5",
+    "@backstage/catalog-model": "1.5.0",
+    "@backstage/cli": "0.26.11",
+    "@backstage/cli-common": "0.1.14",
+    "@backstage/cli-node": "0.2.7",
+    "@backstage/codemods": "0.1.49",
+    "@backstage/config": "1.2.0",
+    "@backstage/config-loader": "1.8.1",
+    "@backstage/core-app-api": "1.14.0",
+    "@backstage/core-compat-api": "0.2.7",
+    "@backstage/core-components": "0.14.9",
+    "@backstage/core-plugin-api": "1.9.3",
+    "@backstage/create-app": "0.5.17",
+    "@backstage/dev-utils": "1.0.35",
+    "e2e-test": "0.2.18",
+    "@backstage/e2e-test-utils": "0.1.1",
+    "@backstage/errors": "1.2.4",
+    "@backstage/eslint-plugin": "0.1.8",
+    "@backstage/frontend-app-api": "0.7.3",
+    "@backstage/frontend-plugin-api": "0.6.7",
+    "@backstage/frontend-test-utils": "0.1.10",
+    "@backstage/integration": "1.13.0",
+    "@backstage/integration-aws-node": "0.1.12",
+    "@backstage/integration-react": "1.1.29",
+    "@backstage/release-manifests": "0.0.11",
+    "@backstage/repo-tools": "0.9.4",
+    "@techdocs/cli": "1.8.16",
+    "techdocs-cli-embedded-app": "0.2.98",
+    "@backstage/test-utils": "1.5.8",
+    "@backstage/theme": "0.5.6",
+    "@backstage/types": "1.1.1",
+    "@backstage/version-bridge": "1.0.8",
+    "yarn-plugin-backstage": "0.0.1",
+    "@backstage/plugin-api-docs": "0.11.7",
+    "@backstage/plugin-api-docs-module-protoc-gen-doc": "0.1.7",
+    "@backstage/plugin-app-backend": "0.3.71",
+    "@backstage/plugin-app-node": "0.1.22",
+    "@backstage/plugin-app-visualizer": "0.1.8",
+    "@backstage/plugin-auth-backend": "0.22.9",
+    "@backstage/plugin-auth-backend-module-atlassian-provider": "0.2.3",
+    "@backstage/plugin-auth-backend-module-aws-alb-provider": "0.1.14",
+    "@backstage/plugin-auth-backend-module-azure-easyauth-provider": "0.1.5",
+    "@backstage/plugin-auth-backend-module-bitbucket-provider": "0.1.5",
+    "@backstage/plugin-auth-backend-module-cloudflare-access-provider": "0.1.5",
+    "@backstage/plugin-auth-backend-module-gcp-iap-provider": "0.2.17",
+    "@backstage/plugin-auth-backend-module-github-provider": "0.1.19",
+    "@backstage/plugin-auth-backend-module-gitlab-provider": "0.1.19",
+    "@backstage/plugin-auth-backend-module-google-provider": "0.1.19",
+    "@backstage/plugin-auth-backend-module-guest-provider": "0.1.8",
+    "@backstage/plugin-auth-backend-module-microsoft-provider": "0.1.17",
+    "@backstage/plugin-auth-backend-module-oauth2-provider": "0.2.3",
+    "@backstage/plugin-auth-backend-module-oauth2-proxy-provider": "0.1.15",
+    "@backstage/plugin-auth-backend-module-oidc-provider": "0.2.3",
+    "@backstage/plugin-auth-backend-module-okta-provider": "0.0.15",
+    "@backstage/plugin-auth-backend-module-onelogin-provider": "0.1.3",
+    "@backstage/plugin-auth-backend-module-pinniped-provider": "0.1.16",
+    "@backstage/plugin-auth-backend-module-vmware-cloud-provider": "0.2.3",
+    "@backstage/plugin-auth-node": "0.4.17",
+    "@backstage/plugin-auth-react": "0.1.4",
+    "@backstage/plugin-bitbucket-cloud-common": "0.2.21",
+    "@backstage/plugin-catalog": "1.21.1",
+    "@backstage/plugin-catalog-backend": "1.24.0",
+    "@backstage/plugin-catalog-backend-module-aws": "0.3.17",
+    "@backstage/plugin-catalog-backend-module-azure": "0.1.42",
+    "@backstage/plugin-catalog-backend-module-backstage-openapi": "0.2.5",
+    "@backstage/plugin-catalog-backend-module-bitbucket-cloud": "0.2.9",
+    "@backstage/plugin-catalog-backend-module-bitbucket-server": "0.1.36",
+    "@backstage/plugin-catalog-backend-module-gcp": "0.1.23",
+    "@backstage/plugin-catalog-backend-module-gerrit": "0.1.39",
+    "@backstage/plugin-catalog-backend-module-github": "0.6.5",
+    "@backstage/plugin-catalog-backend-module-github-org": "0.1.17",
+    "@backstage/plugin-catalog-backend-module-gitlab": "0.3.21",
+    "@backstage/plugin-catalog-backend-module-gitlab-org": "0.0.5",
+    "@backstage/plugin-catalog-backend-module-incremental-ingestion": "0.4.27",
+    "@backstage/plugin-catalog-backend-module-ldap": "0.7.0",
+    "@backstage/plugin-catalog-backend-module-logs": "0.0.1",
+    "@backstage/plugin-catalog-backend-module-msgraph": "0.5.30",
+    "@backstage/plugin-catalog-backend-module-openapi": "0.1.40",
+    "@backstage/plugin-catalog-backend-module-puppetdb": "0.1.28",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "0.1.20",
+    "@backstage/plugin-catalog-backend-module-unprocessed": "0.4.9",
+    "@backstage/plugin-catalog-common": "1.0.25",
+    "@backstage/plugin-catalog-graph": "0.4.7",
+    "@backstage/plugin-catalog-import": "0.12.1",
+    "@backstage/plugin-catalog-node": "1.12.4",
+    "@backstage/plugin-catalog-react": "1.12.2",
+    "@backstage/plugin-catalog-unprocessed-entities": "0.2.6",
+    "@backstage/plugin-catalog-unprocessed-entities-common": "0.0.3",
+    "@backstage/plugin-config-schema": "0.1.57",
+    "@backstage/plugin-devtools": "0.1.16",
+    "@backstage/plugin-devtools-backend": "0.3.8",
+    "@backstage/plugin-devtools-common": "0.1.11",
+    "@backstage/plugin-events-backend": "0.3.9",
+    "@backstage/plugin-events-backend-module-aws-sqs": "0.3.8",
+    "@backstage/plugin-events-backend-module-azure": "0.2.8",
+    "@backstage/plugin-events-backend-module-bitbucket-cloud": "0.2.8",
+    "@backstage/plugin-events-backend-module-gerrit": "0.2.8",
+    "@backstage/plugin-events-backend-module-github": "0.2.8",
+    "@backstage/plugin-events-backend-module-gitlab": "0.2.8",
+    "@backstage/plugin-events-backend-test-utils": "0.1.32",
+    "@backstage/plugin-events-node": "0.3.8",
+    "@internal/plugin-todo-list": "1.0.29",
+    "@internal/plugin-todo-list-backend": "1.0.29",
+    "@internal/plugin-todo-list-common": "1.0.20",
+    "@backstage/plugin-home": "0.7.7",
+    "@backstage/plugin-home-react": "0.1.15",
+    "@backstage/plugin-kubernetes": "0.11.12",
+    "@backstage/plugin-kubernetes-backend": "0.18.3",
+    "@backstage/plugin-kubernetes-cluster": "0.0.13",
+    "@backstage/plugin-kubernetes-common": "0.8.1",
+    "@backstage/plugin-kubernetes-node": "0.1.16",
+    "@backstage/plugin-kubernetes-react": "0.4.1",
+    "@backstage/plugin-notifications": "0.2.3",
+    "@backstage/plugin-notifications-backend": "0.3.3",
+    "@backstage/plugin-notifications-backend-module-email": "0.1.3",
+    "@backstage/plugin-notifications-common": "0.0.5",
+    "@backstage/plugin-notifications-node": "0.2.3",
+    "@backstage/plugin-org": "0.6.27",
+    "@backstage/plugin-org-react": "0.1.26",
+    "@backstage/plugin-permission-backend": "0.5.46",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "0.1.19",
+    "@backstage/plugin-permission-common": "0.8.0",
+    "@backstage/plugin-permission-node": "0.8.0",
+    "@backstage/plugin-permission-react": "0.4.24",
+    "@backstage/plugin-proxy-backend": "0.5.3",
+    "@backstage/plugin-scaffolder": "1.23.0",
+    "@backstage/plugin-scaffolder-backend": "1.23.0",
+    "@backstage/plugin-scaffolder-backend-module-azure": "0.1.14",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket": "0.2.12",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "0.1.12",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "0.1.12",
+    "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown": "0.2.23",
+    "@backstage/plugin-scaffolder-backend-module-cookiecutter": "0.2.46",
+    "@backstage/plugin-scaffolder-backend-module-gcp": "0.1.0",
+    "@backstage/plugin-scaffolder-backend-module-gerrit": "0.1.14",
+    "@backstage/plugin-scaffolder-backend-module-gitea": "0.1.12",
+    "@backstage/plugin-scaffolder-backend-module-github": "0.4.0",
+    "@backstage/plugin-scaffolder-backend-module-gitlab": "0.4.4",
+    "@backstage/plugin-scaffolder-backend-module-notifications": "0.0.5",
+    "@backstage/plugin-scaffolder-backend-module-rails": "0.4.39",
+    "@backstage/plugin-scaffolder-backend-module-sentry": "0.1.30",
+    "@backstage/plugin-scaffolder-backend-module-yeoman": "0.3.6",
+    "@backstage/plugin-scaffolder-common": "1.5.4",
+    "@backstage/plugin-scaffolder-node": "0.4.8",
+    "@backstage/plugin-scaffolder-node-test-utils": "0.1.9",
+    "@backstage/plugin-scaffolder-react": "1.10.0",
+    "@backstage/plugin-search": "1.4.14",
+    "@backstage/plugin-search-backend": "1.5.14",
+    "@backstage/plugin-search-backend-module-catalog": "0.1.28",
+    "@backstage/plugin-search-backend-module-elasticsearch": "1.5.3",
+    "@backstage/plugin-search-backend-module-explore": "0.1.28",
+    "@backstage/plugin-search-backend-module-pg": "0.5.32",
+    "@backstage/plugin-search-backend-module-stack-overflow-collator": "0.1.15",
+    "@backstage/plugin-search-backend-module-techdocs": "0.1.27",
+    "@backstage/plugin-search-backend-node": "1.2.27",
+    "@backstage/plugin-search-common": "1.2.13",
+    "@backstage/plugin-search-react": "1.7.13",
+    "@backstage/plugin-signals": "0.0.8",
+    "@backstage/plugin-signals-backend": "0.1.8",
+    "@backstage/plugin-signals-node": "0.1.8",
+    "@backstage/plugin-signals-react": "0.0.4",
+    "@backstage/plugin-techdocs": "1.10.7",
+    "@backstage/plugin-techdocs-addons-test-utils": "1.0.35",
+    "@backstage/plugin-techdocs-backend": "1.10.9",
+    "@backstage/plugin-techdocs-module-addons-contrib": "1.1.12",
+    "@backstage/plugin-techdocs-node": "1.12.8",
+    "@backstage/plugin-techdocs-react": "1.2.6",
+    "@backstage/plugin-user-settings": "0.8.9",
+    "@backstage/plugin-user-settings-backend": "0.2.21",
+    "@backstage/plugin-user-settings-common": "0.0.1"
+  },
+  "changesets": []
+}

From 669d742d38359fed15ab03bad494ed73e3e3c7ce Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 16 Jul 2024 19:32:32 +0200
Subject: [PATCH 064/225] create-app: remove unnecessary yarn.lock seeds

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/create-app/seed-yarn.lock | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/create-app/seed-yarn.lock b/packages/create-app/seed-yarn.lock
index b09a0ce1a7..00a86105cc 100644
--- a/packages/create-app/seed-yarn.lock
+++ b/packages/create-app/seed-yarn.lock
@@ -16,13 +16,3 @@
 // package: the name of the package, e.g. @testing-library/react
 // query: the version query to pin the version for, e.g. ^14.0.0
 // version: the version to pin to, must be in range of the query, e.g. 14.11.0
-
-ajv@^8.0.0, ajv@^8.10.0, ajv@^8.11.0, ajv@^8.12.0, ajv@^8.14.0, ajv@^8.6.0, ajv@^8.6.3, ajv@^8.8.2, ajv@^8.9.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.14.0.tgz#f514ddfd4756abb200e1704414963620a625ebbb"
-  integrity sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==
-
-"@mui/material@^5.12.2":
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.16.1.tgz#6fcef9b5709df5864cf0b0bc0ea7b453a9d9e420"
-  integrity sha512-BGTgJRb0d/hX9tus5CEb6N/Fo8pE4tYA+s9r4/S0PCrtZ3urCLXlTH4qrAvggQbiF1cYRAbHCkVHoQ+4Pdxl+w==

From 4670f06f72877aa20faf7f24021a977b22598754 Mon Sep 17 00:00:00 2001
From: Matt Benson <gudnabrsam@gmail.com>
Date: Wed, 6 Mar 2024 17:31:38 -0600
Subject: [PATCH 065/225] support ajv-errors for scaffolder validation

Signed-off-by: Matt Benson <gudnabrsam@gmail.com>
---
 .changeset/modern-parrots-protect.md          |  5 +++++
 .../config/vocabularies/Backstage/accept.txt  |  1 +
 .../software-templates/input-examples.md      | 19 +++++++++++++++++++
 .../software-templates/writing-templates.md   |  5 +++++
 plugins/scaffolder-react/package.json         |  1 +
 .../src/next/components/Stepper/Stepper.tsx   |  6 +++++-
 yarn.lock                                     |  1 +
 7 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/modern-parrots-protect.md

diff --git a/.changeset/modern-parrots-protect.md b/.changeset/modern-parrots-protect.md
new file mode 100644
index 0000000000..7fccff1bef
--- /dev/null
+++ b/.changeset/modern-parrots-protect.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+---
+
+support ajv-errors for scaffolder validation
diff --git a/.github/vale/config/vocabularies/Backstage/accept.txt b/.github/vale/config/vocabularies/Backstage/accept.txt
index 6ff0ef56da..1092947245 100644
--- a/.github/vale/config/vocabularies/Backstage/accept.txt
+++ b/.github/vale/config/vocabularies/Backstage/accept.txt
@@ -7,6 +7,7 @@ ADRs
 airbrake
 Airbrake
 Airbrakes
+ajv
 Alaria
 Alef
 allowlisted
diff --git a/docs/features/software-templates/input-examples.md b/docs/features/software-templates/input-examples.md
index f49e76e469..dd1228290f 100644
--- a/docs/features/software-templates/input-examples.md
+++ b/docs/features/software-templates/input-examples.md
@@ -26,6 +26,25 @@ parameters:
         ui:help: 'Hint: additional description...'
 ```
 
+#### Custom validation error message
+
+```yaml
+parameters:
+  - title: Fill in some steps
+    properties:
+      name:
+        title: Simple text input
+        type: string
+        description: Description about input
+        maxLength: 8
+        pattern: '^([a-zA-Z][a-zA-Z0-9]*)(-[a-zA-Z0-9]+)*$'
+        ui:autofocus: true
+        ui:help: 'Hint: additional description...'
+    errorMessage:
+      properties:
+        name: '1-8 alphanumeric tokens (first starts with letter) delimited by -'
+```
+
 ### Multi line text input
 
 ```yaml
diff --git a/docs/features/software-templates/writing-templates.md b/docs/features/software-templates/writing-templates.md
index 15591eeb67..075fe0bb08 100644
--- a/docs/features/software-templates/writing-templates.md
+++ b/docs/features/software-templates/writing-templates.md
@@ -533,6 +533,11 @@ catalogFilter:
     metadata.annotations.github.com/team-slug: { exists: true }
 ```
 
+#### Custom validation messages
+
+You may specify custom JSON Schema validation messages as supported by the
+[ajv-errors](https://github.com/ajv-validator/ajv-errors) plugin library to [ajv](https://github.com/ajv-validator/ajv).
+
 ## `spec.steps` - `Action[]`
 
 The `steps` is an array of the things that you want to happen part of this
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index f2d7d44a01..9c50900c05 100644
--- a/plugins/scaffolder-react/package.json
+++ b/plugins/scaffolder-react/package.json
@@ -78,6 +78,7 @@
     "@rjsf/validator-ajv8": "5.18.5",
     "@types/json-schema": "^7.0.9",
     "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
+    "ajv-errors": "^3.0.0",
     "classnames": "^2.2.6",
     "flatted": "3.3.1",
     "humanize-duration": "^3.25.1",
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
index 269b6a11d5..788c7cd715 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
@@ -35,7 +35,7 @@ import {
 } from './createAsyncValidators';
 import { ReviewState, type ReviewStateProps } from '../ReviewState';
 import { useTemplateSchema, useFormDataFromQuery } from '../../hooks';
-import validator from '@rjsf/validator-ajv8';
+import { customizeValidator } from '@rjsf/validator-ajv8';
 import { useTransformSchemaToProps } from '../../hooks/useTransformSchemaToProps';
 import { hasErrors } from './utils';
 import * as FieldOverrides from './FieldOverrides';
@@ -50,6 +50,10 @@ import { ReviewStepProps } from '@backstage/plugin-scaffolder-react';
 import { ErrorListTemplate } from './ErrorListTemplate';
 import { makeStyles } from '@material-ui/core/styles';
 import { PasswordWidget } from '../PasswordWidget/PasswordWidget';
+import ajvErrors from 'ajv-errors';
+
+const validator = customizeValidator();
+ajvErrors(validator.ajv);
 
 const useStyles = makeStyles(theme => ({
   backButton: {
diff --git a/yarn.lock b/yarn.lock
index c6a1d2139a..fe7bc4b2c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7110,6 +7110,7 @@ __metadata:
     "@types/json-schema": ^7.0.9
     "@types/luxon": ^3.0.0
     "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    ajv-errors: ^3.0.0
     classnames: ^2.2.6
     flatted: 3.3.1
     humanize-duration: ^3.25.1

From 8b808fd1a92389395668596a18942502816610aa Mon Sep 17 00:00:00 2001
From: Matt Benson <gudnabrsam@gmail.com>
Date: Mon, 15 Jul 2024 10:48:22 -0500
Subject: [PATCH 066/225] add errorMessage test

Signed-off-by: Matt Benson <gudnabrsam@gmail.com>
---
 .../next/components/Stepper/Stepper.test.tsx  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
index d7e271f8b3..df58d971fb 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
@@ -392,6 +392,46 @@ describe('Stepper', () => {
     expect(getByText('invalid postcode')).toBeInTheDocument();
   });
 
+  it('should render ajv-errors message', async () => {
+    const manifest: TemplateParameterSchema = {
+      steps: [
+        {
+          title: 'Step 1',
+          schema: {
+            properties: {
+              postcode: {
+                type: 'string',
+                pattern: '[A-Z][0-9][A-Z] [0-9][A-Z][0-9]',
+              },
+            },
+            errorMessage: {
+              properties: {
+                postcode: 'invalid postcode',
+              },
+            },
+          },
+        },
+      ],
+      title: 'transformErrors Form Test',
+    };
+
+    const { getByText, getByRole } = await renderInTestApp(
+      <SecretsContextProvider>
+        <Stepper manifest={manifest} extensions={[]} onCreate={jest.fn()} />
+      </SecretsContextProvider>,
+    );
+
+    await fireEvent.change(getByRole('textbox', { name: 'postcode' }), {
+      target: { value: 'invalid' },
+    });
+
+    await act(async () => {
+      await fireEvent.click(getByRole('button', { name: 'Review' }));
+    });
+
+    expect(getByText('invalid postcode')).toBeInTheDocument();
+  });
+
   it('should grab the initial formData from the query', async () => {
     const manifest: TemplateParameterSchema = {
       steps: [

From 7ab4983ed28943636a913eaf7992e437a1e2ade4 Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Wed, 17 Jul 2024 15:00:39 +0530
Subject: [PATCH 067/225] Chore:Add error handling for YAML parsing to improve
 robustness

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .../fetch/rails/index.examples.test.ts        | 70 ++++++++++++++++---
 1 file changed, 60 insertions(+), 10 deletions(-)

diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
index a80985321e..37e678ab6a 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.examples.test.ts
@@ -90,7 +90,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[0].description}`, async () => {
-    const input = yaml.parse(examples[0].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[0].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -110,7 +115,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[1].description}`, async () => {
-    const input = yaml.parse(examples[1].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[1].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -130,7 +140,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[2].description}`, async () => {
-    const input = yaml.parse(examples[2].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[2].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -150,7 +165,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[3].description}`, async () => {
-    const input = yaml.parse(examples[3].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[3].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -170,7 +190,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[4].description}`, async () => {
-    const input = yaml.parse(examples[4].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[4].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -190,7 +215,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[5].description}`, async () => {
-    const input = yaml.parse(examples[5].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[5].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -210,7 +240,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[6].description}`, async () => {
-    const input = yaml.parse(examples[6].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[6].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -230,7 +265,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[7].description}`, async () => {
-    const input = yaml.parse(examples[7].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[7].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -250,7 +290,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[8].description}`, async () => {
-    const input = yaml.parse(examples[8].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[8].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,
@@ -270,7 +315,12 @@ describe('fetch:rails', () => {
   });
 
   it(`should ${examples[9].description}`, async () => {
-    const input = yaml.parse(examples[9].example).steps[0].input;
+    let input;
+    try {
+      input = yaml.parse(examples[9].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
 
     await action.handler({
       ...mockContext,

From 31fd39b4dce1c39d258ed72c43dabe8de38e1c38 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 17 Jul 2024 12:22:36 +0200
Subject: [PATCH 068/225] chore: fixing discord link

Signed-off-by: blam <ben@blam.sh>
---
 microsite/blog/2022-12-19-backstage-wrapped-2022.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsite/blog/2022-12-19-backstage-wrapped-2022.mdx b/microsite/blog/2022-12-19-backstage-wrapped-2022.mdx
index e92c9f2265..c15b9fe208 100644
--- a/microsite/blog/2022-12-19-backstage-wrapped-2022.mdx
+++ b/microsite/blog/2022-12-19-backstage-wrapped-2022.mdx
@@ -20,7 +20,7 @@ Last year we celebrated 75 [public adopters](https://github.com/backstage/backst
 
 ![Accelerated growth of Public Backstage Adopters, from January 2021–December 2022.](assets/2022-12-19/public-backstage-adopters-2022.png)
 
-Not only are our adopters growing at an exponential rate, but so too are our contributors. Our [Discord server](https://discord.gg/backstage-687207715902193673-687207715902193673) is a perfect example of the worlds of our adopters and contributors melding. On average, at any given hour of the day or night, there are more than 500 people online available to talk and provide support on any Backstage topic. Discord discussions run a full gamut of topics – from technical support questions to best practices for onboarding engineers to Backstage – basically, anything and everything an adopter may be interested to know and learn. At the very beginning of 2022, we “only” had 4k Discord members. Today, we have a growing membership of 8.2k.
+Not only are our adopters growing at an exponential rate, but so too are our contributors. Our [Discord server](https://discord.gg/backstage-687207715902193673) is a perfect example of the worlds of our adopters and contributors melding. On average, at any given hour of the day or night, there are more than 500 people online available to talk and provide support on any Backstage topic. Discord discussions run a full gamut of topics – from technical support questions to best practices for onboarding engineers to Backstage – basically, anything and everything an adopter may be interested to know and learn. At the very beginning of 2022, we “only” had 4k Discord members. Today, we have a growing membership of 8.2k.
 
 Isn’t it what we can call a great and vibrant community of enthusiasts?
 

From c8f1cae0efb32b4b859bd7fa12d65e85c6dd5dbd Mon Sep 17 00:00:00 2001
From: Boris Bera <bbera@coveo.com>
Date: Wed, 17 Jul 2024 11:31:12 -0400
Subject: [PATCH 069/225] Add `signIn.resolvers` to auth providers config
 schema

Signed-off-by: Boris Bera <bbera@coveo.com>
---
 .changeset/breezy-jeans-tie.md                 | 18 ++++++++++++++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  6 ++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  6 ++++++
 .../config.d.ts                                |  9 +++++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  6 ++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  7 +++++++
 .../config.d.ts                                |  7 +++++++
 15 files changed, 115 insertions(+)
 create mode 100644 .changeset/breezy-jeans-tie.md

diff --git a/.changeset/breezy-jeans-tie.md b/.changeset/breezy-jeans-tie.md
new file mode 100644
index 0000000000..4601389a4c
--- /dev/null
+++ b/.changeset/breezy-jeans-tie.md
@@ -0,0 +1,18 @@
+---
+'@backstage/plugin-auth-backend-module-cloudflare-access-provider': patch
+'@backstage/plugin-auth-backend-module-vmware-cloud-provider': patch
+'@backstage/plugin-auth-backend-module-atlassian-provider': patch
+'@backstage/plugin-auth-backend-module-bitbucket-provider': patch
+'@backstage/plugin-auth-backend-module-microsoft-provider': patch
+'@backstage/plugin-auth-backend-module-onelogin-provider': patch
+'@backstage/plugin-auth-backend-module-aws-alb-provider': patch
+'@backstage/plugin-auth-backend-module-gcp-iap-provider': patch
+'@backstage/plugin-auth-backend-module-github-provider': patch
+'@backstage/plugin-auth-backend-module-gitlab-provider': patch
+'@backstage/plugin-auth-backend-module-google-provider': patch
+'@backstage/plugin-auth-backend-module-oauth2-provider': patch
+'@backstage/plugin-auth-backend-module-oidc-provider': patch
+'@backstage/plugin-auth-backend-module-okta-provider': patch
+---
+
+Add `signIn` to authentication provider configuration schema
diff --git a/plugins/auth-backend-module-atlassian-provider/config.d.ts b/plugins/auth-backend-module-atlassian-provider/config.d.ts
index d2c8a249c1..b6ca96d62f 100644
--- a/plugins/auth-backend-module-atlassian-provider/config.d.ts
+++ b/plugins/auth-backend-module-atlassian-provider/config.d.ts
@@ -28,6 +28,13 @@ export interface Config {
           audience?: string;
           callbackUrl?: string;
           additionalScopes?: string | string[];
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'usernameMatchingUserEntityName' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-aws-alb-provider/config.d.ts b/plugins/auth-backend-module-aws-alb-provider/config.d.ts
index 1978e5a4df..5a3e90cf6b 100644
--- a/plugins/auth-backend-module-aws-alb-provider/config.d.ts
+++ b/plugins/auth-backend-module-aws-alb-provider/config.d.ts
@@ -21,6 +21,12 @@ export interface Config {
       awsalb?: {
         issuer?: string;
         region: string;
+        signIn?: {
+          resolvers: Array<
+            | { resolver: 'emailLocalPartMatchingUserEntityName' }
+            | { resolver: 'emailMatchingUserEntityProfileEmail' }
+          >;
+        };
       };
     };
   };
diff --git a/plugins/auth-backend-module-bitbucket-provider/config.d.ts b/plugins/auth-backend-module-bitbucket-provider/config.d.ts
index 17cac1c194..df68209469 100644
--- a/plugins/auth-backend-module-bitbucket-provider/config.d.ts
+++ b/plugins/auth-backend-module-bitbucket-provider/config.d.ts
@@ -26,6 +26,13 @@ export interface Config {
            */
           clientSecret: string;
           additionalScopes?: string | string[];
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'userIdMatchingUserEntityAnnotation' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts b/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
index ff7d722d48..1300eb8c57 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
+++ b/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
@@ -27,6 +27,12 @@ export interface Config {
           token: string;
           subject: string;
         }>;
+        signIn?: {
+          resolvers: Array<
+            | { resolver: 'emailLocalPartMatchingUserEntityName' }
+            | { resolver: 'emailMatchingUserEntityProfileEmail' }
+          >;
+        };
       };
       /**
        * The backstage token expiration.
diff --git a/plugins/auth-backend-module-gcp-iap-provider/config.d.ts b/plugins/auth-backend-module-gcp-iap-provider/config.d.ts
index 945378ada6..452f9819c3 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/config.d.ts
+++ b/plugins/auth-backend-module-gcp-iap-provider/config.d.ts
@@ -32,6 +32,15 @@ export interface Config {
            * The name of the header to read the JWT token from, defaults to `'x-goog-iap-jwt-assertion'`.
            */
           jwtHeader?: string;
+
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'emailMatchingUserEntityAnnotation' }
+              | { resolver: 'idMatchingUserEntityAnnotation' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-github-provider/config.d.ts b/plugins/auth-backend-module-github-provider/config.d.ts
index f60d4c239d..2ca17998f0 100644
--- a/plugins/auth-backend-module-github-provider/config.d.ts
+++ b/plugins/auth-backend-module-github-provider/config.d.ts
@@ -28,6 +28,13 @@ export interface Config {
           callbackUrl?: string;
           enterpriseInstanceUrl?: string;
           additionalScopes?: string | string[];
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'usernameMatchingUserEntityName' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-gitlab-provider/config.d.ts b/plugins/auth-backend-module-gitlab-provider/config.d.ts
index 18f7cb5005..d21c2bd62a 100644
--- a/plugins/auth-backend-module-gitlab-provider/config.d.ts
+++ b/plugins/auth-backend-module-gitlab-provider/config.d.ts
@@ -28,6 +28,13 @@ export interface Config {
           audience?: string;
           callbackUrl?: string;
           additionalScopes?: string | string[];
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'usernameMatchingUserEntityName' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-google-provider/config.d.ts b/plugins/auth-backend-module-google-provider/config.d.ts
index 08a0e08f2b..3abab05cfe 100644
--- a/plugins/auth-backend-module-google-provider/config.d.ts
+++ b/plugins/auth-backend-module-google-provider/config.d.ts
@@ -27,6 +27,13 @@ export interface Config {
           clientSecret: string;
           callbackUrl?: string;
           additionalScopes?: string | string[];
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'emailMatchingUserEntityAnnotation' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-microsoft-provider/config.d.ts b/plugins/auth-backend-module-microsoft-provider/config.d.ts
index a7ec027083..b1ed2d5766 100644
--- a/plugins/auth-backend-module-microsoft-provider/config.d.ts
+++ b/plugins/auth-backend-module-microsoft-provider/config.d.ts
@@ -29,6 +29,13 @@ export interface Config {
           domainHint?: string;
           callbackUrl?: string;
           additionalScopes?: string | string[];
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'emailMatchingUserEntityAnnotation' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-oauth2-provider/config.d.ts b/plugins/auth-backend-module-oauth2-provider/config.d.ts
index 9b1ee18f1b..fa9dec7ce1 100644
--- a/plugins/auth-backend-module-oauth2-provider/config.d.ts
+++ b/plugins/auth-backend-module-oauth2-provider/config.d.ts
@@ -32,6 +32,13 @@ export interface Config {
           additionalScopes?: string | string[];
           disableRefresh?: boolean;
           includeBasicAuth?: boolean;
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'usernameMatchingUserEntityName' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-oidc-provider/config.d.ts b/plugins/auth-backend-module-oidc-provider/config.d.ts
index 398e63c466..dbc06e51bb 100644
--- a/plugins/auth-backend-module-oidc-provider/config.d.ts
+++ b/plugins/auth-backend-module-oidc-provider/config.d.ts
@@ -31,6 +31,12 @@ export interface Config {
           tokenSignedResponseAlg?: string;
           additionalScopes?: string | string[];
           prompt?: string;
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-okta-provider/config.d.ts b/plugins/auth-backend-module-okta-provider/config.d.ts
index aaf6ec1f91..0689171153 100644
--- a/plugins/auth-backend-module-okta-provider/config.d.ts
+++ b/plugins/auth-backend-module-okta-provider/config.d.ts
@@ -30,6 +30,13 @@ export interface Config {
           idp?: string;
           callbackUrl?: string;
           additionalScopes?: string | string[];
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'emailMatchingUserEntityAnnotation' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-onelogin-provider/config.d.ts b/plugins/auth-backend-module-onelogin-provider/config.d.ts
index d4f1457461..8257e2ac71 100644
--- a/plugins/auth-backend-module-onelogin-provider/config.d.ts
+++ b/plugins/auth-backend-module-onelogin-provider/config.d.ts
@@ -27,6 +27,13 @@ export interface Config {
           clientSecret: string;
           issuer: string;
           callbackUrl?: string;
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'usernameMatchingUserEntityName' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts b/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts
index 6ea07f1936..a08451cff3 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts
+++ b/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts
@@ -25,6 +25,13 @@ export interface Config {
           scope?: string;
           consoleEndpoint?: string;
           additionalScopes?: string | string[];
+          signIn?: {
+            resolvers: Array<
+              | { resolver: 'profileEmailMatchingUserEntityEmail' }
+              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | { resolver: 'emailMatchingUserEntityProfileEmail' }
+            >;
+          };
         };
       };
     };

From ee2b0e54330409df51f9ed2ac78090c77afd8f53 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Wed, 17 Jul 2024 17:08:02 +0100
Subject: [PATCH 070/225] cli: add support for forcing use of react development
 when building

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 .changeset/little-bulldogs-guess.md    |  8 +++++
 packages/cli/src/lib/bundler/config.ts | 44 +++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/little-bulldogs-guess.md

diff --git a/.changeset/little-bulldogs-guess.md b/.changeset/little-bulldogs-guess.md
new file mode 100644
index 0000000000..8d247a182b
--- /dev/null
+++ b/.changeset/little-bulldogs-guess.md
@@ -0,0 +1,8 @@
+---
+'@backstage/cli': patch
+---
+
+Add ability to force use of the development versions of `react` and `react-dom`
+by setting the `FORCE_REACT_DEVELOPMENT` environment variable to `true` when
+building, for example by using a command like `FORCE_REACT_DEVELOPMENT=true yarn
+build:all`.
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 60c8a7be66..44cdc4a475 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -15,7 +15,8 @@
  */
 
 import { BackendBundlingOptions, BundlingOptions } from './types';
-import { posix as posixPath, resolve as resolvePath } from 'path';
+import { posix as posixPath, resolve as resolvePath, dirname } from 'path';
+import chalk from 'chalk';
 import webpack, { ProvidePlugin } from 'webpack';
 
 import { BackstagePackage } from '@backstage/cli-node';
@@ -33,7 +34,7 @@ import fs from 'fs-extra';
 import { getPackages } from '@manypkg/get-packages';
 import { isChildPath } from '@backstage/cli-common';
 import nodeExternals from 'webpack-node-externals';
-import { optimization } from './optimization';
+import { optimization as optimizationConfig } from './optimization';
 import pickBy from 'lodash/pickBy';
 import { readEntryPoints } from '../entryPoints';
 import { runPlain } from '../run';
@@ -232,12 +233,47 @@ export async function createConfig(
     require.resolve('react-refresh'),
   ];
 
+  const mode = isDev ? 'development' : 'production';
+  const optimization = optimizationConfig(options);
+
+  if (process.env.FORCE_REACT_DEVELOPMENT === 'true') {
+    console.log(
+      chalk.yellow(
+        `⚠️  WARNING: Forcing react and react-dom into development mode. This build should not be used in production.`,
+      ),
+    );
+
+    const reactPackageDirs = [
+      `${dirname(require.resolve('react/package.json'))}/`,
+      `${dirname(require.resolve('react-dom/package.json'))}/`,
+    ];
+
+    // Don't define process.env.NODE_ENV with value matching config.mode.
+    optimization.nodeEnv = false;
+
+    // Instead, provide a custom definition which always uses "development" if
+    // the module is part of `react` or `react-dom`, and `config.mode` otherwise.
+    plugins.push(
+      new webpack.DefinePlugin({
+        'process.env.NODE_ENV': webpack.DefinePlugin.runtimeValue(
+          ({ module }) => {
+            if (reactPackageDirs.some(val => module.resource.startsWith(val))) {
+              return '"development"';
+            }
+
+            return `"${mode}"`;
+          },
+        ),
+      }),
+    );
+  }
+
   const withCache = yn(process.env[BUILD_CACHE_ENV_VAR], { default: false });
 
   return {
-    mode: isDev ? 'development' : 'production',
+    mode,
     profile: false,
-    optimization: optimization(options),
+    optimization,
     bail: false,
     performance: {
       hints: false, // we check the gzip size instead

From 7eb08a69dd0cdc11fdf363a07149a8ca9438eadd Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Wed, 17 Jul 2024 20:53:55 +0100
Subject: [PATCH 071/225] cli: allow linting packages with role
 dynamic-frontend-container

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 .changeset/bright-trainers-brake.md   | 5 +++++
 packages/cli/config/eslint-factory.js | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/bright-trainers-brake.md

diff --git a/.changeset/bright-trainers-brake.md b/.changeset/bright-trainers-brake.md
new file mode 100644
index 0000000000..2299d83a32
--- /dev/null
+++ b/.changeset/bright-trainers-brake.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Add frontend-dynamic-container role to eslint config factory
diff --git a/packages/cli/config/eslint-factory.js b/packages/cli/config/eslint-factory.js
index 6bc200cade..96d8478ec0 100644
--- a/packages/cli/config/eslint-factory.js
+++ b/packages/cli/config/eslint-factory.js
@@ -201,6 +201,7 @@ function createConfigForRole(dir, role, extraConfig = {}) {
     case 'frontend':
     case 'frontend-plugin':
     case 'frontend-plugin-module':
+    case 'frontend-dynamic-container':
       return createConfig(dir, {
         ...extraConfig,
         extends: [

From 46e949f5ed570aefcc6917f4e771f633aef714e3 Mon Sep 17 00:00:00 2001
From: Francisco Meneses <fmeneses@redhat.com>
Date: Wed, 17 Jul 2024 17:16:29 -0400
Subject: [PATCH 072/225] fix Spanish welcomeTitle message

Signed-off-by: Francisco Meneses <fmeneses@redhat.com>
---
 .../WelcomeTitle/locales/goodAfternoon.locales.json             | 1 +
 .../WelcomeTitle/locales/goodEvening.locales.json               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/locales/goodAfternoon.locales.json b/plugins/home/src/homePageComponents/WelcomeTitle/locales/goodAfternoon.locales.json
index 9010ba4359..ddb51654fa 100644
--- a/plugins/home/src/homePageComponents/WelcomeTitle/locales/goodAfternoon.locales.json
+++ b/plugins/home/src/homePageComponents/WelcomeTitle/locales/goodAfternoon.locales.json
@@ -103,6 +103,7 @@
   "Sinhala": "සුභ දවාලක්",
   "Slovenian": "Dober dan",
   "Somali": "Galab wanaagsan",
+  "Spanish": "Buenas tardes",
   "Southern Sámi": "Buerie biejjie",
   "Sumerian": "𒄭𒌓𒁀",
   "Swahili": "Habari ya mchana",
diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/locales/goodEvening.locales.json b/plugins/home/src/homePageComponents/WelcomeTitle/locales/goodEvening.locales.json
index 5a98abafaa..c8d8c7334e 100644
--- a/plugins/home/src/homePageComponents/WelcomeTitle/locales/goodEvening.locales.json
+++ b/plugins/home/src/homePageComponents/WelcomeTitle/locales/goodEvening.locales.json
@@ -85,7 +85,7 @@
   "Slovak": "Dober vecher",
   "Slovenian": "Dober vecher",
   "Somali": "Habeen wanaagsan",
-  "Spanish": "Buenas tardes",
+  "Spanish": "Buenas noches",
   "Sumerian": "𒄭𒈪",
   "Swedish": "God afton",
   "Tagalog": "Magandang gabi",

From fdcc05947fc7447a28d3090235d882896e37d10a Mon Sep 17 00:00:00 2001
From: Francisco Meneses <fmeneses@redhat.com>
Date: Wed, 17 Jul 2024 17:34:17 -0400
Subject: [PATCH 073/225] add changeset

Signed-off-by: Francisco Meneses <fmeneses@redhat.com>
---
 .changeset/slow-toes-jog.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/slow-toes-jog.md

diff --git a/.changeset/slow-toes-jog.md b/.changeset/slow-toes-jog.md
new file mode 100644
index 0000000000..245feab544
--- /dev/null
+++ b/.changeset/slow-toes-jog.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-home': patch
+---
+
+Fixed a bug on the WelcomeTitle component where the welcome message wasn't correct when the language was set to Spanish

From 644d4696c28ca675efc0f240c428b5f43547f734 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Thu, 18 Jul 2024 10:35:40 +0100
Subject: [PATCH 074/225] cli: only allow forcing react development mode when
 module federation is enabled

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 .changeset/little-bulldogs-guess.md    | 15 ++++++++++++---
 packages/cli/src/lib/bundler/config.ts |  5 ++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.changeset/little-bulldogs-guess.md b/.changeset/little-bulldogs-guess.md
index 8d247a182b..1f86f0a67f 100644
--- a/.changeset/little-bulldogs-guess.md
+++ b/.changeset/little-bulldogs-guess.md
@@ -3,6 +3,15 @@
 ---
 
 Add ability to force use of the development versions of `react` and `react-dom`
-by setting the `FORCE_REACT_DEVELOPMENT` environment variable to `true` when
-building, for example by using a command like `FORCE_REACT_DEVELOPMENT=true yarn
-build:all`.
+to allow for detailed error messages and use of fast-refresh. Note that builds
+with the development versions of `react` and `react-dom` should not be
+deployed in production.
+
+This feature can be used by setting the `FORCE_REACT_DEVELOPMENT` environment
+variable to `true`:
+
+```bash
+EXPERIMENTAL_MODULE_FEDERATION=true \
+FORCE_REACT_DEVELOPMENT=true \
+yarn build:all
+```
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 44cdc4a475..8e3d7eee19 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -236,7 +236,10 @@ export async function createConfig(
   const mode = isDev ? 'development' : 'production';
   const optimization = optimizationConfig(options);
 
-  if (process.env.FORCE_REACT_DEVELOPMENT === 'true') {
+  if (
+    process.env.EXPERIMENTAL_MODULE_FEDERATION === 'true' &&
+    process.env.FORCE_REACT_DEVELOPMENT === 'true'
+  ) {
     console.log(
       chalk.yellow(
         `⚠️  WARNING: Forcing react and react-dom into development mode. This build should not be used in production.`,

From ec950c58caac142a311225af4463e50982f7ee11 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Jul 2024 12:35:16 +0200
Subject: [PATCH 075/225] chore: remove app-api dependency

Signed-off-by: blam <ben@blam.sh>
---
 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 <ben@blam.sh>
Date: Thu, 18 Jul 2024 12:42:16 +0200
Subject: [PATCH 076/225] chore: remove app-api dep Signed-off-by: blam
 <ben@blam.sh>

---
 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 <ben@blam.sh>
Date: Thu, 18 Jul 2024 12:43:24 +0200
Subject: [PATCH 077/225] chore: changeset

Signed-off-by: blam <ben@blam.sh>
---
 .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 0a40f13580e9b6af226ab6bdbd49e2505d988a2c Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Jul 2024 13:05:32 +0200
Subject: [PATCH 078/225] chore: wip

Signed-off-by: blam <ben@blam.sh>
---
 .../src/components/TabbedLayout/RoutedTabs.tsx           | 3 +++
 .../src/layout/HeaderTabs/HeaderTabs.test.tsx            | 9 ---------
 .../core-components/src/layout/HeaderTabs/HeaderTabs.tsx | 7 +------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
index 2c727efe1b..6a5bf2970f 100644
--- a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
+++ b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
@@ -96,6 +96,9 @@ export function RoutedTabs(props: { routes: SubRoute[] }) {
         tabs={headerTabs}
         selectedIndex={index}
         onChange={onTabChange}
+        tabProps={{
+          component: Link,
+        }}
       />
       <Content>
         <Helmet title={route?.title} />
diff --git a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx
index dad40c4615..5aec83bc2b 100644
--- a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx
+++ b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.test.tsx
@@ -95,13 +95,4 @@ describe('<HeaderTabs />', () => {
     await user.click(rendered.getByText('Docs'));
     expect(mockOnChange).toHaveBeenCalledTimes(1);
   });
-
-  it('should render 2 nav tabs', async () => {
-    const rendered = await renderInTestApp(<HeaderTabs tabs={mockTabs} />);
-    const tabs = rendered.queryAllByTestId(id => id.startsWith('header-tab'));
-    expect(tabs).toHaveLength(2);
-    tabs.forEach(tab => {
-      expect(tab.tagName.toLocaleLowerCase('en-US')).toBe('a');
-    });
-  });
 });
diff --git a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
index 9ee9c5525f..002c9fe1ea 100644
--- a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
+++ b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
@@ -18,7 +18,6 @@ import { makeStyles } from '@material-ui/core/styles';
 import TabUI, { TabProps } from '@material-ui/core/Tab';
 import Tabs from '@material-ui/core/Tabs';
 import React, { useCallback, useEffect, useState } from 'react';
-import { Link } from '../../components/Link';
 
 // TODO(blam): Remove this implementation when the Tabs are ready
 // This is just a temporary solution to implementing tabs for now
@@ -96,9 +95,7 @@ export function HeaderTabs(props: HeaderTabsProps) {
       setSelectedTab(selectedIndex);
     }
   }, [selectedIndex]);
-  function removeLeadingSlash(path: string) {
-    return path.replace(/^\//, '');
-  }
+
   return (
     <Box className={styles.tabsWrapper}>
       <Tabs
@@ -115,8 +112,6 @@ export function HeaderTabs(props: HeaderTabsProps) {
             data-testid={`header-tab-${index}`}
             label={tab.label}
             key={tab.id}
-            component={Link}
-            to={removeLeadingSlash(tab.id)}
             value={index}
             className={styles.defaultTab}
             classes={{ selected: styles.selected, root: styles.tabRoot }}

From 1f5094f1b70495aba6ee8d54bb86ed5dcea6b410 Mon Sep 17 00:00:00 2001
From: Ben Lambert <blam@spotify.com>
Date: Wed, 26 Jun 2024 16:20:47 +0200
Subject: [PATCH 079/225] Update dry-squids-tap.md

Signed-off-by: Ben Lambert <blam@spotify.com>
Signed-off-by: blam <ben@blam.sh>
---
 .changeset/dry-squids-tap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changeset/dry-squids-tap.md b/.changeset/dry-squids-tap.md
index 5193e1f204..9bd835d371 100644
--- a/.changeset/dry-squids-tap.md
+++ b/.changeset/dry-squids-tap.md
@@ -14,9 +14,9 @@ const TestExtensionKind = createExtensionKind({
   output: {
     element: coreExtensionData.reactElement,
   },
-  factory(_, props: { text: string }) {
+  factory(_, options: { text: string }) {
     return {
-      element: <h1>{props.text}</h1>,
+      element: <h1>{options.text}</h1>,
     };
   },
 });

From f749bb8fa989e5f4c29608a903cc9119cd745390 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 25 Jun 2024 14:25:22 +0200
Subject: [PATCH 080/225] chore: extension overrides spike

Signed-off-by: blam <ben@blam.sh>
---
 .../core-compat-api/src/convertLegacyApp.ts   |  72 ++++++++++-
 .../src/wiring/createExtension.test.ts        |  33 +++++
 .../src/wiring/createExtension.ts             | 121 ++++++++++++++----
 .../src/wiring/createExtensionKind.ts         |   4 +-
 4 files changed, 194 insertions(+), 36 deletions(-)

diff --git a/packages/core-compat-api/src/convertLegacyApp.ts b/packages/core-compat-api/src/convertLegacyApp.ts
index 72ce4b5e61..567e5efcad 100644
--- a/packages/core-compat-api/src/convertLegacyApp.ts
+++ b/packages/core-compat-api/src/convertLegacyApp.ts
@@ -26,6 +26,7 @@ import {
   coreExtensionData,
   createExtension,
   createExtensionInput,
+  createExtensionKind,
   createExtensionOverrides,
 } from '@backstage/frontend-plugin-api';
 import { getComponentData } from '@backstage/core-plugin-api';
@@ -128,21 +129,80 @@ export function convertLegacyApp(
       };
     },
   });
-  const CoreNavOverride = createExtension({
-    namespace: 'app',
-    name: 'nav',
-    attachTo: { id: 'app/layout', input: 'nav' },
-    output: {},
+
+  const CoreNavOverride = CurrentCoreNav.override({
+    // namespace: 'app',
+    // name: 'nav',
+    // attachTo: { id: 'app/layout', input: 'nav' },
+    // output: {},
     factory: () => ({}),
     disabled: true,
   });
 
+  createExtensionOverride({
+    extension: CurrentCoreNav,
+    factory: () => null,
+  });
+
   const collectedRoutes = collectLegacyRoutes(routesEl);
 
   return [
     ...collectedRoutes,
     createExtensionOverrides({
-      extensions: [CoreLayoutOverride, CoreNavOverride],
+      extensions: [CoreNavOverride, CoreNavOverride],
     }),
   ];
 }
+
+const EntityCardExtension = createExtensionKind({
+  kind: 'entity-card',
+  attachTo: { id: 'entity-card', input: 'default' },
+  inputs: {
+    loader: createExtensionInput({
+      element: coreExtensionData.reactElement,
+    }),
+  },
+  output: {
+    element: coreExtensionData.reactElement,
+  },
+  factory({ inputs }, props: { title: string }) {
+    console.log(inputs.loader);
+    return {
+      element: React.createElement('h1'),
+    };
+  },
+});
+
+const GithubCard = EntityCardExtension.new({
+  props: {
+    title: 'GitHub Card',
+  },
+  factory({ inputs: { loader } }) {
+    console.log(loader);
+    return {
+      element: React.createElement('h2'),
+    };
+  },
+});
+
+GithubCard.override({
+  attachTo: { id: 'entity-card', input: 'github' },
+  inputs: {
+    loader: createExtensionInput(
+      {
+        element: coreExtensionData.reactElement,
+      },
+      { singleton: false },
+    ),
+    loader2: createExtensionInput({
+      element: coreExtensionData.reactElement,
+    }),
+  },
+  factory({ originalFactory, inputs }) {
+    inputs.loader2;
+    inputs.loader;
+    return originalFactory({
+      inputsOverride: inputs,
+    });
+  },
+});
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index 42ab21db80..cfef69b0fe 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -291,4 +291,37 @@ describe('createExtension', () => {
       'ExtensionDefinition{namespace=test,attachTo=root@default}',
     );
   });
+
+  describe('override', () => {
+    it('should create an extension override', () => {
+      const extension = createExtension({
+        namespace: 'test',
+        attachTo: { id: 'root', input: 'default' },
+        output: {
+          foo: stringData,
+        },
+        factory() {
+          return {
+            foo: 'bar',
+          };
+        },
+      });
+
+      const override = extension.override({
+        attachTo: {
+          id: 'root',
+          input: 'default2',
+        },
+        factory() {
+          return {
+            foo: 'baz',
+          };
+        },
+      });
+
+      expect(String(override)).toBe(
+        'ExtensionDefinition{namespace=test,attachTo=root@default2}',
+      );
+    });
+  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 28dc6a4e29..b56cc39fc9 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -99,7 +99,33 @@ export interface CreateExtensionOptions<
 }
 
 /** @public */
-export interface ExtensionDefinition<TConfig> {
+export interface ExtensionDefinitionOverrides<
+  TOriginalConfig,
+  TOriginalInputs extends AnyExtensionInputMap,
+  TOverrideInputs extends AnyExtensionInputMap,
+> {
+  readonly disabled?: boolean;
+  readonly attachTo?: { id: string; input: string };
+  // TODO: inputs (only adding to the list? or redefine arity and superset of old type on existing input?)
+  // TODO: config (any merging needed on there?)
+  inputs?: TOverrideInputs;
+  factory?(options: {
+    node: AppNode;
+    config: TOriginalConfig;
+    inputs: Expand<ResolvedExtensionInputs<TOriginalInputs & TOverrideInputs>>;
+    originalFactory: (originalFactoryOptions?: {
+      inputsOverride?: ResolvedExtensionInputs<
+        TOriginalInputs & TOverrideInputs
+      >;
+    }) => ExtensionDataValues<any>;
+  }): ExtensionDataValues<any>;
+}
+
+/** @public */
+export interface ExtensionDefinition<
+  TConfig,
+  TInputs extends AnyExtensionInputMap,
+> {
   $$type: '@backstage/ExtensionDefinition';
   readonly kind?: string;
   readonly namespace?: string;
@@ -107,13 +133,18 @@ export interface ExtensionDefinition<TConfig> {
   readonly attachTo: { id: string; input: string };
   readonly disabled: boolean;
   readonly configSchema?: PortableSchema<TConfig>;
+  override<TOverrideInputs extends AnyExtensionInputMap>(
+    overrides: ExtensionDefinitionOverrides<TConfig, TInputs, TOverrideInputs>,
+  ): ExtensionDefinition<TConfig, TInputs>;
 }
 
 /** @internal */
-export interface InternalExtensionDefinition<TConfig>
-  extends ExtensionDefinition<TConfig> {
+export interface InternalExtensionDefinition<
+  TConfig,
+  TInputs extends AnyExtensionInputMap,
+> extends ExtensionDefinition<TConfig, TInputs> {
   readonly version: 'v1';
-  readonly inputs: AnyExtensionInputMap;
+  readonly inputs: TInputs;
   readonly output: AnyExtensionDataMap;
   factory(context: {
     node: AppNode;
@@ -123,10 +154,13 @@ export interface InternalExtensionDefinition<TConfig>
 }
 
 /** @internal */
-export function toInternalExtensionDefinition<TConfig>(
-  overrides: ExtensionDefinition<TConfig>,
-): InternalExtensionDefinition<TConfig> {
-  const internal = overrides as InternalExtensionDefinition<TConfig>;
+export function toInternalExtensionDefinition<
+  TConfig,
+  TInputs extends AnyExtensionInputMap,
+>(
+  overrides: ExtensionDefinition<TConfig, TInputs>,
+): InternalExtensionDefinition<TConfig, TInputs> {
+  const internal = overrides as InternalExtensionDefinition<TConfig, TInputs>;
   if (internal.$$type !== '@backstage/ExtensionDefinition') {
     throw new Error(
       `Invalid extension definition instance, bad type '${internal.$$type}'`,
@@ -147,38 +181,69 @@ export function createExtension<
   TConfig = never,
 >(
   options: CreateExtensionOptions<TOutput, TInputs, TConfig>,
-): ExtensionDefinition<TConfig> {
+): ExtensionDefinition<TConfig, TInputs> {
+  const {
+    kind,
+    namespace,
+    name,
+    attachTo,
+    disabled = false,
+    inputs = {} as TInputs,
+    output,
+    configSchema,
+    factory,
+  } = options;
+
   return {
     $$type: '@backstage/ExtensionDefinition',
     version: 'v1',
-    kind: options.kind,
-    namespace: options.namespace,
-    name: options.name,
-    attachTo: options.attachTo,
-    disabled: options.disabled ?? false,
-    inputs: options.inputs ?? {},
-    output: options.output,
-    configSchema: options.configSchema,
-    factory({ inputs, ...rest }) {
+    kind,
+    namespace,
+    name,
+    attachTo,
+    disabled,
+    inputs,
+    output,
+    configSchema,
+    factory({ inputs: factoryInputs, ...rest }) {
       // TODO: Simplify this, but TS wouldn't infer the input type for some reason
-      return options.factory({
-        inputs: inputs as Expand<ResolvedExtensionInputs<TInputs>>,
+      return factory({
+        inputs: factoryInputs as Expand<ResolvedExtensionInputs<TInputs>>,
         ...rest,
       });
     },
     toString() {
       const parts: string[] = [];
-      if (options.kind) {
-        parts.push(`kind=${options.kind}`);
+      if (kind) {
+        parts.push(`kind=${kind}`);
       }
-      if (options.namespace) {
-        parts.push(`namespace=${options.namespace}`);
+      if (namespace) {
+        parts.push(`namespace=${namespace}`);
       }
-      if (options.name) {
-        parts.push(`name=${options.name}`);
+      if (name) {
+        parts.push(`name=${name}`);
       }
-      parts.push(`attachTo=${options.attachTo.id}@${options.attachTo.input}`);
+      parts.push(`attachTo=${attachTo.id}@${attachTo.input}`);
       return `ExtensionDefinition{${parts.join(',')}}`;
     },
-  } as InternalExtensionDefinition<TConfig>;
+    override<TOverrideInputs extends AnyExtensionInputMap>(
+      overrides: ExtensionDefinitionOverrides<
+        TConfig,
+        TInputs,
+        TOverrideInputs
+      >,
+    ): ExtensionDefinition<TConfig, TInputs> {
+      return createExtension({
+        kind,
+        namespace,
+        name,
+        attachTo: overrides.attachTo ?? attachTo,
+        disabled: overrides.disabled ?? disabled,
+        inputs: { ...inputs, ...overrides.inputs },
+        output,
+        configSchema,
+        factory,
+      });
+    },
+  } as InternalExtensionDefinition<TConfig, TInputs>;
 }
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
index 52bf711822..353fb8ab70 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { AppNode } from '../apis';
 import { PortableSchema } from '../schema';
 import { Expand } from '../types';
@@ -21,6 +20,7 @@ import {
   AnyExtensionDataMap,
   AnyExtensionInputMap,
   ExtensionDataValues,
+  ExtensionDefinition,
   ResolvedExtensionInputs,
   createExtension,
 } from './createExtension';
@@ -107,7 +107,7 @@ export class ExtensionKind<
       },
       options: TOptions,
     ): Expand<ExtensionDataValues<TOutput>>;
-  }) {
+  }): ExtensionDefinition<TConfig, TInputs> {
     return createExtension({
       kind: this.options.kind,
       namespace: args.namespace ?? this.options.namespace,

From 966cca176bc0506034499ce2cb622ebdffe2ca1b Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 26 Jun 2024 16:31:25 +0200
Subject: [PATCH 081/225] chore: tidying up Signed-off-by: blam <ben@blam.sh>

Signed-off-by: blam <ben@blam.sh>
---
 .../core-compat-api/src/convertLegacyApp.ts   |  72 +----
 packages/frontend-plugin-api/api-report.md    | 214 ++++++++++-----
 .../src/wiring/createExtension.test.ts        |  33 ---
 .../src/wiring/createExtension.ts             | 125 +++------
 .../src/wiring/createExtensionKind.test.tsx   | 164 ++++++++++++
 .../src/wiring/createExtensionKind.ts         | 245 ++++++++++++++----
 .../frontend-plugin-api/src/wiring/index.ts   |   4 +-
 7 files changed, 550 insertions(+), 307 deletions(-)

diff --git a/packages/core-compat-api/src/convertLegacyApp.ts b/packages/core-compat-api/src/convertLegacyApp.ts
index 567e5efcad..72ce4b5e61 100644
--- a/packages/core-compat-api/src/convertLegacyApp.ts
+++ b/packages/core-compat-api/src/convertLegacyApp.ts
@@ -26,7 +26,6 @@ import {
   coreExtensionData,
   createExtension,
   createExtensionInput,
-  createExtensionKind,
   createExtensionOverrides,
 } from '@backstage/frontend-plugin-api';
 import { getComponentData } from '@backstage/core-plugin-api';
@@ -129,80 +128,21 @@ export function convertLegacyApp(
       };
     },
   });
-
-  const CoreNavOverride = CurrentCoreNav.override({
-    // namespace: 'app',
-    // name: 'nav',
-    // attachTo: { id: 'app/layout', input: 'nav' },
-    // output: {},
+  const CoreNavOverride = createExtension({
+    namespace: 'app',
+    name: 'nav',
+    attachTo: { id: 'app/layout', input: 'nav' },
+    output: {},
     factory: () => ({}),
     disabled: true,
   });
 
-  createExtensionOverride({
-    extension: CurrentCoreNav,
-    factory: () => null,
-  });
-
   const collectedRoutes = collectLegacyRoutes(routesEl);
 
   return [
     ...collectedRoutes,
     createExtensionOverrides({
-      extensions: [CoreNavOverride, CoreNavOverride],
+      extensions: [CoreLayoutOverride, CoreNavOverride],
     }),
   ];
 }
-
-const EntityCardExtension = createExtensionKind({
-  kind: 'entity-card',
-  attachTo: { id: 'entity-card', input: 'default' },
-  inputs: {
-    loader: createExtensionInput({
-      element: coreExtensionData.reactElement,
-    }),
-  },
-  output: {
-    element: coreExtensionData.reactElement,
-  },
-  factory({ inputs }, props: { title: string }) {
-    console.log(inputs.loader);
-    return {
-      element: React.createElement('h1'),
-    };
-  },
-});
-
-const GithubCard = EntityCardExtension.new({
-  props: {
-    title: 'GitHub Card',
-  },
-  factory({ inputs: { loader } }) {
-    console.log(loader);
-    return {
-      element: React.createElement('h2'),
-    };
-  },
-});
-
-GithubCard.override({
-  attachTo: { id: 'entity-card', input: 'github' },
-  inputs: {
-    loader: createExtensionInput(
-      {
-        element: coreExtensionData.reactElement,
-      },
-      { singleton: false },
-    ),
-    loader2: createExtensionInput({
-      element: coreExtensionData.reactElement,
-    }),
-  },
-  factory({ originalFactory, inputs }) {
-    inputs.loader2;
-    inputs.loader;
-    return originalFactory({
-      inputsOverride: inputs,
-    });
-  },
-});
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 48718f5375..6a04d04cd6 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -529,9 +529,91 @@ export function createExtensionKind<
   TOutput extends AnyExtensionDataMap,
   TConfig,
 >(
-  options: ExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
+  options: CreateExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
 ): ExtensionKind<TOptions, TInputs, TOutput, TConfig>;
 
+// @public (undocumented)
+export interface CreateExtensionKindInstanceOptions<
+  TOptions,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  // (undocumented)
+  attachTo?: {
+    id: string;
+    input: string;
+  };
+  // (undocumented)
+  configSchema?: PortableSchema<TConfig>;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  factory?(
+    context: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+      originalFactory(
+        context?: {
+          node?: AppNode;
+          config?: TConfig;
+          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+        },
+        options?: TOptions,
+      ): Expand<ExtensionDataValues<TOutput>>;
+    },
+    options: TOptions,
+  ): Expand<ExtensionDataValues<TOutput>>;
+  // (undocumented)
+  inputs?: TInputs;
+  // (undocumented)
+  name?: string;
+  // (undocumented)
+  namespace?: string;
+  // (undocumented)
+  options: TOptions;
+  // (undocumented)
+  output?: TOutput;
+}
+
+// @public (undocumented)
+export interface CreateExtensionKindOptions<
+  TOptions,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  // (undocumented)
+  attachTo: {
+    id: string;
+    input: string;
+  };
+  // (undocumented)
+  configSchema?: PortableSchema<TConfig>;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  factory(
+    context: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+    },
+    options: TOptions,
+  ): Expand<ExtensionDataValues<TOutput>>;
+  // (undocumented)
+  inputs?: TInputs;
+  // (undocumented)
+  kind: string;
+  // (undocumented)
+  name?: string;
+  // (undocumented)
+  namespace?: string;
+  // (undocumented)
+  output: TOutput;
+}
+
 // @public (undocumented)
 export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
@@ -548,7 +630,7 @@ export interface CreateExtensionOptions<
   // (undocumented)
   disabled?: boolean;
   // (undocumented)
-  factory(context: {
+  factory(options: {
     node: AppNode;
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
@@ -565,6 +647,51 @@ export interface CreateExtensionOptions<
   output: TOutput;
 }
 
+// @public (undocumented)
+export interface CreateExtensionOverrideKindInstanceOptions<
+  TOptions,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  // (undocumented)
+  attachTo?: {
+    id: string;
+    input: string;
+  };
+  // (undocumented)
+  configSchema?: PortableSchema<TConfig>;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  factory?(
+    context: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+      originalFactory(
+        context?: {
+          node?: AppNode;
+          config?: TConfig;
+          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+        },
+        options?: TOptions,
+      ): Expand<ExtensionDataValues<TOutput>>;
+    },
+    options: TOptions,
+  ): Expand<ExtensionDataValues<TOutput>>;
+  // (undocumented)
+  inputs?: TInputs;
+  // (undocumented)
+  name?: string;
+  // (undocumented)
+  namespace?: string;
+  // (undocumented)
+  options?: TOptions;
+  // (undocumented)
+  output?: TOutput;
+}
+
 // @public (undocumented)
 export function createExtensionOverrides(
   options: ExtensionOverridesOptions,
@@ -937,75 +1064,26 @@ export class ExtensionKind<
     TOutput extends AnyExtensionDataMap,
     TConfig,
   >(
-    options: ExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
+    options: CreateExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
   ): ExtensionKind<TOptions, TInputs, TOutput, TConfig>;
   // (undocumented)
-  new(args: {
-    namespace?: string;
-    name?: string;
-    attachTo?: {
-      id: string;
-      input: string;
-    };
-    disabled?: boolean;
-    inputs?: TInputs;
-    output?: TOutput;
-    configSchema?: PortableSchema<TConfig>;
-    options: TOptions;
-    factory?(
-      context: {
-        node: AppNode;
-        config: TConfig;
-        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-        orignalFactory(
-          context?: {
-            node?: AppNode;
-            config?: TConfig;
-            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-          },
-          options?: TOptions,
-        ): Expand<ExtensionDataValues<TOutput>>;
-      },
-      options: TOptions,
-    ): Expand<ExtensionDataValues<TOutput>>;
-  }): ExtensionDefinition<TConfig>;
-}
-
-// @public (undocumented)
-export interface ExtensionKindOptions<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
-> {
-  // (undocumented)
-  attachTo: {
-    id: string;
-    input: string;
+  new(
+    instanceProperties: CreateExtensionKindInstanceOptions<
+      TOptions,
+      TInputs,
+      TOutput,
+      TConfig
+    >,
+  ): ExtensionDefinition<TConfig> & {
+    override: (
+      overrides: CreateExtensionOverrideKindInstanceOptions<
+        TOptions,
+        TInputs,
+        TOutput,
+        TConfig
+      >,
+    ) => ExtensionDefinition<TConfig>;
   };
-  // (undocumented)
-  configSchema?: PortableSchema<TConfig>;
-  // (undocumented)
-  disabled?: boolean;
-  // (undocumented)
-  factory(
-    context: {
-      node: AppNode;
-      config: TConfig;
-      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-    },
-    options: TOptions,
-  ): Expand<ExtensionDataValues<TOutput>>;
-  // (undocumented)
-  inputs?: TInputs;
-  // (undocumented)
-  kind: string;
-  // (undocumented)
-  name?: string;
-  // (undocumented)
-  namespace?: string;
-  // (undocumented)
-  output: TOutput;
 }
 
 // @public (undocumented)
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index cfef69b0fe..42ab21db80 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -291,37 +291,4 @@ describe('createExtension', () => {
       'ExtensionDefinition{namespace=test,attachTo=root@default}',
     );
   });
-
-  describe('override', () => {
-    it('should create an extension override', () => {
-      const extension = createExtension({
-        namespace: 'test',
-        attachTo: { id: 'root', input: 'default' },
-        output: {
-          foo: stringData,
-        },
-        factory() {
-          return {
-            foo: 'bar',
-          };
-        },
-      });
-
-      const override = extension.override({
-        attachTo: {
-          id: 'root',
-          input: 'default2',
-        },
-        factory() {
-          return {
-            foo: 'baz',
-          };
-        },
-      });
-
-      expect(String(override)).toBe(
-        'ExtensionDefinition{namespace=test,attachTo=root@default2}',
-      );
-    });
-  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index b56cc39fc9..be76fbc069 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -91,7 +91,7 @@ export interface CreateExtensionOptions<
   inputs?: TInputs;
   output: TOutput;
   configSchema?: PortableSchema<TConfig>;
-  factory(context: {
+  factory(options: {
     node: AppNode;
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
@@ -99,33 +99,7 @@ export interface CreateExtensionOptions<
 }
 
 /** @public */
-export interface ExtensionDefinitionOverrides<
-  TOriginalConfig,
-  TOriginalInputs extends AnyExtensionInputMap,
-  TOverrideInputs extends AnyExtensionInputMap,
-> {
-  readonly disabled?: boolean;
-  readonly attachTo?: { id: string; input: string };
-  // TODO: inputs (only adding to the list? or redefine arity and superset of old type on existing input?)
-  // TODO: config (any merging needed on there?)
-  inputs?: TOverrideInputs;
-  factory?(options: {
-    node: AppNode;
-    config: TOriginalConfig;
-    inputs: Expand<ResolvedExtensionInputs<TOriginalInputs & TOverrideInputs>>;
-    originalFactory: (originalFactoryOptions?: {
-      inputsOverride?: ResolvedExtensionInputs<
-        TOriginalInputs & TOverrideInputs
-      >;
-    }) => ExtensionDataValues<any>;
-  }): ExtensionDataValues<any>;
-}
-
-/** @public */
-export interface ExtensionDefinition<
-  TConfig,
-  TInputs extends AnyExtensionInputMap,
-> {
+export interface ExtensionDefinition<TConfig> {
   $$type: '@backstage/ExtensionDefinition';
   readonly kind?: string;
   readonly namespace?: string;
@@ -133,20 +107,15 @@ export interface ExtensionDefinition<
   readonly attachTo: { id: string; input: string };
   readonly disabled: boolean;
   readonly configSchema?: PortableSchema<TConfig>;
-  override<TOverrideInputs extends AnyExtensionInputMap>(
-    overrides: ExtensionDefinitionOverrides<TConfig, TInputs, TOverrideInputs>,
-  ): ExtensionDefinition<TConfig, TInputs>;
 }
 
 /** @internal */
-export interface InternalExtensionDefinition<
-  TConfig,
-  TInputs extends AnyExtensionInputMap,
-> extends ExtensionDefinition<TConfig, TInputs> {
+export interface InternalExtensionDefinition<TConfig>
+  extends ExtensionDefinition<TConfig> {
   readonly version: 'v1';
-  readonly inputs: TInputs;
+  readonly inputs: AnyExtensionInputMap;
   readonly output: AnyExtensionDataMap;
-  factory(context: {
+  factory(options: {
     node: AppNode;
     config: TConfig;
     inputs: ResolvedExtensionInputs<any>;
@@ -154,13 +123,10 @@ export interface InternalExtensionDefinition<
 }
 
 /** @internal */
-export function toInternalExtensionDefinition<
-  TConfig,
-  TInputs extends AnyExtensionInputMap,
->(
-  overrides: ExtensionDefinition<TConfig, TInputs>,
-): InternalExtensionDefinition<TConfig, TInputs> {
-  const internal = overrides as InternalExtensionDefinition<TConfig, TInputs>;
+export function toInternalExtensionDefinition<TConfig>(
+  overrides: ExtensionDefinition<TConfig>,
+): InternalExtensionDefinition<TConfig> {
+  const internal = overrides as InternalExtensionDefinition<TConfig>;
   if (internal.$$type !== '@backstage/ExtensionDefinition') {
     throw new Error(
       `Invalid extension definition instance, bad type '${internal.$$type}'`,
@@ -181,69 +147,38 @@ export function createExtension<
   TConfig = never,
 >(
   options: CreateExtensionOptions<TOutput, TInputs, TConfig>,
-): ExtensionDefinition<TConfig, TInputs> {
-  const {
-    kind,
-    namespace,
-    name,
-    attachTo,
-    disabled = false,
-    inputs = {} as TInputs,
-    output,
-    configSchema,
-    factory,
-  } = options;
-
+): ExtensionDefinition<TConfig> {
   return {
     $$type: '@backstage/ExtensionDefinition',
     version: 'v1',
-    kind,
-    namespace,
-    name,
-    attachTo,
-    disabled,
-    inputs,
-    output,
-    configSchema,
-    factory({ inputs: factoryInputs, ...rest }) {
+    kind: options.kind,
+    namespace: options.namespace,
+    name: options.name,
+    attachTo: options.attachTo,
+    disabled: options.disabled ?? false,
+    inputs: options.inputs ?? {},
+    output: options.output,
+    configSchema: options.configSchema,
+    factory({ inputs, ...rest }) {
       // TODO: Simplify this, but TS wouldn't infer the input type for some reason
-      return factory({
-        inputs: factoryInputs as Expand<ResolvedExtensionInputs<TInputs>>,
+      return options.factory({
+        inputs: inputs as Expand<ResolvedExtensionInputs<TInputs>>,
         ...rest,
       });
     },
     toString() {
       const parts: string[] = [];
-      if (kind) {
-        parts.push(`kind=${kind}`);
+      if (options.kind) {
+        parts.push(`kind=${options.kind}`);
       }
-      if (namespace) {
-        parts.push(`namespace=${namespace}`);
+      if (options.namespace) {
+        parts.push(`namespace=${options.namespace}`);
       }
-      if (name) {
-        parts.push(`name=${name}`);
+      if (options.name) {
+        parts.push(`name=${options.name}`);
       }
-      parts.push(`attachTo=${attachTo.id}@${attachTo.input}`);
+      parts.push(`attachTo=${options.attachTo.id}@${options.attachTo.input}`);
       return `ExtensionDefinition{${parts.join(',')}}`;
     },
-    override<TOverrideInputs extends AnyExtensionInputMap>(
-      overrides: ExtensionDefinitionOverrides<
-        TConfig,
-        TInputs,
-        TOverrideInputs
-      >,
-    ): ExtensionDefinition<TConfig, TInputs> {
-      return createExtension({
-        kind,
-        namespace,
-        name,
-        attachTo: overrides.attachTo ?? attachTo,
-        disabled: overrides.disabled ?? disabled,
-        inputs: { ...inputs, ...overrides.inputs },
-        output,
-        configSchema,
-        factory,
-      });
-    },
-  } as InternalExtensionDefinition<TConfig, TInputs>;
+  } as InternalExtensionDefinition<TConfig>;
 }
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
index 3bdcd3a7cc..30c3e6ca44 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
@@ -64,6 +64,7 @@ describe('createExtensionKind', () => {
       },
       factory: expect.any(Function),
       toString: expect.any(Function),
+      override: expect.any(Function),
       version: 'v1',
     });
 
@@ -102,4 +103,167 @@ describe('createExtensionKind', () => {
     const { container } = createExtensionTester(extension).render();
     expect(container.querySelector('h2')).toHaveTextContent('Hello, world!');
   });
+
+  it('should allow calling of the default value from override', () => {
+    const TestExtension = createExtensionKind({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      factory(_, options: { text: string }) {
+        return {
+          element: <h1>{options.text}</h1>,
+        };
+      },
+    });
+
+    const extension = TestExtension.new({
+      name: 'my-extension',
+      options: {
+        text: 'Hello, world!',
+      },
+      factory({ originalFactory }, options: { text: string }) {
+        const { element } = originalFactory();
+        return {
+          element: (
+            <h2>
+              {options.text}
+              {element}
+            </h2>
+          ),
+        };
+      },
+    });
+
+    expect(extension).toBeDefined();
+
+    const { container } = createExtensionTester(extension).render();
+
+    expect(container.querySelector('h2 h1')).toHaveTextContent('Hello, world!');
+  });
+
+  it('should allow overriding options of the default value from override', () => {
+    const TestExtension = createExtensionKind({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      factory(_, options: { text: string }) {
+        return {
+          element: <h1>{options.text}</h1>,
+        };
+      },
+    });
+
+    const extension = TestExtension.new({
+      name: 'my-extension',
+      options: {
+        text: 'Hello, world!',
+      },
+      factory({ originalFactory }, options: { text: string }) {
+        const { element } = originalFactory(undefined, { text: 'nothing!' });
+        return {
+          element: (
+            <h2>
+              {options.text}
+              {element}
+            </h2>
+          ),
+        };
+      },
+    });
+
+    expect(extension).toBeDefined();
+
+    const { container } = createExtensionTester(extension).render();
+
+    expect(container.querySelector('h2 h1')).toHaveTextContent('nothing!');
+  });
+
+  describe('override', () => {
+    it('should allow overriding of the default factory', () => {
+      const TestExtension = createExtensionKind({
+        kind: 'test-extension',
+        attachTo: { id: 'test', input: 'default' },
+        output: {
+          element: coreExtensionData.reactElement,
+        },
+        factory(_, options: { text: string }) {
+          return {
+            element: <h1>{options.text}</h1>,
+          };
+        },
+      });
+
+      const extension = TestExtension.new({
+        name: 'my-extension',
+        options: {
+          text: 'Hello, world!',
+        },
+        factory(_, options: { text: string }) {
+          return {
+            element: <h2>{options.text}</h2>,
+          };
+        },
+      });
+
+      const overridden = extension.override({
+        factory({ originalFactory }, { text }) {
+          return {
+            element: (
+              <div>
+                {originalFactory().element}
+                <h3>{text}</h3>
+              </div>
+            ),
+          };
+        },
+      });
+
+      const { container } = createExtensionTester(overridden).render();
+      expect(container.querySelector('h2')).toHaveTextContent('Hello, world!');
+      expect(container.querySelector('h3')).toHaveTextContent('Hello, world!');
+    });
+  });
+
+  it('should allow calling the kind factory if another factory is not defined in the instance', () => {
+    const TestExtension = createExtensionKind({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      factory(_, options: { text: string }) {
+        return {
+          element: <h1>{options.text}</h1>,
+        };
+      },
+    });
+
+    const extension = TestExtension.new({
+      name: 'my-extension',
+      options: {
+        text: 'Hello, world!',
+      },
+    });
+
+    const overridden = extension.override({
+      factory({ originalFactory }, { text }) {
+        return {
+          element: (
+            <div>
+              {originalFactory().element}
+              <h3>{text}</h3>
+            </div>
+          ),
+        };
+      },
+    });
+
+    const { container } = createExtensionTester(overridden).render();
+    expect(container.querySelector('h1')).toHaveTextContent('Hello, world!');
+    expect(container.querySelector('h3')).toHaveTextContent('Hello, world!');
+  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
index 353fb8ab70..9813c9e50c 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { AppNode } from '../apis';
 import { PortableSchema } from '../schema';
 import { Expand } from '../types';
@@ -52,6 +53,76 @@ export interface CreateExtensionKindOptions<
   ): Expand<ExtensionDataValues<TOutput>>;
 }
 
+/**
+ * @public
+ */
+export interface CreateExtensionKindInstanceOptions<
+  TOptions,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  namespace?: string;
+  name?: string;
+  attachTo?: { id: string; input: string };
+  disabled?: boolean;
+  inputs?: TInputs;
+  output?: TOutput;
+  configSchema?: PortableSchema<TConfig>;
+  options: TOptions;
+  factory?(
+    context: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+      originalFactory(
+        context?: {
+          node?: AppNode;
+          config?: TConfig;
+          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+        },
+        options?: TOptions,
+      ): Expand<ExtensionDataValues<TOutput>>;
+    },
+    options: TOptions,
+  ): Expand<ExtensionDataValues<TOutput>>;
+}
+
+/**
+ * @public
+ */
+export interface CreateExtensionOverrideKindInstanceOptions<
+  TOptions,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  namespace?: string;
+  name?: string;
+  attachTo?: { id: string; input: string };
+  disabled?: boolean;
+  inputs?: TInputs;
+  output?: TOutput;
+  configSchema?: PortableSchema<TConfig>;
+  options?: TOptions;
+  factory?(
+    context: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+      originalFactory(
+        context?: {
+          node?: AppNode;
+          config?: TConfig;
+          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+        },
+        options?: TOptions,
+      ): Expand<ExtensionDataValues<TOutput>>;
+    },
+    options: TOptions,
+  ): Expand<ExtensionDataValues<TOutput>>;
+}
+
 /**
  * TODO: should we export an interface instead of a concrete class?
  * @public
@@ -74,7 +145,7 @@ export class ExtensionKind<
   }
 
   private constructor(
-    private readonly options: CreateExtensionKindOptions<
+    private readonly kindProperties: CreateExtensionKindOptions<
       TOptions,
       TInputs,
       TOutput,
@@ -82,49 +153,41 @@ export class ExtensionKind<
     >,
   ) {}
 
-  public new(args: {
-    namespace?: string;
-    name?: string;
-    attachTo?: { id: string; input: string };
-    disabled?: boolean;
-    inputs?: TInputs;
-    output?: TOutput;
-    configSchema?: PortableSchema<TConfig>;
-    options: TOptions;
-    factory?(
-      context: {
-        node: AppNode;
-        config: TConfig;
-        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-        orignalFactory(
-          context?: {
-            node?: AppNode;
-            config?: TConfig;
-            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-          },
-          options?: TOptions,
-        ): Expand<ExtensionDataValues<TOutput>>;
-      },
-      options: TOptions,
-    ): Expand<ExtensionDataValues<TOutput>>;
-  }): ExtensionDefinition<TConfig, TInputs> {
-    return createExtension({
-      kind: this.options.kind,
-      namespace: args.namespace ?? this.options.namespace,
-      name: args.name ?? this.options.name,
-      attachTo: args.attachTo ?? this.options.attachTo,
-      disabled: args.disabled ?? this.options.disabled,
-      inputs: args.inputs ?? this.options.inputs,
-      output: args.output ?? this.options.output,
-      configSchema: args.configSchema ?? this.options.configSchema, // TODO: some config merging or smth
+  public new(
+    instanceProperties: CreateExtensionKindInstanceOptions<
+      TOptions,
+      TInputs,
+      TOutput,
+      TConfig
+    >,
+  ): ExtensionDefinition<TConfig> & {
+    override: (
+      overrides: CreateExtensionOverrideKindInstanceOptions<
+        TOptions,
+        TInputs,
+        TOutput,
+        TConfig
+      >,
+    ) => ExtensionDefinition<TConfig>;
+  } {
+    const extension = createExtension({
+      kind: this.kindProperties.kind,
+      namespace: instanceProperties.namespace ?? this.kindProperties.namespace,
+      name: instanceProperties.name ?? this.kindProperties.name,
+      attachTo: instanceProperties.attachTo ?? this.kindProperties.attachTo,
+      disabled: instanceProperties.disabled ?? this.kindProperties.disabled,
+      inputs: instanceProperties.inputs ?? this.kindProperties.inputs,
+      output: instanceProperties.output ?? this.kindProperties.output,
+      configSchema:
+        instanceProperties.configSchema ?? this.kindProperties.configSchema, // TODO: some config merging or smth
       factory: ({ node, config, inputs }) => {
-        if (args.factory) {
-          return args.factory(
+        if (instanceProperties.factory) {
+          return instanceProperties.factory(
             {
               node,
               config,
               inputs,
-              orignalFactory: (
+              originalFactory: (
                 innerContext?: {
                   node?: AppNode;
                   config?: TConfig;
@@ -132,29 +195,123 @@ export class ExtensionKind<
                 },
                 innerOptions?: TOptions,
               ) =>
-                this.options.factory(
+                this.kindProperties.factory(
                   {
                     node: innerContext?.node ?? node,
                     config: innerContext?.config ?? config,
                     inputs: innerContext?.inputs ?? inputs,
                   },
-                  innerOptions ?? args.options,
+                  innerOptions ?? instanceProperties.options,
                 ),
             },
-            args.options,
+            instanceProperties.options,
           );
         }
 
-        return this.options.factory(
+        return this.kindProperties.factory(
           {
             node,
             config,
             inputs,
           },
-          args.options,
+          instanceProperties.options,
         );
       },
     });
+
+    return {
+      ...extension,
+      override: overrides => {
+        return createExtension({
+          kind: this.kindProperties.kind,
+          namespace:
+            overrides.namespace ??
+            instanceProperties.namespace ??
+            this.kindProperties.namespace,
+          name:
+            overrides.name ??
+            instanceProperties.name ??
+            this.kindProperties.name,
+          attachTo:
+            overrides.attachTo ??
+            instanceProperties.attachTo ??
+            this.kindProperties.attachTo,
+          disabled:
+            overrides.disabled ??
+            instanceProperties.disabled ??
+            this.kindProperties.disabled,
+          inputs:
+            overrides.inputs ??
+            instanceProperties.inputs ??
+            this.kindProperties.inputs,
+          output:
+            overrides.output ??
+            instanceProperties.output ??
+            this.kindProperties.output,
+          configSchema:
+            overrides.configSchema ??
+            instanceProperties.configSchema ??
+            this.kindProperties.configSchema, // TODO: some config merging or smth
+          factory: ({ node, config, inputs }) => {
+            if (overrides.factory) {
+              return overrides.factory(
+                {
+                  node,
+                  config,
+                  inputs,
+                  originalFactory: (
+                    innerContext?: {
+                      node?: AppNode;
+                      config?: TConfig;
+                      inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+                    },
+                    innerOptions?: TOptions,
+                  ) =>
+                    instanceProperties.factory?.(
+                      {
+                        node: innerContext?.node ?? node,
+                        config: innerContext?.config ?? config,
+                        inputs: innerContext?.inputs ?? inputs,
+                        originalFactory: this.kindProperties.factory,
+                      },
+                      innerOptions ?? instanceProperties.options,
+                    ) ??
+                    this.kindProperties.factory(
+                      {
+                        node,
+                        config,
+                        inputs,
+                      },
+                      innerOptions ?? instanceProperties.options,
+                    ),
+                },
+                instanceProperties.options,
+              );
+            }
+
+            return (
+              instanceProperties.factory?.(
+                {
+                  node,
+                  config,
+                  inputs,
+                  originalFactory: this.kindProperties.factory,
+                },
+                instanceProperties.options,
+              ) ??
+              this.kindProperties.factory(
+                {
+                  node,
+                  config,
+                  inputs,
+                },
+                instanceProperties.options,
+              )
+            );
+          },
+        });
+      },
+    };
   }
 }
 
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index 8fe9dc3a54..a312c0f06f 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -49,7 +49,9 @@ export {
   type FrontendFeature,
 } from './types';
 export {
-  type CreateExtensionKindOptions as ExtensionKindOptions,
+  type CreateExtensionKindOptions,
+  type CreateExtensionKindInstanceOptions,
+  type CreateExtensionOverrideKindInstanceOptions,
   ExtensionKind,
   createExtensionKind,
 } from './createExtensionKind';

From 6b6cbdaac5cf05702210e9c24ccb4272c3ba3e88 Mon Sep 17 00:00:00 2001
From: Ben Lambert <ben@blam.sh>
Date: Thu, 18 Jul 2024 13:07:02 +0200
Subject: [PATCH 082/225] Revert "NFE: Make it possible to override existing
 extension instances"

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-plugin-api/api-report.md    | 214 +++++----------
 .../src/wiring/createExtension.ts             |   4 +-
 .../src/wiring/createExtensionKind.test.tsx   | 164 ------------
 .../src/wiring/createExtensionKind.ts         | 245 ++++--------------
 .../frontend-plugin-api/src/wiring/index.ts   |   4 +-
 5 files changed, 115 insertions(+), 516 deletions(-)

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 6a04d04cd6..48718f5375 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -529,91 +529,9 @@ export function createExtensionKind<
   TOutput extends AnyExtensionDataMap,
   TConfig,
 >(
-  options: CreateExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
+  options: ExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
 ): ExtensionKind<TOptions, TInputs, TOutput, TConfig>;
 
-// @public (undocumented)
-export interface CreateExtensionKindInstanceOptions<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
-> {
-  // (undocumented)
-  attachTo?: {
-    id: string;
-    input: string;
-  };
-  // (undocumented)
-  configSchema?: PortableSchema<TConfig>;
-  // (undocumented)
-  disabled?: boolean;
-  // (undocumented)
-  factory?(
-    context: {
-      node: AppNode;
-      config: TConfig;
-      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-      originalFactory(
-        context?: {
-          node?: AppNode;
-          config?: TConfig;
-          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-        },
-        options?: TOptions,
-      ): Expand<ExtensionDataValues<TOutput>>;
-    },
-    options: TOptions,
-  ): Expand<ExtensionDataValues<TOutput>>;
-  // (undocumented)
-  inputs?: TInputs;
-  // (undocumented)
-  name?: string;
-  // (undocumented)
-  namespace?: string;
-  // (undocumented)
-  options: TOptions;
-  // (undocumented)
-  output?: TOutput;
-}
-
-// @public (undocumented)
-export interface CreateExtensionKindOptions<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
-> {
-  // (undocumented)
-  attachTo: {
-    id: string;
-    input: string;
-  };
-  // (undocumented)
-  configSchema?: PortableSchema<TConfig>;
-  // (undocumented)
-  disabled?: boolean;
-  // (undocumented)
-  factory(
-    context: {
-      node: AppNode;
-      config: TConfig;
-      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-    },
-    options: TOptions,
-  ): Expand<ExtensionDataValues<TOutput>>;
-  // (undocumented)
-  inputs?: TInputs;
-  // (undocumented)
-  kind: string;
-  // (undocumented)
-  name?: string;
-  // (undocumented)
-  namespace?: string;
-  // (undocumented)
-  output: TOutput;
-}
-
 // @public (undocumented)
 export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
@@ -630,7 +548,7 @@ export interface CreateExtensionOptions<
   // (undocumented)
   disabled?: boolean;
   // (undocumented)
-  factory(options: {
+  factory(context: {
     node: AppNode;
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
@@ -647,51 +565,6 @@ export interface CreateExtensionOptions<
   output: TOutput;
 }
 
-// @public (undocumented)
-export interface CreateExtensionOverrideKindInstanceOptions<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
-> {
-  // (undocumented)
-  attachTo?: {
-    id: string;
-    input: string;
-  };
-  // (undocumented)
-  configSchema?: PortableSchema<TConfig>;
-  // (undocumented)
-  disabled?: boolean;
-  // (undocumented)
-  factory?(
-    context: {
-      node: AppNode;
-      config: TConfig;
-      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-      originalFactory(
-        context?: {
-          node?: AppNode;
-          config?: TConfig;
-          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-        },
-        options?: TOptions,
-      ): Expand<ExtensionDataValues<TOutput>>;
-    },
-    options: TOptions,
-  ): Expand<ExtensionDataValues<TOutput>>;
-  // (undocumented)
-  inputs?: TInputs;
-  // (undocumented)
-  name?: string;
-  // (undocumented)
-  namespace?: string;
-  // (undocumented)
-  options?: TOptions;
-  // (undocumented)
-  output?: TOutput;
-}
-
 // @public (undocumented)
 export function createExtensionOverrides(
   options: ExtensionOverridesOptions,
@@ -1064,26 +937,75 @@ export class ExtensionKind<
     TOutput extends AnyExtensionDataMap,
     TConfig,
   >(
-    options: CreateExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
+    options: ExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
   ): ExtensionKind<TOptions, TInputs, TOutput, TConfig>;
   // (undocumented)
-  new(
-    instanceProperties: CreateExtensionKindInstanceOptions<
-      TOptions,
-      TInputs,
-      TOutput,
-      TConfig
-    >,
-  ): ExtensionDefinition<TConfig> & {
-    override: (
-      overrides: CreateExtensionOverrideKindInstanceOptions<
-        TOptions,
-        TInputs,
-        TOutput,
-        TConfig
-      >,
-    ) => ExtensionDefinition<TConfig>;
+  new(args: {
+    namespace?: string;
+    name?: string;
+    attachTo?: {
+      id: string;
+      input: string;
+    };
+    disabled?: boolean;
+    inputs?: TInputs;
+    output?: TOutput;
+    configSchema?: PortableSchema<TConfig>;
+    options: TOptions;
+    factory?(
+      context: {
+        node: AppNode;
+        config: TConfig;
+        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+        orignalFactory(
+          context?: {
+            node?: AppNode;
+            config?: TConfig;
+            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+          },
+          options?: TOptions,
+        ): Expand<ExtensionDataValues<TOutput>>;
+      },
+      options: TOptions,
+    ): Expand<ExtensionDataValues<TOutput>>;
+  }): ExtensionDefinition<TConfig>;
+}
+
+// @public (undocumented)
+export interface ExtensionKindOptions<
+  TOptions,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  // (undocumented)
+  attachTo: {
+    id: string;
+    input: string;
   };
+  // (undocumented)
+  configSchema?: PortableSchema<TConfig>;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  factory(
+    context: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+    },
+    options: TOptions,
+  ): Expand<ExtensionDataValues<TOutput>>;
+  // (undocumented)
+  inputs?: TInputs;
+  // (undocumented)
+  kind: string;
+  // (undocumented)
+  name?: string;
+  // (undocumented)
+  namespace?: string;
+  // (undocumented)
+  output: TOutput;
 }
 
 // @public (undocumented)
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index be76fbc069..28dc6a4e29 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -91,7 +91,7 @@ export interface CreateExtensionOptions<
   inputs?: TInputs;
   output: TOutput;
   configSchema?: PortableSchema<TConfig>;
-  factory(options: {
+  factory(context: {
     node: AppNode;
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
@@ -115,7 +115,7 @@ export interface InternalExtensionDefinition<TConfig>
   readonly version: 'v1';
   readonly inputs: AnyExtensionInputMap;
   readonly output: AnyExtensionDataMap;
-  factory(options: {
+  factory(context: {
     node: AppNode;
     config: TConfig;
     inputs: ResolvedExtensionInputs<any>;
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
index 30c3e6ca44..3bdcd3a7cc 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
@@ -64,7 +64,6 @@ describe('createExtensionKind', () => {
       },
       factory: expect.any(Function),
       toString: expect.any(Function),
-      override: expect.any(Function),
       version: 'v1',
     });
 
@@ -103,167 +102,4 @@ describe('createExtensionKind', () => {
     const { container } = createExtensionTester(extension).render();
     expect(container.querySelector('h2')).toHaveTextContent('Hello, world!');
   });
-
-  it('should allow calling of the default value from override', () => {
-    const TestExtension = createExtensionKind({
-      kind: 'test-extension',
-      attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
-      factory(_, options: { text: string }) {
-        return {
-          element: <h1>{options.text}</h1>,
-        };
-      },
-    });
-
-    const extension = TestExtension.new({
-      name: 'my-extension',
-      options: {
-        text: 'Hello, world!',
-      },
-      factory({ originalFactory }, options: { text: string }) {
-        const { element } = originalFactory();
-        return {
-          element: (
-            <h2>
-              {options.text}
-              {element}
-            </h2>
-          ),
-        };
-      },
-    });
-
-    expect(extension).toBeDefined();
-
-    const { container } = createExtensionTester(extension).render();
-
-    expect(container.querySelector('h2 h1')).toHaveTextContent('Hello, world!');
-  });
-
-  it('should allow overriding options of the default value from override', () => {
-    const TestExtension = createExtensionKind({
-      kind: 'test-extension',
-      attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
-      factory(_, options: { text: string }) {
-        return {
-          element: <h1>{options.text}</h1>,
-        };
-      },
-    });
-
-    const extension = TestExtension.new({
-      name: 'my-extension',
-      options: {
-        text: 'Hello, world!',
-      },
-      factory({ originalFactory }, options: { text: string }) {
-        const { element } = originalFactory(undefined, { text: 'nothing!' });
-        return {
-          element: (
-            <h2>
-              {options.text}
-              {element}
-            </h2>
-          ),
-        };
-      },
-    });
-
-    expect(extension).toBeDefined();
-
-    const { container } = createExtensionTester(extension).render();
-
-    expect(container.querySelector('h2 h1')).toHaveTextContent('nothing!');
-  });
-
-  describe('override', () => {
-    it('should allow overriding of the default factory', () => {
-      const TestExtension = createExtensionKind({
-        kind: 'test-extension',
-        attachTo: { id: 'test', input: 'default' },
-        output: {
-          element: coreExtensionData.reactElement,
-        },
-        factory(_, options: { text: string }) {
-          return {
-            element: <h1>{options.text}</h1>,
-          };
-        },
-      });
-
-      const extension = TestExtension.new({
-        name: 'my-extension',
-        options: {
-          text: 'Hello, world!',
-        },
-        factory(_, options: { text: string }) {
-          return {
-            element: <h2>{options.text}</h2>,
-          };
-        },
-      });
-
-      const overridden = extension.override({
-        factory({ originalFactory }, { text }) {
-          return {
-            element: (
-              <div>
-                {originalFactory().element}
-                <h3>{text}</h3>
-              </div>
-            ),
-          };
-        },
-      });
-
-      const { container } = createExtensionTester(overridden).render();
-      expect(container.querySelector('h2')).toHaveTextContent('Hello, world!');
-      expect(container.querySelector('h3')).toHaveTextContent('Hello, world!');
-    });
-  });
-
-  it('should allow calling the kind factory if another factory is not defined in the instance', () => {
-    const TestExtension = createExtensionKind({
-      kind: 'test-extension',
-      attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
-      factory(_, options: { text: string }) {
-        return {
-          element: <h1>{options.text}</h1>,
-        };
-      },
-    });
-
-    const extension = TestExtension.new({
-      name: 'my-extension',
-      options: {
-        text: 'Hello, world!',
-      },
-    });
-
-    const overridden = extension.override({
-      factory({ originalFactory }, { text }) {
-        return {
-          element: (
-            <div>
-              {originalFactory().element}
-              <h3>{text}</h3>
-            </div>
-          ),
-        };
-      },
-    });
-
-    const { container } = createExtensionTester(overridden).render();
-    expect(container.querySelector('h1')).toHaveTextContent('Hello, world!');
-    expect(container.querySelector('h3')).toHaveTextContent('Hello, world!');
-  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
index 9813c9e50c..52bf711822 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
@@ -21,7 +21,6 @@ import {
   AnyExtensionDataMap,
   AnyExtensionInputMap,
   ExtensionDataValues,
-  ExtensionDefinition,
   ResolvedExtensionInputs,
   createExtension,
 } from './createExtension';
@@ -53,76 +52,6 @@ export interface CreateExtensionKindOptions<
   ): Expand<ExtensionDataValues<TOutput>>;
 }
 
-/**
- * @public
- */
-export interface CreateExtensionKindInstanceOptions<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
-> {
-  namespace?: string;
-  name?: string;
-  attachTo?: { id: string; input: string };
-  disabled?: boolean;
-  inputs?: TInputs;
-  output?: TOutput;
-  configSchema?: PortableSchema<TConfig>;
-  options: TOptions;
-  factory?(
-    context: {
-      node: AppNode;
-      config: TConfig;
-      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-      originalFactory(
-        context?: {
-          node?: AppNode;
-          config?: TConfig;
-          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-        },
-        options?: TOptions,
-      ): Expand<ExtensionDataValues<TOutput>>;
-    },
-    options: TOptions,
-  ): Expand<ExtensionDataValues<TOutput>>;
-}
-
-/**
- * @public
- */
-export interface CreateExtensionOverrideKindInstanceOptions<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
-> {
-  namespace?: string;
-  name?: string;
-  attachTo?: { id: string; input: string };
-  disabled?: boolean;
-  inputs?: TInputs;
-  output?: TOutput;
-  configSchema?: PortableSchema<TConfig>;
-  options?: TOptions;
-  factory?(
-    context: {
-      node: AppNode;
-      config: TConfig;
-      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-      originalFactory(
-        context?: {
-          node?: AppNode;
-          config?: TConfig;
-          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-        },
-        options?: TOptions,
-      ): Expand<ExtensionDataValues<TOutput>>;
-    },
-    options: TOptions,
-  ): Expand<ExtensionDataValues<TOutput>>;
-}
-
 /**
  * TODO: should we export an interface instead of a concrete class?
  * @public
@@ -145,7 +74,7 @@ export class ExtensionKind<
   }
 
   private constructor(
-    private readonly kindProperties: CreateExtensionKindOptions<
+    private readonly options: CreateExtensionKindOptions<
       TOptions,
       TInputs,
       TOutput,
@@ -153,41 +82,49 @@ export class ExtensionKind<
     >,
   ) {}
 
-  public new(
-    instanceProperties: CreateExtensionKindInstanceOptions<
-      TOptions,
-      TInputs,
-      TOutput,
-      TConfig
-    >,
-  ): ExtensionDefinition<TConfig> & {
-    override: (
-      overrides: CreateExtensionOverrideKindInstanceOptions<
-        TOptions,
-        TInputs,
-        TOutput,
-        TConfig
-      >,
-    ) => ExtensionDefinition<TConfig>;
-  } {
-    const extension = createExtension({
-      kind: this.kindProperties.kind,
-      namespace: instanceProperties.namespace ?? this.kindProperties.namespace,
-      name: instanceProperties.name ?? this.kindProperties.name,
-      attachTo: instanceProperties.attachTo ?? this.kindProperties.attachTo,
-      disabled: instanceProperties.disabled ?? this.kindProperties.disabled,
-      inputs: instanceProperties.inputs ?? this.kindProperties.inputs,
-      output: instanceProperties.output ?? this.kindProperties.output,
-      configSchema:
-        instanceProperties.configSchema ?? this.kindProperties.configSchema, // TODO: some config merging or smth
+  public new(args: {
+    namespace?: string;
+    name?: string;
+    attachTo?: { id: string; input: string };
+    disabled?: boolean;
+    inputs?: TInputs;
+    output?: TOutput;
+    configSchema?: PortableSchema<TConfig>;
+    options: TOptions;
+    factory?(
+      context: {
+        node: AppNode;
+        config: TConfig;
+        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+        orignalFactory(
+          context?: {
+            node?: AppNode;
+            config?: TConfig;
+            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+          },
+          options?: TOptions,
+        ): Expand<ExtensionDataValues<TOutput>>;
+      },
+      options: TOptions,
+    ): Expand<ExtensionDataValues<TOutput>>;
+  }) {
+    return createExtension({
+      kind: this.options.kind,
+      namespace: args.namespace ?? this.options.namespace,
+      name: args.name ?? this.options.name,
+      attachTo: args.attachTo ?? this.options.attachTo,
+      disabled: args.disabled ?? this.options.disabled,
+      inputs: args.inputs ?? this.options.inputs,
+      output: args.output ?? this.options.output,
+      configSchema: args.configSchema ?? this.options.configSchema, // TODO: some config merging or smth
       factory: ({ node, config, inputs }) => {
-        if (instanceProperties.factory) {
-          return instanceProperties.factory(
+        if (args.factory) {
+          return args.factory(
             {
               node,
               config,
               inputs,
-              originalFactory: (
+              orignalFactory: (
                 innerContext?: {
                   node?: AppNode;
                   config?: TConfig;
@@ -195,123 +132,29 @@ export class ExtensionKind<
                 },
                 innerOptions?: TOptions,
               ) =>
-                this.kindProperties.factory(
+                this.options.factory(
                   {
                     node: innerContext?.node ?? node,
                     config: innerContext?.config ?? config,
                     inputs: innerContext?.inputs ?? inputs,
                   },
-                  innerOptions ?? instanceProperties.options,
+                  innerOptions ?? args.options,
                 ),
             },
-            instanceProperties.options,
+            args.options,
           );
         }
 
-        return this.kindProperties.factory(
+        return this.options.factory(
           {
             node,
             config,
             inputs,
           },
-          instanceProperties.options,
+          args.options,
         );
       },
     });
-
-    return {
-      ...extension,
-      override: overrides => {
-        return createExtension({
-          kind: this.kindProperties.kind,
-          namespace:
-            overrides.namespace ??
-            instanceProperties.namespace ??
-            this.kindProperties.namespace,
-          name:
-            overrides.name ??
-            instanceProperties.name ??
-            this.kindProperties.name,
-          attachTo:
-            overrides.attachTo ??
-            instanceProperties.attachTo ??
-            this.kindProperties.attachTo,
-          disabled:
-            overrides.disabled ??
-            instanceProperties.disabled ??
-            this.kindProperties.disabled,
-          inputs:
-            overrides.inputs ??
-            instanceProperties.inputs ??
-            this.kindProperties.inputs,
-          output:
-            overrides.output ??
-            instanceProperties.output ??
-            this.kindProperties.output,
-          configSchema:
-            overrides.configSchema ??
-            instanceProperties.configSchema ??
-            this.kindProperties.configSchema, // TODO: some config merging or smth
-          factory: ({ node, config, inputs }) => {
-            if (overrides.factory) {
-              return overrides.factory(
-                {
-                  node,
-                  config,
-                  inputs,
-                  originalFactory: (
-                    innerContext?: {
-                      node?: AppNode;
-                      config?: TConfig;
-                      inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-                    },
-                    innerOptions?: TOptions,
-                  ) =>
-                    instanceProperties.factory?.(
-                      {
-                        node: innerContext?.node ?? node,
-                        config: innerContext?.config ?? config,
-                        inputs: innerContext?.inputs ?? inputs,
-                        originalFactory: this.kindProperties.factory,
-                      },
-                      innerOptions ?? instanceProperties.options,
-                    ) ??
-                    this.kindProperties.factory(
-                      {
-                        node,
-                        config,
-                        inputs,
-                      },
-                      innerOptions ?? instanceProperties.options,
-                    ),
-                },
-                instanceProperties.options,
-              );
-            }
-
-            return (
-              instanceProperties.factory?.(
-                {
-                  node,
-                  config,
-                  inputs,
-                  originalFactory: this.kindProperties.factory,
-                },
-                instanceProperties.options,
-              ) ??
-              this.kindProperties.factory(
-                {
-                  node,
-                  config,
-                  inputs,
-                },
-                instanceProperties.options,
-              )
-            );
-          },
-        });
-      },
-    };
   }
 }
 
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index a312c0f06f..8fe9dc3a54 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -49,9 +49,7 @@ export {
   type FrontendFeature,
 } from './types';
 export {
-  type CreateExtensionKindOptions,
-  type CreateExtensionKindInstanceOptions,
-  type CreateExtensionOverrideKindInstanceOptions,
+  type CreateExtensionKindOptions as ExtensionKindOptions,
   ExtensionKind,
   createExtensionKind,
 } from './createExtensionKind';

From b20c067c61abcfff3f158b7f4b6c5857dfbf347a Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Jul 2024 13:27:09 +0200
Subject: [PATCH 083/225] chore: fixing some code review comments

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/dry-squids-tap.md                  |   8 +-
 .../src/wiring/createExtensionKind.ts         | 108 +++++++++++-------
 2 files changed, 70 insertions(+), 46 deletions(-)

diff --git a/.changeset/dry-squids-tap.md b/.changeset/dry-squids-tap.md
index 9bd835d371..5a865395c0 100644
--- a/.changeset/dry-squids-tap.md
+++ b/.changeset/dry-squids-tap.md
@@ -14,17 +14,17 @@ const TestExtensionKind = createExtensionKind({
   output: {
     element: coreExtensionData.reactElement,
   },
-  factory(_, options: { text: string }) {
+  factory(_, params: { text: string }) {
     return {
-      element: <h1>{options.text}</h1>,
+      element: <h1>{params.text}</h1>,
     };
   },
 });
 
 // create an instance of the extension kind with props
-const testExtension = TestExtensionKind.new({
+const testExtension = TestExtensionKind.create({
   name: 'foo',
-  options: {
+  params: {
     text: 'Hello World',
   },
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
index 52bf711822..1212365712 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
@@ -21,6 +21,7 @@ import {
   AnyExtensionDataMap,
   AnyExtensionInputMap,
   ExtensionDataValues,
+  ExtensionDefinition,
   ResolvedExtensionInputs,
   createExtension,
 } from './createExtension';
@@ -29,14 +30,13 @@ import {
  * @public
  */
 export interface CreateExtensionKindOptions<
-  TOptions,
+  TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
 > {
   kind: string;
   namespace?: string;
-  name?: string;
   attachTo: { id: string; input: string };
   disabled?: boolean;
   inputs?: TInputs;
@@ -48,41 +48,20 @@ export interface CreateExtensionKindOptions<
       config: TConfig;
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
-    options: TOptions,
+    params: TParams,
   ): Expand<ExtensionDataValues<TOutput>>;
 }
 
 /**
- * TODO: should we export an interface instead of a concrete class?
  * @public
  */
-export class ExtensionKind<
-  TOptions,
+export interface ExtensionKind<
+  TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
 > {
-  static create<
-    TOptions,
-    TInputs extends AnyExtensionInputMap,
-    TOutput extends AnyExtensionDataMap,
-    TConfig,
-  >(
-    options: CreateExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
-  ): ExtensionKind<TOptions, TInputs, TOutput, TConfig> {
-    return new ExtensionKind(options);
-  }
-
-  private constructor(
-    private readonly options: CreateExtensionKindOptions<
-      TOptions,
-      TInputs,
-      TOutput,
-      TConfig
-    >,
-  ) {}
-
-  public new(args: {
+  create(args: {
     namespace?: string;
     name?: string;
     attachTo?: { id: string; input: string };
@@ -90,7 +69,7 @@ export class ExtensionKind<
     inputs?: TInputs;
     output?: TOutput;
     configSchema?: PortableSchema<TConfig>;
-    options: TOptions;
+    params: TParams;
     factory?(
       context: {
         node: AppNode;
@@ -98,20 +77,64 @@ export class ExtensionKind<
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         orignalFactory(
           context?: {
-            node?: AppNode;
             config?: TConfig;
             inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
           },
-          options?: TOptions,
+          params?: TParams,
         ): Expand<ExtensionDataValues<TOutput>>;
       },
-      options: TOptions,
+      params: TParams,
     ): Expand<ExtensionDataValues<TOutput>>;
-  }) {
+  }): ExtensionDefinition<TConfig>;
+}
+
+/**
+ * @internal
+ */
+class ExtensionKindImpl<
+  TParams,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  constructor(
+    private readonly options: CreateExtensionKindOptions<
+      TParams,
+      TInputs,
+      TOutput,
+      TConfig
+    >,
+  ) {}
+
+  public create(args: {
+    namespace?: string;
+    name?: string;
+    attachTo?: { id: string; input: string };
+    disabled?: boolean;
+    inputs?: TInputs;
+    output?: TOutput;
+    configSchema?: PortableSchema<TConfig>;
+    params: TParams;
+    factory?(
+      context: {
+        node: AppNode;
+        config: TConfig;
+        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+        orignalFactory(
+          context?: {
+            config?: TConfig;
+            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+          },
+          params?: TParams,
+        ): Expand<ExtensionDataValues<TOutput>>;
+      },
+      params: TParams,
+    ): Expand<ExtensionDataValues<TOutput>>;
+  }): ExtensionDefinition<TConfig> {
     return createExtension({
       kind: this.options.kind,
       namespace: args.namespace ?? this.options.namespace,
-      name: args.name ?? this.options.name,
+      name: args.name,
       attachTo: args.attachTo ?? this.options.attachTo,
       disabled: args.disabled ?? this.options.disabled,
       inputs: args.inputs ?? this.options.inputs,
@@ -126,22 +149,21 @@ export class ExtensionKind<
               inputs,
               orignalFactory: (
                 innerContext?: {
-                  node?: AppNode;
                   config?: TConfig;
                   inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
                 },
-                innerOptions?: TOptions,
+                innerParams?: TParams,
               ) =>
                 this.options.factory(
                   {
-                    node: innerContext?.node ?? node,
+                    node,
                     config: innerContext?.config ?? config,
                     inputs: innerContext?.inputs ?? inputs,
                   },
-                  innerOptions ?? args.options,
+                  innerParams ?? args.params,
                 ),
             },
-            args.options,
+            args.params,
           );
         }
 
@@ -151,7 +173,7 @@ export class ExtensionKind<
             config,
             inputs,
           },
-          args.options,
+          args.params,
         );
       },
     });
@@ -165,10 +187,12 @@ export class ExtensionKind<
  * @public
  */
 export function createExtensionKind<
-  TOptions,
+  TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
->(options: CreateExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>) {
-  return ExtensionKind.create(options);
+>(
+  options: CreateExtensionKindOptions<TParams, TInputs, TOutput, TConfig>,
+): ExtensionKind<TParams, TInputs, TOutput, TConfig> {
+  return new ExtensionKindImpl(options);
 }

From 4e42e5112cd692ab40696b3970e016cba94b4456 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Jul 2024 13:50:26 +0200
Subject: [PATCH 084/225] chore: smaller renames and code review

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/dry-squids-tap.md                  |  6 ++--
 .../architecture/08-naming-patterns.md        | 20 ++++++-------
 ....tsx => createExtensionBlueprint.test.tsx} | 30 +++++++++----------
 ...ionKind.ts => createExtensionBlueprint.ts} | 22 +++++++-------
 .../frontend-plugin-api/src/wiring/index.ts   |  8 ++---
 5 files changed, 43 insertions(+), 43 deletions(-)
 rename packages/frontend-plugin-api/src/wiring/{createExtensionKind.test.tsx => createExtensionBlueprint.test.tsx} (77%)
 rename packages/frontend-plugin-api/src/wiring/{createExtensionKind.ts => createExtensionBlueprint.ts} (90%)

diff --git a/.changeset/dry-squids-tap.md b/.changeset/dry-squids-tap.md
index 5a865395c0..879ecb5d14 100644
--- a/.changeset/dry-squids-tap.md
+++ b/.changeset/dry-squids-tap.md
@@ -8,8 +8,8 @@ This allows the creation of extension with the following pattern:
 
 ```tsx
 // create the extension kind
-const TestExtensionKind = createExtensionKind({
-  kind: 'test-extension',
+const EntityCardBlueprint = createExtensionBlueprint({
+  kind: 'entity-card',
   attachTo: { id: 'test', input: 'default' },
   output: {
     element: coreExtensionData.reactElement,
@@ -22,7 +22,7 @@ const TestExtensionKind = createExtensionKind({
 });
 
 // create an instance of the extension kind with props
-const testExtension = TestExtensionKind.create({
+const testExtension = EntityCardBlueprint.make({
   name: 'foo',
   params: {
     text: 'Hello World',
diff --git a/docs/frontend-system/architecture/08-naming-patterns.md b/docs/frontend-system/architecture/08-naming-patterns.md
index 0916d9fd51..a17525f3ce 100644
--- a/docs/frontend-system/architecture/08-naming-patterns.md
+++ b/docs/frontend-system/architecture/08-naming-patterns.md
@@ -38,33 +38,31 @@ Note that while we use this naming pattern for the plugin instance this is only
 
 | Description | Pattern                         | Examples                                                            |
 | ----------- | ------------------------------- | ------------------------------------------------------------------- |
-| Creator     | `create<Kind>Extension`         | `createPageExtension`, `createEntityCardExtension`                  |
+| Blueprint   | `<Kind>Blueprint`               | `PageBlueprint`, `EntityCardBlueprint`                              |
 | ID          | `[<kind>:]<namespace>[/<name>]` | `'core.nav'`, `'page:user-settings'`, `'entity-card:catalog/about'` |
 | Symbol      | `<namespace>[<Name>][<Kind>]`   | `coreNav`, `userSettingsPage`, `catalogAboutEntityCard`             |
 
-When you create a new extension you never provide the ID directly. Instead, you indirectly or directly provide the kind, namespace, and name parts that make up the ID. The kind is always provided by the extension creator function used to create the extension, the only exception is if you use `createExtension` directly. Any extension that is provided by a plugin will by default have its namespace set to the plugin ID, so you generally only need to provide an explicit namespace if you want to override an existing extension. The name is also optional, and primarily used to distinguish between multiple extensions of the same kind and namespace. If a plugin doesn't need to distinguish between different extensions of the same kind, the name can be omitted.
+When you create a new extension you never provide the ID directly. Instead, you indirectly or directly provide the kind, namespace, and name parts that make up the ID. The kind is always provided by the blueprint creator, the only exception is if you use `createExtension` directly. Any extension that is provided by a plugin will by default have its namespace set to the plugin ID, so you generally only need to provide an explicit namespace if you want to override an existing extension. The name is also optional, and primarily used to distinguish between multiple extensions of the same kind and namespace. If a plugin doesn't need to distinguish between different extensions of the same kind, the name can be omitted.
 
 Example:
 
 ```ts
-// This is an extension creator that is used to create an extension of the 'page' kind.
-export function createPageExtension(options) {
-  return createExtension({
-    kind: 'page', // Kinds are kebab-case
-    // ...options
-  });
-}
+// This is an extension blueprint that is used to create an extension of the 'page' kind.
+export const PageBlueprint = createExtensionBlueprint({
+  kind: 'page',
+  // ...
+});
 
 // The namespace is inferred from the plugin ID, in this case 'catalog'
 // The final ID for this extension will be 'page:catalog/entity'
-const catalogEntityPage = createPageExtension({
+const catalogEntityPage = PageBlueprint.make({
   name: 'entity',
   // ...
 });
 
 // The name is omitted, because the catalog plugin only provides a single extension of this kind
 // The final ID for this extension will be 'search-result-list-item:catalog'
-const catalogSearchResultListItem = createSearchResultListItemExtension({
+const catalogSearchResultListItem = SearchResultListItemBlueprint.make({
   // ...
 });
 
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
similarity index 77%
rename from packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
rename to packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index 3bdcd3a7cc..b3e926e57c 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -16,27 +16,27 @@
 
 import React from 'react';
 import { coreExtensionData } from './coreExtensionData';
-import { createExtensionKind } from './createExtensionKind';
+import { createExtensionBlueprint } from './createExtensionBlueprint';
 import { createExtensionTester } from '@backstage/frontend-test-utils';
 
-describe('createExtensionKind', () => {
-  it('should allow creation of extension kinds', () => {
-    const TestExtension = createExtensionKind({
+describe('createExtensionBlueprint', () => {
+  it('should allow creation of extension blueprints', () => {
+    const TestExtensionBlueprint = createExtensionBlueprint({
       kind: 'test-extension',
       attachTo: { id: 'test', input: 'default' },
       output: {
         element: coreExtensionData.reactElement,
       },
-      factory(_, options: { text: string }) {
+      factory(_, params: { text: string }) {
         return {
-          element: <h1>{options.text}</h1>,
+          element: <h1>{params.text}</h1>,
         };
       },
     });
 
-    const extension = TestExtension.new({
+    const extension = TestExtensionBlueprint.make({
       name: 'my-extension',
-      options: {
+      params: {
         text: 'Hello, world!',
       },
     });
@@ -72,27 +72,27 @@ describe('createExtensionKind', () => {
   });
 
   it('should allow overriding of the default factory', () => {
-    const TestExtension = createExtensionKind({
+    const TestExtensionBlueprint = createExtensionBlueprint({
       kind: 'test-extension',
       attachTo: { id: 'test', input: 'default' },
       output: {
         element: coreExtensionData.reactElement,
       },
-      factory(_, options: { text: string }) {
+      factory(_, params: { text: string }) {
         return {
-          element: <h1>{options.text}</h1>,
+          element: <h1>{params.text}</h1>,
         };
       },
     });
 
-    const extension = TestExtension.new({
+    const extension = TestExtensionBlueprint.make({
       name: 'my-extension',
-      options: {
+      params: {
         text: 'Hello, world!',
       },
-      factory(_, options: { text: string }) {
+      factory(_, params: { text: string }) {
         return {
-          element: <h2>{options.text}</h2>,
+          element: <h2>{params.text}</h2>,
         };
       },
     });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
similarity index 90%
rename from packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
rename to packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 1212365712..74d2eeadf1 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionKind.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -29,7 +29,7 @@ import {
 /**
  * @public
  */
-export interface CreateExtensionKindOptions<
+export interface CreateExtensionBlueprintOptions<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
@@ -55,13 +55,13 @@ export interface CreateExtensionKindOptions<
 /**
  * @public
  */
-export interface ExtensionKind<
+export interface ExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
 > {
-  create(args: {
+  make(args: {
     namespace?: string;
     name?: string;
     attachTo?: { id: string; input: string };
@@ -77,6 +77,7 @@ export interface ExtensionKind<
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         orignalFactory(
           context?: {
+            node?: AppNode;
             config?: TConfig;
             inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
           },
@@ -91,14 +92,14 @@ export interface ExtensionKind<
 /**
  * @internal
  */
-class ExtensionKindImpl<
+class ExtensionBlueprintImpl<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
 > {
   constructor(
-    private readonly options: CreateExtensionKindOptions<
+    private readonly options: CreateExtensionBlueprintOptions<
       TParams,
       TInputs,
       TOutput,
@@ -106,7 +107,7 @@ class ExtensionKindImpl<
     >,
   ) {}
 
-  public create(args: {
+  public make(args: {
     namespace?: string;
     name?: string;
     attachTo?: { id: string; input: string };
@@ -122,6 +123,7 @@ class ExtensionKindImpl<
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         orignalFactory(
           context?: {
+            node?: AppNode;
             config?: TConfig;
             inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
           },
@@ -186,13 +188,13 @@ class ExtensionKindImpl<
  *
  * @public
  */
-export function createExtensionKind<
+export function createExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
 >(
-  options: CreateExtensionKindOptions<TParams, TInputs, TOutput, TConfig>,
-): ExtensionKind<TParams, TInputs, TOutput, TConfig> {
-  return new ExtensionKindImpl(options);
+  options: CreateExtensionBlueprintOptions<TParams, TInputs, TOutput, TConfig>,
+): ExtensionBlueprint<TParams, TInputs, TOutput, TConfig> {
+  return new ExtensionBlueprintImpl(options);
 }
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index 8fe9dc3a54..6d20368225 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -49,7 +49,7 @@ export {
   type FrontendFeature,
 } from './types';
 export {
-  type CreateExtensionKindOptions as ExtensionKindOptions,
-  ExtensionKind,
-  createExtensionKind,
-} from './createExtensionKind';
+  type CreateExtensionBlueprintOptions,
+  type ExtensionBlueprint,
+  createExtensionBlueprint,
+} from './createExtensionBlueprint';

From 9b89b82f66b500dabc5493a51d2fd1144e4828a4 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 18 Jul 2024 12:08:15 +0200
Subject: [PATCH 085/225] frontend-plugin-api: infer ExtensionBoundary routable
 prop from outputs

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/early-trees-dance.md               |  5 ++
 .changeset/mighty-dolls-retire.md             |  5 ++
 .../architecture/03-extensions.md             |  4 +-
 packages/frontend-plugin-api/api-report.md    |  1 -
 .../src/components/ExtensionBoundary.test.tsx | 72 ++++++++++++++++---
 .../src/components/ExtensionBoundary.tsx      | 14 +++-
 .../src/extensions/createPageExtension.tsx    |  2 +-
 plugins/catalog-react/src/alpha.tsx           |  2 +-
 8 files changed, 91 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/early-trees-dance.md
 create mode 100644 .changeset/mighty-dolls-retire.md

diff --git a/.changeset/early-trees-dance.md b/.changeset/early-trees-dance.md
new file mode 100644
index 0000000000..5422bd2872
--- /dev/null
+++ b/.changeset/early-trees-dance.md
@@ -0,0 +1,5 @@
+---
+'@backstage/frontend-plugin-api': patch
+---
+
+The `ExtensionBoundary` now by default infers whether its routable from whether it outputs a route path.
diff --git a/.changeset/mighty-dolls-retire.md b/.changeset/mighty-dolls-retire.md
new file mode 100644
index 0000000000..b31c443a38
--- /dev/null
+++ b/.changeset/mighty-dolls-retire.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Internal refactor to remove unnecessary `routable` prop in the implementation of the `createEntityContentExtension` alpha export.
diff --git a/docs/frontend-system/architecture/03-extensions.md b/docs/frontend-system/architecture/03-extensions.md
index 19345e0b26..cdc73a17ec 100644
--- a/docs/frontend-system/architecture/03-extensions.md
+++ b/docs/frontend-system/architecture/03-extensions.md
@@ -337,7 +337,7 @@ Similar to plugins the `ErrorBoundary` for extension allows to pass in a fallbac
 
 ### Analytics
 
-Analytics information are provided through the `AnalyticsContext`, which will give `extensionId` & `pluginId` as context to analytics event fired inside of the extension. Additionally `RouteTracker` will capture an analytics event for routable extension to inform which extension metadata gets associated with a navigation event when the route navigated to is a gathered `mountPoint`.
+Analytics information are provided through the `AnalyticsContext`, which will give `extensionId` & `pluginId` as context to analytics event fired inside of the extension. Additionally `RouteTracker` will capture an analytics event for routable extension to inform which extension metadata gets associated with a navigation event when the route navigated to is a gathered `mountPoint`. Whether an extension is routable is inferred from its outputs, but you can also explicitly control this behavior by passing the `routable` prop to `ExtensionBoundary`.
 
 The `ExtensionBoundary` can be used like the following in an extension creator:
 
@@ -359,7 +359,7 @@ export function createSomeExtension<
         path: config.path,
         routeRef: options.routeRef,
         element: (
-          <ExtensionBoundary node={node} routable>
+          <ExtensionBoundary node={node}>
             <ExtensionComponent />
           </ExtensionBoundary>
         ),
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 3e19573d95..d50ef0dd03 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -844,7 +844,6 @@ export interface ExtensionBoundaryProps {
   children: ReactNode;
   // (undocumented)
   node: AppNode;
-  // (undocumented)
   routable?: boolean;
 }
 
diff --git a/packages/frontend-plugin-api/src/components/ExtensionBoundary.test.tsx b/packages/frontend-plugin-api/src/components/ExtensionBoundary.test.tsx
index 66fb3901fc..1f12f127e8 100644
--- a/packages/frontend-plugin-api/src/components/ExtensionBoundary.test.tsx
+++ b/packages/frontend-plugin-api/src/components/ExtensionBoundary.test.tsx
@@ -15,15 +15,24 @@
  */
 
 import React, { useEffect } from 'react';
-import { screen, waitFor } from '@testing-library/react';
-import { MockAnalyticsApi, TestApiProvider } from '@backstage/test-utils';
+import { act, screen, waitFor } from '@testing-library/react';
+import {
+  MockAnalyticsApi,
+  TestApiProvider,
+  withLogCollector,
+} from '@backstage/test-utils';
 import { ExtensionBoundary } from './ExtensionBoundary';
 import { coreExtensionData, createExtension } from '../wiring';
-import { analyticsApiRef, useAnalytics } from '@backstage/core-plugin-api';
+import {
+  analyticsApiRef,
+  createApiFactory,
+  useAnalytics,
+} from '@backstage/core-plugin-api';
 import { createRouteRef } from '../routing';
 import { createExtensionTester } from '@backstage/frontend-test-utils';
+import { createApiExtension } from '../extensions';
 
-const wrapInBoundaryExtension = (element: JSX.Element) => {
+const wrapInBoundaryExtension = (element?: JSX.Element) => {
   const routeRef = createRouteRef();
   return createExtension({
     name: 'test',
@@ -54,12 +63,25 @@ describe('ExtensionBoundary', () => {
   });
 
   it('should show app error component when an error is thrown', async () => {
-    const error = 'Something went wrong';
+    const errorMsg = 'Something went wrong';
     const ErrorComponent = () => {
-      throw new Error(error);
+      throw new Error(errorMsg);
     };
-    createExtensionTester(wrapInBoundaryExtension(<ErrorComponent />)).render();
-    await waitFor(() => expect(screen.getByText(error)).toBeInTheDocument());
+    const { error } = await withLogCollector(['error'], async () => {
+      createExtensionTester(
+        wrapInBoundaryExtension(<ErrorComponent />),
+      ).render();
+      await waitFor(() =>
+        expect(screen.getByText(errorMsg)).toBeInTheDocument(),
+      );
+    });
+    expect(error).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          message: expect.stringContaining(errorMsg),
+        }),
+      ]),
+    );
   });
 
   it('should wrap children with analytics context', async () => {
@@ -97,4 +119,38 @@ describe('ExtensionBoundary', () => {
       });
     });
   });
+
+  // TODO(Rugvip): It's annoying to test the inverse of this currently, because the extension tester overrides the subject to always output a path
+  it('should emit analytics events if routable', async () => {
+    const Emitter = () => {
+      const analytics = useAnalytics();
+      useEffect(() => {
+        analytics.captureEvent('dummy', 'dummy');
+      });
+      return null;
+    };
+    const analyticsApiMock = new MockAnalyticsApi();
+
+    await act(async () => {
+      createExtensionTester(wrapInBoundaryExtension(<Emitter />))
+        .add(
+          createApiExtension({
+            factory: createApiFactory(analyticsApiRef, analyticsApiMock),
+          }),
+        )
+        .render();
+    });
+
+    expect(analyticsApiMock.getEvents()).toEqual([
+      expect.objectContaining({
+        action: 'navigate',
+        subject: '/',
+        context: expect.objectContaining({
+          pluginId: 'root',
+          extensionId: 'test',
+        }),
+      }),
+      expect.objectContaining({ action: 'dummy' }),
+    ]);
+  });
 });
diff --git a/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx b/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx
index 768352b76e..b6269484b0 100644
--- a/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx
+++ b/packages/frontend-plugin-api/src/components/ExtensionBoundary.tsx
@@ -26,6 +26,7 @@ import { ErrorBoundary } from './ErrorBoundary';
 import { routableExtensionRenderedEvent } from '../../../core-plugin-api/src/analytics/Tracker';
 import { AppNode, useComponentRef } from '../apis';
 import { coreComponentRefs } from './coreComponentRefs';
+import { coreExtensionData } from '../wiring';
 
 type RouteTrackerProps = PropsWithChildren<{
   disableTracking?: boolean;
@@ -50,6 +51,11 @@ const RouteTracker = (props: RouteTrackerProps) => {
 /** @public */
 export interface ExtensionBoundaryProps {
   node: AppNode;
+  /**
+   * This explicitly marks the extension as routable for the purpose of
+   * capturing analytics events. If not provided, the extension boundary will be
+   * marked as routable if it outputs a routePath.
+   */
   routable?: boolean;
   children: ReactNode;
 }
@@ -58,6 +64,10 @@ export interface ExtensionBoundaryProps {
 export function ExtensionBoundary(props: ExtensionBoundaryProps) {
   const { node, routable, children } = props;
 
+  const doesOutputRoutePath = Boolean(
+    node.instance?.getData(coreExtensionData.routePath),
+  );
+
   const plugin = node.spec.source;
   const Progress = useComponentRef(coreComponentRefs.progress);
   const fallback = useComponentRef(coreComponentRefs.errorBoundaryFallback);
@@ -72,7 +82,9 @@ export function ExtensionBoundary(props: ExtensionBoundaryProps) {
     <Suspense fallback={<Progress />}>
       <ErrorBoundary plugin={plugin} Fallback={fallback}>
         <AnalyticsContext attributes={attributes}>
-          <RouteTracker disableTracking={!routable}>{children}</RouteTracker>
+          <RouteTracker disableTracking={!(routable ?? doesOutputRoutePath)}>
+            {children}
+          </RouteTracker>
         </AnalyticsContext>
       </ErrorBoundary>
     </Suspense>
diff --git a/packages/frontend-plugin-api/src/extensions/createPageExtension.tsx b/packages/frontend-plugin-api/src/extensions/createPageExtension.tsx
index dfe549f32b..cd434a3ffc 100644
--- a/packages/frontend-plugin-api/src/extensions/createPageExtension.tsx
+++ b/packages/frontend-plugin-api/src/extensions/createPageExtension.tsx
@@ -87,7 +87,7 @@ export function createPageExtension<
         path: config.path,
         routeRef: options.routeRef,
         element: (
-          <ExtensionBoundary node={node} routable>
+          <ExtensionBoundary node={node}>
             <ExtensionComponent />
           </ExtensionBoundary>
         ),
diff --git a/plugins/catalog-react/src/alpha.tsx b/plugins/catalog-react/src/alpha.tsx
index b1650d1f5b..85712b358a 100644
--- a/plugins/catalog-react/src/alpha.tsx
+++ b/plugins/catalog-react/src/alpha.tsx
@@ -166,7 +166,7 @@ export function createEntityContentExtension<
         title: config.title,
         routeRef: options.routeRef,
         element: (
-          <ExtensionBoundary node={node} routable>
+          <ExtensionBoundary node={node}>
             <ExtensionComponent />
           </ExtensionBoundary>
         ),

From 5eaaf807fade6caae1a874744140ea469a46dbcc Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Jul 2024 14:15:03 +0200
Subject: [PATCH 086/225] chore: fixing api-reports and changeset

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/dry-squids-tap.md               |   8 +-
 packages/frontend-plugin-api/api-report.md | 179 ++++++++++-----------
 2 files changed, 88 insertions(+), 99 deletions(-)

diff --git a/.changeset/dry-squids-tap.md b/.changeset/dry-squids-tap.md
index 879ecb5d14..d0a737f4af 100644
--- a/.changeset/dry-squids-tap.md
+++ b/.changeset/dry-squids-tap.md
@@ -2,12 +2,12 @@
 '@backstage/frontend-plugin-api': patch
 ---
 
-Introduce a new way to create extension types and kinds, with `createExtensionKind`.
+Introduce a new way to encapsulate extension kinds that replaces the extension creator pattern with `createExtensionBlueprint`
 
-This allows the creation of extension with the following pattern:
+This allows the creation of extension instances with the following pattern:
 
 ```tsx
-// create the extension kind
+// create the extension blueprint which is used to create instances
 const EntityCardBlueprint = createExtensionBlueprint({
   kind: 'entity-card',
   attachTo: { id: 'test', input: 'default' },
@@ -21,7 +21,7 @@ const EntityCardBlueprint = createExtensionBlueprint({
   },
 });
 
-// create an instance of the extension kind with props
+// create an instance of the extension blueprint with params
 const testExtension = EntityCardBlueprint.make({
   name: 'foo',
   params: {
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 48718f5375..858350044c 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -499,6 +499,51 @@ export function createExtension<
   options: CreateExtensionOptions<TOutput, TInputs, TConfig>,
 ): ExtensionDefinition<TConfig>;
 
+// @public
+export function createExtensionBlueprint<
+  TParams,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+>(
+  options: CreateExtensionBlueprintOptions<TParams, TInputs, TOutput, TConfig>,
+): ExtensionBlueprint<TParams, TInputs, TOutput, TConfig>;
+
+// @public (undocumented)
+export interface CreateExtensionBlueprintOptions<
+  TParams,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  // (undocumented)
+  attachTo: {
+    id: string;
+    input: string;
+  };
+  // (undocumented)
+  configSchema?: PortableSchema<TConfig>;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  factory(
+    context: {
+      node: AppNode;
+      config: TConfig;
+      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+    },
+    params: TParams,
+  ): Expand<ExtensionDataValues<TOutput>>;
+  // (undocumented)
+  inputs?: TInputs;
+  // (undocumented)
+  kind: string;
+  // (undocumented)
+  namespace?: string;
+  // (undocumented)
+  output: TOutput;
+}
+
 // @public (undocumented)
 export function createExtensionDataRef<TData>(
   id: string,
@@ -522,16 +567,6 @@ export function createExtensionInput<
   }
 >;
 
-// @public
-export function createExtensionKind<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
->(
-  options: ExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
-): ExtensionKind<TOptions, TInputs, TOutput, TConfig>;
-
 // @public (undocumented)
 export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
@@ -843,6 +878,45 @@ export interface Extension<TConfig> {
   readonly id: string;
 }
 
+// @public (undocumented)
+export interface ExtensionBlueprint<
+  TParams,
+  TInputs extends AnyExtensionInputMap,
+  TOutput extends AnyExtensionDataMap,
+  TConfig,
+> {
+  // (undocumented)
+  make(args: {
+    namespace?: string;
+    name?: string;
+    attachTo?: {
+      id: string;
+      input: string;
+    };
+    disabled?: boolean;
+    inputs?: TInputs;
+    output?: TOutput;
+    configSchema?: PortableSchema<TConfig>;
+    params: TParams;
+    factory?(
+      context: {
+        node: AppNode;
+        config: TConfig;
+        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+        orignalFactory(
+          context?: {
+            node?: AppNode;
+            config?: TConfig;
+            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+          },
+          params?: TParams,
+        ): Expand<ExtensionDataValues<TOutput>>;
+      },
+      params: TParams,
+    ): Expand<ExtensionDataValues<TOutput>>;
+  }): ExtensionDefinition<TConfig>;
+}
+
 // @public (undocumented)
 export function ExtensionBoundary(
   props: ExtensionBoundaryProps,
@@ -923,91 +997,6 @@ export interface ExtensionInput<
   extensionData: TExtensionData;
 }
 
-// @public
-export class ExtensionKind<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
-> {
-  // (undocumented)
-  static create<
-    TOptions,
-    TInputs extends AnyExtensionInputMap,
-    TOutput extends AnyExtensionDataMap,
-    TConfig,
-  >(
-    options: ExtensionKindOptions<TOptions, TInputs, TOutput, TConfig>,
-  ): ExtensionKind<TOptions, TInputs, TOutput, TConfig>;
-  // (undocumented)
-  new(args: {
-    namespace?: string;
-    name?: string;
-    attachTo?: {
-      id: string;
-      input: string;
-    };
-    disabled?: boolean;
-    inputs?: TInputs;
-    output?: TOutput;
-    configSchema?: PortableSchema<TConfig>;
-    options: TOptions;
-    factory?(
-      context: {
-        node: AppNode;
-        config: TConfig;
-        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-        orignalFactory(
-          context?: {
-            node?: AppNode;
-            config?: TConfig;
-            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-          },
-          options?: TOptions,
-        ): Expand<ExtensionDataValues<TOutput>>;
-      },
-      options: TOptions,
-    ): Expand<ExtensionDataValues<TOutput>>;
-  }): ExtensionDefinition<TConfig>;
-}
-
-// @public (undocumented)
-export interface ExtensionKindOptions<
-  TOptions,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
-  TConfig,
-> {
-  // (undocumented)
-  attachTo: {
-    id: string;
-    input: string;
-  };
-  // (undocumented)
-  configSchema?: PortableSchema<TConfig>;
-  // (undocumented)
-  disabled?: boolean;
-  // (undocumented)
-  factory(
-    context: {
-      node: AppNode;
-      config: TConfig;
-      inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-    },
-    options: TOptions,
-  ): Expand<ExtensionDataValues<TOutput>>;
-  // (undocumented)
-  inputs?: TInputs;
-  // (undocumented)
-  kind: string;
-  // (undocumented)
-  name?: string;
-  // (undocumented)
-  namespace?: string;
-  // (undocumented)
-  output: TOutput;
-}
-
 // @public (undocumented)
 export interface ExtensionOverrides {
   // (undocumented)

From 3f257d25e26c51f21f6d63c3feecec59862eadb8 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Jul 2024 14:59:02 +0200
Subject: [PATCH 087/225] chore: switch around the params to the factories

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/dry-squids-tap.md                  |  2 +-
 packages/frontend-plugin-api/api-report.md    |  6 +-
 .../wiring/createExtensionBlueprint.test.tsx  |  6 +-
 .../src/wiring/createExtensionBlueprint.ts    | 61 ++++++++-----------
 4 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/.changeset/dry-squids-tap.md b/.changeset/dry-squids-tap.md
index d0a737f4af..613ec4b7cb 100644
--- a/.changeset/dry-squids-tap.md
+++ b/.changeset/dry-squids-tap.md
@@ -14,7 +14,7 @@ const EntityCardBlueprint = createExtensionBlueprint({
   output: {
     element: coreExtensionData.reactElement,
   },
-  factory(_, params: { text: string }) {
+  factory(params: { text: string }) {
     return {
       element: <h1>{params.text}</h1>,
     };
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 858350044c..342907e096 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -527,12 +527,12 @@ export interface CreateExtensionBlueprintOptions<
   disabled?: boolean;
   // (undocumented)
   factory(
+    params: TParams,
     context: {
       node: AppNode;
       config: TConfig;
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
-    params: TParams,
   ): Expand<ExtensionDataValues<TOutput>>;
   // (undocumented)
   inputs?: TInputs;
@@ -899,20 +899,20 @@ export interface ExtensionBlueprint<
     configSchema?: PortableSchema<TConfig>;
     params: TParams;
     factory?(
+      params: TParams,
       context: {
         node: AppNode;
         config: TConfig;
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         orignalFactory(
+          params?: TParams,
           context?: {
             node?: AppNode;
             config?: TConfig;
             inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
           },
-          params?: TParams,
         ): Expand<ExtensionDataValues<TOutput>>;
       },
-      params: TParams,
     ): Expand<ExtensionDataValues<TOutput>>;
   }): ExtensionDefinition<TConfig>;
 }
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index b3e926e57c..c7b077bdbd 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -27,7 +27,7 @@ describe('createExtensionBlueprint', () => {
       output: {
         element: coreExtensionData.reactElement,
       },
-      factory(_, params: { text: string }) {
+      factory(params: { text: string }) {
         return {
           element: <h1>{params.text}</h1>,
         };
@@ -78,7 +78,7 @@ describe('createExtensionBlueprint', () => {
       output: {
         element: coreExtensionData.reactElement,
       },
-      factory(_, params: { text: string }) {
+      factory(params: { text: string }) {
         return {
           element: <h1>{params.text}</h1>,
         };
@@ -90,7 +90,7 @@ describe('createExtensionBlueprint', () => {
       params: {
         text: 'Hello, world!',
       },
-      factory(_, params: { text: string }) {
+      factory(params: { text: string }) {
         return {
           element: <h2>{params.text}</h2>,
         };
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 74d2eeadf1..6c79017a0a 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -43,12 +43,12 @@ export interface CreateExtensionBlueprintOptions<
   output: TOutput;
   configSchema?: PortableSchema<TConfig>;
   factory(
+    params: TParams,
     context: {
       node: AppNode;
       config: TConfig;
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
-    params: TParams,
   ): Expand<ExtensionDataValues<TOutput>>;
 }
 
@@ -71,20 +71,20 @@ export interface ExtensionBlueprint<
     configSchema?: PortableSchema<TConfig>;
     params: TParams;
     factory?(
+      params: TParams,
       context: {
         node: AppNode;
         config: TConfig;
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         orignalFactory(
+          params?: TParams,
           context?: {
             node?: AppNode;
             config?: TConfig;
             inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
           },
-          params?: TParams,
         ): Expand<ExtensionDataValues<TOutput>>;
       },
-      params: TParams,
     ): Expand<ExtensionDataValues<TOutput>>;
   }): ExtensionDefinition<TConfig>;
 }
@@ -117,20 +117,20 @@ class ExtensionBlueprintImpl<
     configSchema?: PortableSchema<TConfig>;
     params: TParams;
     factory?(
+      params: TParams,
       context: {
         node: AppNode;
         config: TConfig;
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         orignalFactory(
+          params?: TParams,
           context?: {
             node?: AppNode;
             config?: TConfig;
             inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
           },
-          params?: TParams,
         ): Expand<ExtensionDataValues<TOutput>>;
       },
-      params: TParams,
     ): Expand<ExtensionDataValues<TOutput>>;
   }): ExtensionDefinition<TConfig> {
     return createExtension({
@@ -144,39 +144,30 @@ class ExtensionBlueprintImpl<
       configSchema: args.configSchema ?? this.options.configSchema, // TODO: some config merging or smth
       factory: ({ node, config, inputs }) => {
         if (args.factory) {
-          return args.factory(
-            {
-              node,
-              config,
-              inputs,
-              orignalFactory: (
-                innerContext?: {
-                  config?: TConfig;
-                  inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-                },
-                innerParams?: TParams,
-              ) =>
-                this.options.factory(
-                  {
-                    node,
-                    config: innerContext?.config ?? config,
-                    inputs: innerContext?.inputs ?? inputs,
-                  },
-                  innerParams ?? args.params,
-                ),
-            },
-            args.params,
-          );
-        }
-
-        return this.options.factory(
-          {
+          return args.factory(args.params, {
             node,
             config,
             inputs,
-          },
-          args.params,
-        );
+            orignalFactory: (
+              innerParams?: TParams,
+              innerContext?: {
+                config?: TConfig;
+                inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+              },
+            ) =>
+              this.options.factory(innerParams ?? args.params, {
+                node,
+                config: innerContext?.config ?? config,
+                inputs: innerContext?.inputs ?? inputs,
+              }),
+          });
+        }
+
+        return this.options.factory(args.params, {
+          node,
+          config,
+          inputs,
+        });
       },
     });
   }

From b1104f9bd5c8516e7d85a70660f394608d0057a2 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Jul 2024 16:58:03 +0200
Subject: [PATCH 088/225] chore: skip backend dynamic

Signed-off-by: blam <ben@blam.sh>
---
 .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:^"

From 73184b37beea314d63196229f28c11bb14c89315 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 18 Jul 2024 18:46:25 +0200
Subject: [PATCH 089/225] '

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/early-trees-dance.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/early-trees-dance.md b/.changeset/early-trees-dance.md
index 5422bd2872..55b2c08f89 100644
--- a/.changeset/early-trees-dance.md
+++ b/.changeset/early-trees-dance.md
@@ -2,4 +2,4 @@
 '@backstage/frontend-plugin-api': patch
 ---
 
-The `ExtensionBoundary` now by default infers whether its routable from whether it outputs a route path.
+The `ExtensionBoundary` now by default infers whether it's routable from whether it outputs a route path.

From 6ecedfafbcdeedc529868b615d2597a6121a7f5c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:03:48 +0000
Subject: [PATCH 090/225] fix(deps): update dependency stream-buffers to v3.0.3

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6db9d6b8f4..b63d8d7d63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -41326,9 +41326,9 @@ __metadata:
   linkType: hard
 
 "stream-buffers@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "stream-buffers@npm:3.0.2"
-  checksum: b09fdeea606e3113ebd0e07010ed0cf038608fa396130add9e45deaff5cc3ba845dc25c31ad24f8341f85907846344cb7c85f75ea52c6572e2ac646e9b6072d0
+  version: 3.0.3
+  resolution: "stream-buffers@npm:3.0.3"
+  checksum: 3f0bdc4b1fd3ff370cef5a2103dd930b8981d42d97741eeb087a660771e27f0fc35fa8a351bb36e15bbbbce0eea00fefed60d6cdff4c6c3f527580529f183807
   languageName: node
   linkType: hard
 

From ba8571efe953a343e08195cb586c2e1bd3b6adaa Mon Sep 17 00:00:00 2001
From: Yayun Feng <yayfen@amazon.com>
Date: Sat, 1 Jun 2024 00:09:56 +0200
Subject: [PATCH 091/225] Setup user agent header for AWS sdk client

Signed-off-by: Yayun Feng <yervant.feng@gmail.com>
---
 .changeset/chilly-trains-sleep.md                          | 7 +++++++
 .../entrypoints/urlReader/lib/AwsCodeCommitUrlReader.ts    | 1 +
 .../src/entrypoints/urlReader/lib/AwsS3UrlReader.ts        | 1 +
 .../src/processors/AwsEKSClusterProcessor.ts               | 1 +
 .../src/providers/AwsS3EntityProvider.ts                   | 1 +
 .../src/publisher/AwsSqsConsumingEventPublisher.ts         | 1 +
 6 files changed, 12 insertions(+)
 create mode 100644 .changeset/chilly-trains-sleep.md

diff --git a/.changeset/chilly-trains-sleep.md b/.changeset/chilly-trains-sleep.md
new file mode 100644
index 0000000000..cde7600c8b
--- /dev/null
+++ b/.changeset/chilly-trains-sleep.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-events-backend-module-aws-sqs': patch
+'@backstage/plugin-catalog-backend-module-aws': patch
+'@backstage/backend-common': patch
+---
+
+Setup user agent header for AWS sdk clients, this enables users to better track API calls made from Backstage to AWS APIs through things like CloudTrail.
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/AwsCodeCommitUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/AwsCodeCommitUrlReader.ts
index 7f02f1468f..5a2655ad1c 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/AwsCodeCommitUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/AwsCodeCommitUrlReader.ts
@@ -213,6 +213,7 @@ export class AwsCodeCommitUrlReader implements UrlReaderService {
     );
 
     const codeCommit = new CodeCommitClient({
+      customUserAgent: 'backstage-aws-codecommit-url-reader',
       region: region,
       credentials: credentials,
     });
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/AwsS3UrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/AwsS3UrlReader.ts
index 27f60f5b77..324538add4 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/AwsS3UrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/AwsS3UrlReader.ts
@@ -222,6 +222,7 @@ export class AwsS3UrlReader implements UrlReaderService {
     );
 
     const s3 = new S3Client({
+      customUserAgent: 'backstage-aws-s3-url-reader',
       region: region,
       credentials: credentials,
       endpoint: integration.config.endpoint,
diff --git a/plugins/catalog-backend-module-aws/src/processors/AwsEKSClusterProcessor.ts b/plugins/catalog-backend-module-aws/src/processors/AwsEKSClusterProcessor.ts
index a491dbab7d..a5f5ce2f6c 100644
--- a/plugins/catalog-backend-module-aws/src/processors/AwsEKSClusterProcessor.ts
+++ b/plugins/catalog-backend-module-aws/src/processors/AwsEKSClusterProcessor.ts
@@ -106,6 +106,7 @@ export class AwsEKSClusterProcessor implements CatalogProcessor {
     }
 
     const eksClient = new EKS({
+      customUserAgent: 'backstage-aws-catalog-eks-cluster-processor',
       credentials,
       credentialDefaultProvider: providerFunction,
       region,
diff --git a/plugins/catalog-backend-module-aws/src/providers/AwsS3EntityProvider.ts b/plugins/catalog-backend-module-aws/src/providers/AwsS3EntityProvider.ts
index 91ba76b695..0c58fe3f3a 100644
--- a/plugins/catalog-backend-module-aws/src/providers/AwsS3EntityProvider.ts
+++ b/plugins/catalog-backend-module-aws/src/providers/AwsS3EntityProvider.ts
@@ -154,6 +154,7 @@ export class AwsS3EntityProvider implements EntityProvider {
       accountId ? { accountId } : undefined,
     );
     this.s3 = new S3({
+      customUserAgent: 'backstage-aws-catalog-s3-entity-provider',
       apiVersion: '2006-03-01',
       credentialDefaultProvider: () => credProvider.sdkCredentialProvider,
       endpoint: this.integration.config.endpoint,
diff --git a/plugins/events-backend-module-aws-sqs/src/publisher/AwsSqsConsumingEventPublisher.ts b/plugins/events-backend-module-aws-sqs/src/publisher/AwsSqsConsumingEventPublisher.ts
index 26eba88c18..de55dee017 100644
--- a/plugins/events-backend-module-aws-sqs/src/publisher/AwsSqsConsumingEventPublisher.ts
+++ b/plugins/events-backend-module-aws-sqs/src/publisher/AwsSqsConsumingEventPublisher.ts
@@ -76,6 +76,7 @@ export class AwsSqsConsumingEventPublisher {
     };
 
     this.sqs = new SQSClient({
+      customUserAgent: 'backstage-aws-events-sqs-publisher',
       region: config.region,
       endpoint: config.endpoint,
     });

From 1eb5e9f686bd52bf99af3f611415ce2ad8bd7dc7 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 19 Jul 2024 14:06:17 +0200
Subject: [PATCH 092/225] chore: attempt to fix the tabs

Signed-off-by: blam <ben@blam.sh>
---
 .../TabbedLayout/RoutedTabs.test.tsx          | 12 +++++
 .../components/TabbedLayout/RoutedTabs.tsx    | 51 ++++++++-----------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx
index ec91208eee..991276c5d3 100644
--- a/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx
+++ b/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx
@@ -160,4 +160,16 @@ describe('RoutedTabs', () => {
       rendered.queryByText('tabbed-test-content-2'),
     ).not.toBeInTheDocument();
   });
+
+  it('should render the tabs as <a> links', async () => {
+    const routes = [testRoute2, testRoute1, testRoute3];
+    const rendered = await renderInTestApp(<RoutedTabs routes={routes} />);
+
+    const tabs = rendered.queryAllByRole('tab');
+
+    for (const [k, v] of Object.entries(tabs)) {
+      expect(v.tagName).toBe('A');
+      expect(v).toHaveAttribute('href', routes[Number(k)].path);
+    }
+  });
 });
diff --git a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
index 6a5bf2970f..d6f6eab144 100644
--- a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
+++ b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
@@ -15,15 +15,11 @@
  */
 import React, { useMemo } from 'react';
 import { Helmet } from 'react-helmet';
-import {
-  matchRoutes,
-  useNavigate,
-  useParams,
-  useRoutes,
-} from 'react-router-dom';
+import { matchRoutes, useParams, useRoutes } from 'react-router-dom';
 import { Content } from '../../layout/Content';
 import { HeaderTabs } from '../../layout/HeaderTabs';
 import { SubRoute } from './types';
+import { Link } from '../Link';
 
 export function useSelectedSubRoute(subRoutes: SubRoute[]): {
   index: number;
@@ -68,38 +64,33 @@ export function useSelectedSubRoute(subRoutes: SubRoute[]): {
 
 export function RoutedTabs(props: { routes: SubRoute[] }) {
   const { routes } = props;
-  const navigate = useNavigate();
+
   const { index, route, element } = useSelectedSubRoute(routes);
   const headerTabs = useMemo(
     () =>
-      routes.map(t => ({
-        id: t.path,
-        label: t.title,
-        tabProps: t.tabProps,
-      })),
+      routes.map(t => {
+        const { path, title, tabProps } = t;
+        let to = path;
+        // Remove trailing /*
+        to = to.replace(/\/\*$/, '');
+        // And remove leading / for relative navigation
+        to = to.replace(/^\//, '');
+        return {
+          id: path,
+          label: title,
+          tabProps: {
+            ...tabProps,
+            component: Link,
+            to,
+          },
+        };
+      }),
     [routes],
   );
 
-  const onTabChange = (tabIndex: number) => {
-    let { path } = routes[tabIndex];
-    // Remove trailing /*
-    path = path.replace(/\/\*$/, '');
-    // And remove leading / for relative navigation
-    path = path.replace(/^\//, '');
-    // Note! route resolves relative to the position in the React tree,
-    // not relative to current location
-    navigate(path);
-  };
   return (
     <>
-      <HeaderTabs
-        tabs={headerTabs}
-        selectedIndex={index}
-        onChange={onTabChange}
-        tabProps={{
-          component: Link,
-        }}
-      />
+      <HeaderTabs tabs={headerTabs} selectedIndex={index} />
       <Content>
         <Helmet title={route?.title} />
         {element}

From 678971ad41380d5b958ed4b9f72e9372385d9380 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 19 Jul 2024 14:07:17 +0200
Subject: [PATCH 093/225] chore: added changeset Signed-off-by: blam
 <ben@blam.sh>

---
 .changeset/eighty-mirrors-flow.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/eighty-mirrors-flow.md

diff --git a/.changeset/eighty-mirrors-flow.md b/.changeset/eighty-mirrors-flow.md
new file mode 100644
index 0000000000..57e978a78c
--- /dev/null
+++ b/.changeset/eighty-mirrors-flow.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Move the `Link` component to the `RoutedTabs` instead of the `HeaderTabs` component

From de4cd433c15a6cc2ba63448ff31542decedaf2bf Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Fri, 19 Jul 2024 13:31:28 +0100
Subject: [PATCH 094/225] cli: simplify changeset

Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 .changeset/little-bulldogs-guess.md | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.changeset/little-bulldogs-guess.md b/.changeset/little-bulldogs-guess.md
index 1f86f0a67f..3e646a033f 100644
--- a/.changeset/little-bulldogs-guess.md
+++ b/.changeset/little-bulldogs-guess.md
@@ -2,16 +2,4 @@
 '@backstage/cli': patch
 ---
 
-Add ability to force use of the development versions of `react` and `react-dom`
-to allow for detailed error messages and use of fast-refresh. Note that builds
-with the development versions of `react` and `react-dom` should not be
-deployed in production.
-
-This feature can be used by setting the `FORCE_REACT_DEVELOPMENT` environment
-variable to `true`:
-
-```bash
-EXPERIMENTAL_MODULE_FEDERATION=true \
-FORCE_REACT_DEVELOPMENT=true \
-yarn build:all
-```
+The experimental module federation build now has the ability to force the use of development versions of `react` and `react-dom` by setting the `FORCE_REACT_DEVELOPMENT` flag.

From 2e1a7f10e5f29af3e4f253ad62b7d61148c5f995 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Fri, 19 Jul 2024 13:48:20 +0100
Subject: [PATCH 095/225] cli: only check for truthiness of environment
 variables when forcing react mode

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/lib/bundler/config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 8e3d7eee19..3d3be4f485 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -237,8 +237,8 @@ export async function createConfig(
   const optimization = optimizationConfig(options);
 
   if (
-    process.env.EXPERIMENTAL_MODULE_FEDERATION === 'true' &&
-    process.env.FORCE_REACT_DEVELOPMENT === 'true'
+    !!process.env.EXPERIMENTAL_MODULE_FEDERATION &&
+    !!process.env.FORCE_REACT_DEVELOPMENT
   ) {
     console.log(
       chalk.yellow(

From 0983429447db996138e90c6168f82e47b405223e Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:05:28 +0100
Subject: [PATCH 096/225] cli: expand comment

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/lib/bundler/config.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 3d3be4f485..e10ac0253e 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -251,7 +251,9 @@ export async function createConfig(
       `${dirname(require.resolve('react-dom/package.json'))}/`,
     ];
 
-    // Don't define process.env.NODE_ENV with value matching config.mode.
+    // Don't define process.env.NODE_ENV with value matching config.mode. If we
+    // don't set this to false, webpack will define the value of
+    // process.env.NODE_ENV for us, and the definition below will be ignored.
     optimization.nodeEnv = false;
 
     // Instead, provide a custom definition which always uses "development" if

From 232b134606d193c262d38892e86e41bc979305fd Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:07:35 +0100
Subject: [PATCH 097/225] cli: skip forcing react to development mode if mode
 is development anyway

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/lib/bundler/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index e10ac0253e..1f29277676 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -237,6 +237,7 @@ export async function createConfig(
   const optimization = optimizationConfig(options);
 
   if (
+    mode === 'production' &&
     !!process.env.EXPERIMENTAL_MODULE_FEDERATION &&
     !!process.env.FORCE_REACT_DEVELOPMENT
   ) {

From 6c94522688dc49b850db6d23c57b1a794c4b0602 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:08:54 +0100
Subject: [PATCH 098/225] cli: remove explicit boolean coercions when forcing
 react mode

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/lib/bundler/config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 1f29277676..9a611a5954 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -238,8 +238,8 @@ export async function createConfig(
 
   if (
     mode === 'production' &&
-    !!process.env.EXPERIMENTAL_MODULE_FEDERATION &&
-    !!process.env.FORCE_REACT_DEVELOPMENT
+    process.env.EXPERIMENTAL_MODULE_FEDERATION &&
+    process.env.FORCE_REACT_DEVELOPMENT
   ) {
     console.log(
       chalk.yellow(

From 0e706b3484998631a591b8a07a23b075781ffb25 Mon Sep 17 00:00:00 2001
From: Ben Lambert <blam@spotify.com>
Date: Fri, 19 Jul 2024 15:40:42 +0200
Subject: [PATCH 099/225] Update modern-parrots-protect.md

Signed-off-by: Ben Lambert <blam@spotify.com>
---
 .changeset/modern-parrots-protect.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/modern-parrots-protect.md b/.changeset/modern-parrots-protect.md
index 7fccff1bef..bb4df2c248 100644
--- a/.changeset/modern-parrots-protect.md
+++ b/.changeset/modern-parrots-protect.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-react': patch
 ---
 
-support ajv-errors for scaffolder validation
+support `ajv-errors` for scaffolder validation to allow for customizing the error messages

From b8600fe1650507c7b0e443ba58d8183e4a7413a8 Mon Sep 17 00:00:00 2001
From: Adam Letizia <LetiziaAdam@JohnDeere.com>
Date: Fri, 19 Jul 2024 09:48:20 -0500
Subject: [PATCH 100/225] fix(scaffolder): refetch user credentials when
 selected host is changed in RepoUrlPicker

Signed-off-by: Adam Letizia <LetiziaAdam@JohnDeere.com>
---
 .changeset/tough-lies-repair.md               |  5 ++
 .../RepoUrlPicker/RepoUrlPicker.test.tsx      | 56 +++++++++++++++----
 .../fields/RepoUrlPicker/RepoUrlPicker.tsx    | 11 +++-
 3 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/tough-lies-repair.md

diff --git a/.changeset/tough-lies-repair.md b/.changeset/tough-lies-repair.md
new file mode 100644
index 0000000000..25b1884bbc
--- /dev/null
+++ b/.changeset/tough-lies-repair.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+RepoUrlPicker: refetch user credentials when a new host is selected
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
index 002652cfab..fce9d9517c 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
@@ -33,6 +33,7 @@ import {
   ScaffolderRJSFField,
 } from '@backstage/plugin-scaffolder-react';
 import { act, fireEvent } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 describe('RepoUrlPicker', () => {
   const mockScaffolderApi: Partial<ScaffolderApi> = {
@@ -323,14 +324,29 @@ describe('RepoUrlPicker', () => {
       });
     });
 
-    it('should not call the scmAuthApi if secret is available in the state', async () => {
+    it('should call the scmAuthApi with the new host when the host is changed', async () => {
       const SecretsComponent = () => {
         const { secrets } = useTemplateSecrets();
         return (
           <div data-testid="current-secrets">{JSON.stringify({ secrets })}</div>
         );
       };
-      const { getByTestId } = await renderInTestApp(
+      const allowedHosts = ['github.com', 'gitlab.example.com'];
+
+      (mockScmAuthApi.getCredentials as jest.Mock).mockImplementation(
+        ({ url }) => {
+          let token = '';
+          if (url === `https://${allowedHosts[0]}`) {
+            token = 'abc123';
+          } else if (url === `https://${allowedHosts[1]}`) {
+            token = 'def456';
+          }
+          return Promise.resolve({ token });
+        },
+      );
+      const secondHost = allowedHosts[1];
+
+      const { getAllByRole, getByTestId } = await renderInTestApp(
         <TestApiProvider
           apis={[
             [scmIntegrationsApiRef, mockIntegrationsApi],
@@ -338,16 +354,16 @@ describe('RepoUrlPicker', () => {
             [scaffolderApiRef, mockScaffolderApi],
           ]}
         >
-          <SecretsContextProvider initialSecrets={{ testKey: 'abc123' }}>
+          <SecretsContextProvider>
             <Form
               validator={validator}
               schema={{ type: 'string' }}
               uiSchema={{
                 'ui:field': 'RepoUrlPicker',
                 'ui:options': {
+                  allowedHosts,
                   requestUserCredentials: {
                     secretsKey: 'testKey',
-                    additionalScopes: { github: ['workflow'] },
                   },
                 },
               }}
@@ -361,19 +377,35 @@ describe('RepoUrlPicker', () => {
       );
 
       await act(async () => {
+        // need to wait for the debounce to finish to fetch credentials for the first selected host
+        await new Promise(resolve => setTimeout(resolve, 600));
+      });
+      const firstHostSecrets = JSON.parse(
+        getByTestId('current-secrets').textContent!,
+      );
+      expect(firstHostSecrets).toEqual({
+        secrets: { testKey: 'abc123' },
+      });
+
+      await act(async () => {
+        // Select the second host
+        const hostInput = getAllByRole('combobox')[0];
+        await userEvent.selectOptions(hostInput, secondHost);
+
         // need to wait for the debounce to finish
         await new Promise(resolve => setTimeout(resolve, 600));
       });
-
-      // as we already have a secret in the state, getCredentials should not be called again.
-      expect(mockScmAuthApi.getCredentials).toHaveBeenCalledTimes(0);
-
-      const currentSecrets = JSON.parse(
+      const secondHostSecrets = JSON.parse(
         getByTestId('current-secrets').textContent!,
       );
-
-      expect(currentSecrets).toEqual({
-        secrets: { testKey: 'abc123' },
+      expect(secondHostSecrets).toEqual({
+        secrets: { testKey: 'def456' },
+      });
+      expect(mockScmAuthApi.getCredentials).toHaveBeenCalledWith({
+        url: `https://${secondHost}`,
+        additionalScope: {
+          repoWrite: true,
+        },
       });
     });
   });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
index e0d714ffda..e653be9178 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
@@ -49,6 +49,9 @@ export const RepoUrlPicker = (props: RepoUrlPickerProps) => {
   const [state, setState] = useState<RepoUrlPickerState>(
     parseRepoPickerUrl(formData),
   );
+  const [credentialsHost, setCredentialsHost] = useState<string | undefined>(
+    undefined,
+  );
   const integrationApi = useApi(scmIntegrationsApiRef);
   const scmAuthApi = useApi(scmAuthApiRef);
   const { secrets, setSecrets } = useTemplateSecrets();
@@ -128,8 +131,11 @@ export const RepoUrlPicker = (props: RepoUrlPickerProps) => {
         return;
       }
 
-      // don't show login prompt if secret value is already in state
-      if (secrets[requestUserCredentials.secretsKey]) {
+      // don't show login prompt if secret value is already in state for selected host
+      if (
+        secrets[requestUserCredentials.secretsKey] &&
+        credentialsHost === state.host
+      ) {
         return;
       }
 
@@ -147,6 +153,7 @@ export const RepoUrlPicker = (props: RepoUrlPickerProps) => {
       // set the secret using the key provided in the ui:options for use
       // in the templating the manifest with ${{ secrets[secretsKey] }}
       setSecrets({ [requestUserCredentials.secretsKey]: token });
+      setCredentialsHost(state.host);
     },
     500,
     [state, uiSchema],

From 924c0a6379fa9a2c521622259126125b0bc2ddc0 Mon Sep 17 00:00:00 2001
From: rghara <ramin.g01@infosys.com>
Date: Fri, 19 Jul 2024 12:53:18 -0400
Subject: [PATCH 101/225] Updated document getting-started/logging-in with
 missing login screen screenshot

Signed-off-by: rghara <ramin.g01@infosys.com>
---
 docs/assets/getting-started/login-screen.png | Bin 0 -> 108521 bytes
 docs/getting-started/logging-in.md           |   2 ++
 2 files changed, 2 insertions(+)
 create mode 100755 docs/assets/getting-started/login-screen.png

diff --git a/docs/assets/getting-started/login-screen.png b/docs/assets/getting-started/login-screen.png
new file mode 100755
index 0000000000000000000000000000000000000000..70b56f399a22d19ad863f77db22739f67a352501
GIT binary patch
literal 108521
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

literal 0
HcmV?d00001

diff --git a/docs/getting-started/logging-in.md b/docs/getting-started/logging-in.md
index fef8907e07..5386e98798 100644
--- a/docs/getting-started/logging-in.md
+++ b/docs/getting-started/logging-in.md
@@ -20,6 +20,8 @@ Run your Backstage app with `yarn dev`. Navigate to `http://localhost:3000`.
 
 If you're not already logged in, you should see a login screen like this,
 
+![Screenshot of the the login screen](../assets/getting-started/login-screen.png)
+
 To login, you should choose the "Github" provider and click the "Sign in" button. This will redirect you to a Github OAuth page. Verify that the scopes mentioned on that page match the setup you did in [the authentication tutorial](./config/authentication.md). Once you click "Confirm", you will be brought back to the Backstage interface and signed in!
 
 If you are already logged in, you will be automatically brought to your Backstage instance.

From 708294012180f435dd61c87a827b752b6f3fb974 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:01:01 +0100
Subject: [PATCH 102/225] cli: add support for frontend-dynamic-container role
 in yarn start

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 .../cli/src/commands/build/buildFrontend.ts   | 27 +-----------
 packages/cli/src/commands/start/command.ts    |  8 ++++
 .../cli/src/commands/start/startFrontend.ts   | 11 ++++-
 packages/cli/src/lib/bundler/index.ts         |  1 +
 .../cli/src/lib/bundler/moduleFederation.ts   | 44 +++++++++++++++++++
 packages/cli/src/lib/bundler/types.ts         |  1 +
 6 files changed, 65 insertions(+), 27 deletions(-)
 create mode 100644 packages/cli/src/lib/bundler/moduleFederation.ts

diff --git a/packages/cli/src/commands/build/buildFrontend.ts b/packages/cli/src/commands/build/buildFrontend.ts
index 62da74e6d3..f29e0bdd38 100644
--- a/packages/cli/src/commands/build/buildFrontend.ts
+++ b/packages/cli/src/commands/build/buildFrontend.ts
@@ -16,11 +16,9 @@
 
 import fs from 'fs-extra';
 import { resolve as resolvePath } from 'path';
-import { buildBundle } from '../../lib/bundler';
+import { buildBundle, getModuleFederationOptions } from '../../lib/bundler';
 import { getEnvironmentParallelism } from '../../lib/parallel';
 import { loadCliConfig } from '../../lib/config';
-import chalk from 'chalk';
-import { BuildOptions } from '../../lib/bundler/types';
 
 interface BuildAppOptions {
   targetDir: string;
@@ -29,29 +27,6 @@ interface BuildAppOptions {
   isModuleFederationRemote?: true;
 }
 
-function getModuleFederationOptions(
-  name: string,
-  isRemote?: boolean,
-): BuildOptions['moduleFederation'] {
-  if (!isRemote && !process.env.EXPERIMENTAL_MODULE_FEDERATION) {
-    return undefined;
-  }
-
-  console.log(
-    chalk.yellow(
-      `⚠️  WARNING: Module federation is experimental and will receive immediate breaking changes in the future.`,
-    ),
-  );
-
-  return {
-    mode: isRemote ? 'remote' : 'host',
-    // The default output mode requires the name to be a usable as a code
-    // symbol, there might be better options here but for now we need to
-    // sanitize the name.
-    name: name.replaceAll('@', '').replaceAll('/', '__').replaceAll('-', '_'),
-  };
-}
-
 export async function buildFrontend(options: BuildAppOptions) {
   const { targetDir, writeStats, configPaths } = options;
   const { name } = await fs.readJson(resolvePath(targetDir, 'package.json'));
diff --git a/packages/cli/src/commands/start/command.ts b/packages/cli/src/commands/start/command.ts
index 2f2af95d85..aa46b717bb 100644
--- a/packages/cli/src/commands/start/command.ts
+++ b/packages/cli/src/commands/start/command.ts
@@ -15,6 +15,7 @@
  */
 
 import { OptionValues } from 'commander';
+import { PackageRole } from '@backstage/cli-node';
 import { findRoleFromCommand } from '../../lib/role';
 import { startBackend, startBackendPlugin } from './startBackend';
 import { startFrontend } from './startFrontend';
@@ -47,6 +48,13 @@ export async function command(opts: OptionValues): Promise<void> {
     case 'frontend-plugin':
     case 'frontend-plugin-module':
       return startFrontend({ entry: 'dev/index', ...options });
+    case 'frontend-dynamic-container' as PackageRole: // experimental
+      return startFrontend({
+        entry: 'src/index',
+        ...options,
+        skipOpenBrowser: true,
+        isModuleFederationRemote: true,
+      });
     default:
       throw new Error(
         `Start command is not supported for package role '${role}'`,
diff --git a/packages/cli/src/commands/start/startFrontend.ts b/packages/cli/src/commands/start/startFrontend.ts
index a809473788..627da1bd1a 100644
--- a/packages/cli/src/commands/start/startFrontend.ts
+++ b/packages/cli/src/commands/start/startFrontend.ts
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import { serveBundle } from '../../lib/bundler';
+import { readJson } from 'fs-extra';
+import { getModuleFederationOptions, serveBundle } from '../../lib/bundler';
+import { paths } from '../../lib/paths';
 
 interface StartAppOptions {
   verifyVersions?: boolean;
@@ -22,14 +24,21 @@ interface StartAppOptions {
 
   checksEnabled: boolean;
   configPaths: string[];
+  isModuleFederationRemote?: boolean;
 }
 
 export async function startFrontend(options: StartAppOptions) {
+  const { name } = await readJson(paths.resolveTarget('package.json'));
+
   const waitForExit = await serveBundle({
     entry: options.entry,
     checksEnabled: options.checksEnabled,
     configPaths: options.configPaths,
     verifyVersions: options.verifyVersions,
+    moduleFederation: getModuleFederationOptions(
+      name,
+      options.isModuleFederationRemote,
+    ),
   });
 
   await waitForExit();
diff --git a/packages/cli/src/lib/bundler/index.ts b/packages/cli/src/lib/bundler/index.ts
index a3b584efc4..2219784dc9 100644
--- a/packages/cli/src/lib/bundler/index.ts
+++ b/packages/cli/src/lib/bundler/index.ts
@@ -16,4 +16,5 @@
 
 export { serveBackend } from './backend';
 export { buildBundle } from './bundle';
+export { getModuleFederationOptions } from './moduleFederation';
 export { serveBundle } from './server';
diff --git a/packages/cli/src/lib/bundler/moduleFederation.ts b/packages/cli/src/lib/bundler/moduleFederation.ts
new file mode 100644
index 0000000000..ae3f9ab048
--- /dev/null
+++ b/packages/cli/src/lib/bundler/moduleFederation.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import chalk from 'chalk';
+import { ModuleFederationOptions } from './types';
+
+export function getModuleFederationOptions(
+  name: string,
+  isModuleFederationRemote?: boolean,
+): ModuleFederationOptions | undefined {
+  if (
+    !isModuleFederationRemote &&
+    !process.env.EXPERIMENTAL_MODULE_FEDERATION
+  ) {
+    return undefined;
+  }
+
+  console.log(
+    chalk.yellow(
+      `⚠️  WARNING: Module federation is experimental and will receive immediate breaking changes in the future.`,
+    ),
+  );
+
+  return {
+    mode: isModuleFederationRemote ? 'remote' : 'host',
+    // The default output mode requires the name to be a usable as a code
+    // symbol, there might be better options here but for now we need to
+    // sanitize the name.
+    name: name.replaceAll('@', '').replaceAll('/', '__').replaceAll('-', '_'),
+  };
+}
diff --git a/packages/cli/src/lib/bundler/types.ts b/packages/cli/src/lib/bundler/types.ts
index 7291ac0818..60c59f757b 100644
--- a/packages/cli/src/lib/bundler/types.ts
+++ b/packages/cli/src/lib/bundler/types.ts
@@ -43,6 +43,7 @@ export type ServeOptions = BundlingPathsOptions & {
   checksEnabled: boolean;
   configPaths: string[];
   verifyVersions?: boolean;
+  moduleFederation?: ModuleFederationOptions;
 };
 
 export type BuildOptions = BundlingPathsOptions & {

From 94ab20ebfa48ae8197be8180dfa86b7ee4ea6bfa Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:04:36 +0100
Subject: [PATCH 103/225] cli: skip opening browser when serving bundle for
 packages with frontend-dynamic-container role

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/commands/start/startFrontend.ts | 2 ++
 packages/cli/src/lib/bundler/server.ts           | 5 ++++-
 packages/cli/src/lib/bundler/types.ts            | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/start/startFrontend.ts b/packages/cli/src/commands/start/startFrontend.ts
index 627da1bd1a..20faf4a9ff 100644
--- a/packages/cli/src/commands/start/startFrontend.ts
+++ b/packages/cli/src/commands/start/startFrontend.ts
@@ -24,6 +24,7 @@ interface StartAppOptions {
 
   checksEnabled: boolean;
   configPaths: string[];
+  skipOpenBrowser?: boolean;
   isModuleFederationRemote?: boolean;
 }
 
@@ -35,6 +36,7 @@ export async function startFrontend(options: StartAppOptions) {
     checksEnabled: options.checksEnabled,
     configPaths: options.configPaths,
     verifyVersions: options.verifyVersions,
+    skipOpenBrowser: options.skipOpenBrowser,
     moduleFederation: getModuleFederationOptions(
       name,
       options.isModuleFederationRemote,
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index 1da15cd37e..cf35f65518 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -162,6 +162,7 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
   const config = await createConfig(paths, {
     ...commonConfigOptions,
     additionalEntryPoints: detectedModulesEntryPoint,
+    moduleFederation: options.moduleFederation,
   });
 
   if (process.env.EXPERIMENTAL_VITE) {
@@ -278,7 +279,9 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
     }
   });
 
-  openBrowser(url.href);
+  if (!options.skipOpenBrowser) {
+    openBrowser(url.href);
+  }
 
   const waitForExit = async () => {
     for (const signal of ['SIGINT', 'SIGTERM'] as const) {
diff --git a/packages/cli/src/lib/bundler/types.ts b/packages/cli/src/lib/bundler/types.ts
index 60c59f757b..f8e228c5c4 100644
--- a/packages/cli/src/lib/bundler/types.ts
+++ b/packages/cli/src/lib/bundler/types.ts
@@ -43,6 +43,7 @@ export type ServeOptions = BundlingPathsOptions & {
   checksEnabled: boolean;
   configPaths: string[];
   verifyVersions?: boolean;
+  skipOpenBrowser?: boolean;
   moduleFederation?: ModuleFederationOptions;
 };
 

From b7709255e8b3540176b7db675e9ad77e658920cc Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:12:16 +0100
Subject: [PATCH 104/225] cli: pass websocket host and port explicitly in
 configuration

When configuring the ReactRefreshPlugin and the
WebpackDevServer, we previously inferred the host
and port from the browser location. This is no
longer sufficient, since dynamic plugin containers
may be served from separate dev servers.

https://webpack.js.org/configuration/dev-server/#websocketurl
https://github.com/pmmmwh/react-refresh-webpack-plugin/blob/main/docs/API.md#sockhost

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/lib/bundler/config.ts     | 30 ++++++++++++++++++++++
 packages/cli/src/lib/bundler/server.ts     | 12 +++------
 packages/cli/src/lib/bundler/transforms.ts | 11 +-------
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 9a611a5954..1f08f74a85 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -29,6 +29,7 @@ import { ModuleFederationPlugin } from '@module-federation/enhanced/webpack';
 import { LinkedPackageResolvePlugin } from './LinkedPackageResolvePlugin';
 import ModuleScopePlugin from 'react-dev-utils/ModuleScopePlugin';
 import { RunScriptWebpackPlugin } from 'run-script-webpack-plugin';
+import ReactRefreshPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 import { paths as cliPaths } from '../../lib/paths';
 import fs from 'fs-extra';
 import { getPackages } from '@manypkg/get-packages';
@@ -54,6 +55,21 @@ export function resolveBaseUrl(config: Config): URL {
   }
 }
 
+export function resolveEndpoint(config: Config): {
+  host: string;
+  port: number;
+} {
+  const url = resolveBaseUrl(config);
+
+  return {
+    host: config.getOptionalString('app.listen.host') ?? url.hostname,
+    port:
+      config.getOptionalNumber('app.listen.port') ??
+      Number(url.port) ??
+      (url.protocol === 'https:' ? 443 : 80),
+  };
+}
+
 async function readBuildInfo() {
   const timestamp = Date.now();
 
@@ -108,6 +124,20 @@ export async function createConfig(
     publicPath = `${publicPath}${publicSubPath}`.replace('//', '/');
   }
 
+  if (isDev) {
+    const { host, port } = resolveEndpoint(options.frontendConfig);
+
+    plugins.push(
+      new ReactRefreshPlugin({
+        overlay: {
+          sockProtocol: 'ws',
+          sockHost: host,
+          sockPort: port,
+        },
+      }),
+    );
+  }
+
   if (checksEnabled) {
     plugins.push(
       new ForkTsCheckerWebpackPlugin({
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index cf35f65518..cbd76b4ead 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -30,7 +30,7 @@ import {
 import { paths as libPaths } from '../../lib/paths';
 import { loadCliConfig } from '../config';
 import { Lockfile } from '../versioning';
-import { createConfig, resolveBaseUrl } from './config';
+import { createConfig, resolveBaseUrl, resolveEndpoint } from './config';
 import { createDetectedModulesEntryPoint } from './packageDetection';
 import { resolveBundlingPaths, resolveOptionalBundlingPaths } from './paths';
 import { ServeOptions } from './types';
@@ -131,13 +131,7 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
 
   const { frontendConfig, fullConfig } = cliConfig;
   const url = resolveBaseUrl(frontendConfig);
-
-  const host =
-    frontendConfig.getOptionalString('app.listen.host') || url.hostname;
-  const port =
-    frontendConfig.getOptionalNumber('app.listen.port') ||
-    Number(url.port) ||
-    (url.protocol === 'https:' ? 443 : 80);
+  const { host, port } = resolveEndpoint(frontendConfig);
 
   const detectedModulesEntryPoint = await createDetectedModulesEntryPoint({
     config: fullConfig,
@@ -257,7 +251,7 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
         // When the dev server is behind a proxy, the host and public hostname differ
         allowedHosts: [url.hostname],
         client: {
-          webSocketURL: 'auto://0.0.0.0:0/ws',
+          webSocketURL: { hostname: host, port },
         },
       },
       compiler,
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index da1eec4e11..0900b8e48e 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -17,7 +17,6 @@
 import { ModuleOptions, WebpackPluginInstance } from 'webpack';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import { svgrTemplate } from '../svgrTemplate';
-import ReactRefreshPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 
 type Transforms = {
   loaders: ModuleOptions['rules'];
@@ -193,15 +192,7 @@ export const transforms = (options: TransformOptions): Transforms => {
 
   const plugins = new Array<WebpackPluginInstance>();
 
-  if (isDev) {
-    if (!isBackend) {
-      plugins.push(
-        new ReactRefreshPlugin({
-          overlay: { sockProtocol: 'ws' },
-        }),
-      );
-    }
-  } else {
+  if (!isDev) {
     plugins.push(
       new MiniCssExtractPlugin({
         filename: 'static/[name].[contenthash:8].css',

From be1ee471cf2b09d455256ad6edfa84031ca16489 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:18:20 +0100
Subject: [PATCH 105/225] cli: disable historyApiFallback for module federation
 remotes

Module federation remotes only serve static
assets, and aren't intended to be loaded directly
in a browser. As such, the historyApiFallback
isn't useful and should be disabled in this
context.

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/lib/bundler/server.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index cbd76b4ead..a3cbaeacc7 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -227,14 +227,17 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
               directory: paths.targetPublic,
             }
           : undefined,
-        historyApiFallback: {
-          // Paths with dots should still use the history fallback.
-          // See https://github.com/facebookincubator/create-react-app/issues/387.
-          disableDotRule: true,
+        historyApiFallback:
+          options.moduleFederation?.mode === 'remote'
+            ? false
+            : {
+                // Paths with dots should still use the history fallback.
+                // See https://github.com/facebookincubator/create-react-app/issues/387.
+                disableDotRule: true,
 
-          // The index needs to be rewritten relative to the new public path, including subroutes.
-          index: `${config.output?.publicPath}index.html`,
-        },
+                // The index needs to be rewritten relative to the new public path, including subroutes.
+                index: `${config.output?.publicPath}index.html`,
+              },
         server:
           url.protocol === 'https:'
             ? {

From f93ae496ce956598c56254d5420438be92faf0c0 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:19:32 +0100
Subject: [PATCH 106/225] cli: add CORS headers for webpack-dev-server content

This allows loading static assets from dev-servers
for dynamic plugin containers.

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/lib/bundler/server.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index a3cbaeacc7..0421f4d019 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -256,6 +256,12 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
         client: {
           webSocketURL: { hostname: host, port },
         },
+        headers: {
+          'Access-Control-Allow-Origin': '*',
+          'Access-Control-Allow-Methods': 'GET, OPTIONS',
+          'Access-Control-Allow-Headers':
+            'X-Requested-With, content-type, Authorization',
+        },
       },
       compiler,
     );

From e20fe546952f78e8f82faed76c03daf930d821ec Mon Sep 17 00:00:00 2001
From: Ramin G <rghara@outlook.com>
Date: Fri, 19 Jul 2024 15:56:09 -0400
Subject: [PATCH 107/225] Corrected typo in logging-in.md

Corrected typo in the description of the image

Signed-off-by: Ramin G <rghara@outlook.com>
---
 docs/getting-started/logging-in.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/logging-in.md b/docs/getting-started/logging-in.md
index 5386e98798..7d6fb5d55b 100644
--- a/docs/getting-started/logging-in.md
+++ b/docs/getting-started/logging-in.md
@@ -20,7 +20,7 @@ Run your Backstage app with `yarn dev`. Navigate to `http://localhost:3000`.
 
 If you're not already logged in, you should see a login screen like this,
 
-![Screenshot of the the login screen](../assets/getting-started/login-screen.png)
+![Screenshot of the login screen](../assets/getting-started/login-screen.png)
 
 To login, you should choose the "Github" provider and click the "Sign in" button. This will redirect you to a Github OAuth page. Verify that the scopes mentioned on that page match the setup you did in [the authentication tutorial](./config/authentication.md). Once you click "Confirm", you will be brought back to the Backstage interface and signed in!
 

From c761199ce774a272e303f4493ba4a9c505ee5131 Mon Sep 17 00:00:00 2001
From: rghara <ramin.g01@infosys.com>
Date: Fri, 19 Jul 2024 18:51:44 -0400
Subject: [PATCH 108/225] Replaced login screen image

Signed-off-by: rghara <ramin.g01@infosys.com>
---
 docs/assets/getting-started/login-screen.png | Bin 108521 -> 53116 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/assets/getting-started/login-screen.png b/docs/assets/getting-started/login-screen.png
index 70b56f399a22d19ad863f77db22739f67a352501..1af52cb2c9b0b95cac2b6e715077bf9095ec038c 100755
GIT binary patch
literal 53116
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

literal 108521
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


From aab708eb27b0a3809685d7d3e1057ac0f9ea8b54 Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sun, 21 Jul 2024 10:14:29 +0530
Subject: [PATCH 109/225] Added test cases for gitlab:issue:edit examples

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .changeset/plenty-tools-exist.md              |   5 +
 .../actions/gitlabIssueEdit.examples.test.ts  | 817 ++++++++++++++++++
 .../src/actions/gitlabIssueEdit.examples.ts   | 177 +++-
 3 files changed, 997 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/plenty-tools-exist.md
 create mode 100644 plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.examples.test.ts

diff --git a/.changeset/plenty-tools-exist.md b/.changeset/plenty-tools-exist.md
new file mode 100644
index 0000000000..0ce22a74f2
--- /dev/null
+++ b/.changeset/plenty-tools-exist.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': patch
+---
+
+Added test cases for gitlab:issue:edit examples
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.examples.test.ts
new file mode 100644
index 0000000000..7e50eac66c
--- /dev/null
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.examples.test.ts
@@ -0,0 +1,817 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
+import { ConfigReader } from '@backstage/core-app-api';
+import { ScmIntegrations } from '@backstage/integration';
+import { editGitlabIssueAction } from './gitlabIssueEdit';
+import { examples } from './gitlabIssueEdit.examples';
+import yaml from 'yaml';
+
+const mockGitlabClient = {
+  Issues: {
+    edit: jest.fn(),
+  },
+};
+jest.mock('@gitbeaker/rest', () => ({
+  Gitlab: class {
+    constructor() {
+      return mockGitlabClient;
+    }
+  },
+}));
+
+describe('gitlab:issue:edit', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.useFakeTimers({
+      now: new Date(1999, 6, 14, 12, 0, 0),
+    });
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  const config = new ConfigReader({
+    integrations: {
+      gitlab: [
+        {
+          host: 'gitlab.com',
+          token: 'myIntegrationsToken',
+          apiBaseUrl: 'https://gitlab.com/api/v4',
+        },
+      ],
+    },
+  });
+  const integrations = ScmIntegrations.fromConfig(config);
+
+  const action = editGitlabIssueAction({ integrations });
+
+  it(`Should ${examples[0].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[0].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: undefined,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: undefined,
+      weight: undefined,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[1].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[1].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [18],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: undefined,
+      updatedAt: '2024-05-10T18:00:00.000Z',
+      dueDate: '2024-09-28',
+      milestoneId: undefined,
+      weight: undefined,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[2].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[2].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+        epicId: undefined,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [18, 15],
+      confidential: false,
+      discussionLocked: true,
+      epicId: undefined,
+      labels: 'phase1:label1,phase2:label2',
+      updatedAt: '2024-05-10T18:00:00.000Z',
+      dueDate: '2024-09-28',
+      milestoneId: undefined,
+      weight: undefined,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[2].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[2].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+        epicId: undefined,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [18, 15],
+      confidential: false,
+      discussionLocked: true,
+      epicId: undefined,
+      labels: 'phase1:label1,phase2:label2',
+      updatedAt: '2024-05-10T18:00:00.000Z',
+      dueDate: '2024-09-28',
+      milestoneId: undefined,
+      weight: undefined,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[3].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[3].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: 'Computer banks to rule the world',
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: undefined,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: undefined,
+      weight: undefined,
+      stateEvent: 'close',
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[4].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[4].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: 'Computer banks to rule the world',
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: undefined,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: undefined,
+      weight: undefined,
+      stateEvent: 'reopen',
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[5].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[5].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [18, 20],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: undefined,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: input.milestoneId,
+      weight: undefined,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[6].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[6].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: input.labels,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: input.milestoneId,
+      weight: input.weight,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[7].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[7].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [],
+      confidential: input.confidential,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: input.labels,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: input.milestoneId,
+      weight: input.weight,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[8].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[8].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: undefined,
+      description: input.description,
+      assigneeIds: [],
+      confidential: false,
+      discussionLocked: input.discussionLocked,
+      epicId: undefined,
+      labels: input.labels,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: input.milestoneId,
+      weight: input.weight,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+
+  it(`Should ${examples[9].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[9].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: input.removeLabels,
+      description: input.description,
+      assigneeIds: [],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: input.labels,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: input.milestoneId,
+      weight: input.weight,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+  it(`Should ${examples[10].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[10].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: undefined,
+      addLabels: undefined,
+      removeLabels: input.removeLabels,
+      description: input.description,
+      assigneeIds: [],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: input.labels,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: input.milestoneId,
+      weight: input.weight,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+  it(`Should ${examples[11].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        issueIid: 42,
+        title: 'Computer banks to rule the world',
+      },
+      workspacePath: 'seen2much',
+    });
+
+    mockGitlabClient.Issues.edit.mockResolvedValue({
+      id: 123,
+      iid: 42,
+      web_url: 'https://gitlab.com/hangar18-/issues/42',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[11].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.Issues.edit).toHaveBeenCalledWith(12, 42, {
+      title: input.title,
+      issueType: input.issueType,
+      addLabels: undefined,
+      removeLabels: input.removeLabels,
+      description: input.description,
+      assigneeIds: [],
+      confidential: false,
+      discussionLocked: false,
+      epicId: undefined,
+      labels: input.labels,
+      updatedAt: new Date().toISOString(),
+      dueDate: undefined,
+      milestoneId: input.milestoneId,
+      weight: input.weight,
+      stateEvent: undefined,
+    });
+
+    expect(mockContext.output).toHaveBeenCalledWith('issueId', 123);
+    expect(mockContext.output).toHaveBeenCalledWith('issueIid', 42);
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'issueUrl',
+      'https://gitlab.com/hangar18-/issues/42',
+    );
+  });
+});
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.examples.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.examples.ts
index 861c0736f0..8686a66250 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.examples.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabIssueEdit.examples.ts
@@ -50,7 +50,7 @@ export const examples: TemplateExample[] = [
             title: 'Test Issue',
             assignees: [18],
             description: 'This is the edited description of the issue',
-            updatedAt: '2024-05-10 18:00:00.000',
+            updatedAt: '2024-05-10T18:00:00.000Z',
             dueDate: '2024-09-28',
           },
         },
@@ -72,7 +72,7 @@ export const examples: TemplateExample[] = [
             assignees: [18, 15],
             description: 'This is the description of the issue',
             confidential: false,
-            updatedAt: '2024-05-10 18:00:00.000',
+            updatedAt: '2024-05-10T18:00:00.000Z',
             dueDate: '2024-09-28',
             discussionLocked: true,
             epicId: 1,
@@ -82,4 +82,177 @@ export const examples: TemplateExample[] = [
       ],
     }),
   },
+  {
+    description: 'Edit a gitlab issue to change  its state to close',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            stateEvent: 'close',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Edit a gitlab issue to change  its state to reopened',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            stateEvent: 'reopen',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Edit a gitlab issue to assign it to multiple users and set milestone',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            title: 'Test issue with milestone',
+            assignees: [18, 20],
+            description: 'This issue has milestone set',
+            milestoneId: 5,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Edit a gitlab issue to add weight and update labels',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            title: 'Issue with weight and labels',
+            description: 'This issue has weight and new labels',
+            weight: 3,
+            labels: 'bug,urgent',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Edit a gitlab issue to make it confidential',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            title: 'Confidential Issue',
+            description: 'This issue is confidential',
+            confidential: true,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Edit a gitlab issue to lock the discussion',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            title: 'Locked Discussion Issue',
+            description: 'This discussion on this issue is locked',
+            discussionLocked: true,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Edit a gitlab issue to remove labels and update milestone',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            title: 'Issue with labels removed and milestone updated',
+            description: 'This issue has labels removed and milestone updated',
+            removeLabels: 'phase1:label1',
+            milestoneId: 6,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Edit a gitlab issue to remove some labels and new ones',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            title: 'Issue with labels updated',
+            description: 'This issue has labels removed and new ones added',
+            removeLabels: 'bug,urgent',
+            labels: 'enhancement:documentation',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Edit a gitlab issue to change issue type and add labels',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'gitlabIssue',
+          name: 'EditIssues',
+          action: 'gitlab:issue:edit',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            title: 'Issue with type and labels',
+            description: 'This issue has been changes and new labels added',
+            labels: 'task,high-priority',
+            issueType: 'task',
+          },
+        },
+      ],
+    }),
+  },
 ];

From 1ba4c2f6da8412660a236fa3588c4fa129cdf92e Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sun, 21 Jul 2024 10:59:49 +0530
Subject: [PATCH 110/225] Added test cases for gitlab:pipeline:trigger examples

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .changeset/strange-papayas-beg.md             |   5 +
 .../gitlabPipelineTrigger.examples.test.ts    | 320 ++++++++++++++++++
 .../actions/gitlabPipelineTrigger.examples.ts |  63 ++++
 3 files changed, 388 insertions(+)
 create mode 100644 .changeset/strange-papayas-beg.md
 create mode 100644 plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.examples.test.ts

diff --git a/.changeset/strange-papayas-beg.md b/.changeset/strange-papayas-beg.md
new file mode 100644
index 0000000000..6ce33fb029
--- /dev/null
+++ b/.changeset/strange-papayas-beg.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': patch
+---
+
+Added test cases for gitlab:pipeline:trigger examples
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.examples.test.ts
new file mode 100644
index 0000000000..53cbfb0b87
--- /dev/null
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.examples.test.ts
@@ -0,0 +1,320 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConfigReader } from '@backstage/core-app-api';
+import { ScmIntegrations } from '@backstage/integration';
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
+import { createTriggerGitlabPipelineAction } from './gitlabPipelineTrigger';
+import { examples } from './gitlabPipelineTrigger.examples';
+import yaml from 'yaml';
+
+const mockGitlabClient = {
+  PipelineTriggerTokens: {
+    create: jest.fn(),
+    trigger: jest.fn(),
+    remove: jest.fn(),
+  },
+};
+jest.mock('@gitbeaker/rest', () => ({
+  Gitlab: class {
+    constructor() {
+      return mockGitlabClient;
+    }
+  },
+}));
+
+describe('gitlab:pipeline:trigger', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    jest.clearAllMocks();
+    jest.useFakeTimers({
+      now: new Date(1988, 5, 3, 12, 0, 0),
+    });
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  const config = new ConfigReader({
+    integrations: {
+      gitlab: [
+        {
+          host: 'gitlab.com',
+          token: 'glpat-abcdef',
+          apiBaseUrl: 'https://gitlab.com/api/v4',
+        },
+      ],
+    },
+  });
+  const integrations = ScmIntegrations.fromConfig(config);
+
+  const action = createTriggerGitlabPipelineAction({ integrations });
+
+  it(`should ${examples[0].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        tokenDescription: 'Gitlab sample pipeline',
+        branch: 'main',
+      },
+      workspacePath: 'repository',
+    });
+
+    mockGitlabClient.PipelineTriggerTokens.create.mockResolvedValue({
+      id: 42,
+      description: 'Gitlab sample pipeline',
+      createdAt: new Date().toISOString(),
+      last_used: null,
+      token: 'abcdd-ghijkl',
+      updated_at: new Date().toISOString(),
+      owner: null,
+    });
+
+    mockGitlabClient.PipelineTriggerTokens.trigger.mockResolvedValue({
+      id: 99,
+      web_url: 'https://gitlab.com/hangar18-/pipelines/99',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[0].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.PipelineTriggerTokens.create).toHaveBeenCalledWith(
+      input.projectId,
+      input.tokenDescription,
+    );
+
+    expect(mockGitlabClient.PipelineTriggerTokens.trigger).toHaveBeenCalledWith(
+      input.projectId,
+      'main',
+      'abcdd-ghijkl',
+      { variables: input.variables },
+    );
+
+    expect(mockGitlabClient.PipelineTriggerTokens.remove).toHaveBeenCalledWith(
+      input.projectId,
+      42,
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'pipelineUrl',
+      'https://gitlab.com/hangar18-/pipelines/99',
+    );
+  });
+
+  it(`should ${examples[1].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        tokenDescription: 'Gitlab sample pipeline',
+        branch: 'main',
+      },
+      workspacePath: 'repository',
+    });
+
+    mockGitlabClient.PipelineTriggerTokens.create.mockResolvedValue({
+      id: 42,
+      description: 'Gitlab sample pipeline',
+      createdAt: new Date().toISOString(),
+      last_used: null,
+      token: 'abcdd-ghijkl',
+      updated_at: new Date().toISOString(),
+      owner: null,
+    });
+
+    mockGitlabClient.PipelineTriggerTokens.trigger.mockResolvedValue({
+      id: 99,
+      web_url: 'https://gitlab.com/hangar18-/pipelines/99',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[1].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.PipelineTriggerTokens.create).toHaveBeenCalledWith(
+      input.projectId,
+      input.tokenDescription,
+    );
+
+    expect(mockGitlabClient.PipelineTriggerTokens.trigger).toHaveBeenCalledWith(
+      input.projectId,
+      'main',
+      'abcdd-ghijkl',
+      { variables: input.variables },
+    );
+
+    expect(mockGitlabClient.PipelineTriggerTokens.remove).toHaveBeenCalledWith(
+      input.projectId,
+      42,
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'pipelineUrl',
+      'https://gitlab.com/hangar18-/pipelines/99',
+    );
+  });
+  it(`should ${examples[2].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        tokenDescription: 'Gitlab sample pipeline',
+        branch: 'main',
+      },
+      workspacePath: 'repository',
+    });
+
+    mockGitlabClient.PipelineTriggerTokens.create.mockResolvedValue({
+      id: 42,
+      description: 'Gitlab sample pipeline',
+      createdAt: new Date().toISOString(),
+      last_used: null,
+      token: 'abcdd-ghijkl',
+      updated_at: new Date().toISOString(),
+      owner: null,
+    });
+
+    mockGitlabClient.PipelineTriggerTokens.trigger.mockResolvedValue({
+      id: 99,
+      web_url: 'https://gitlab.com/hangar18-/pipelines/99',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[2].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.PipelineTriggerTokens.create).toHaveBeenCalledWith(
+      input.projectId,
+      input.tokenDescription,
+    );
+
+    expect(mockGitlabClient.PipelineTriggerTokens.trigger).toHaveBeenCalledWith(
+      input.projectId,
+      'main',
+      'abcdd-ghijkl',
+      { variables: input.variables },
+    );
+
+    expect(mockGitlabClient.PipelineTriggerTokens.remove).toHaveBeenCalledWith(
+      input.projectId,
+      42,
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'pipelineUrl',
+      'https://gitlab.com/hangar18-/pipelines/99',
+    );
+  });
+  it(`should ${examples[3].description}`, async () => {
+    const mockContext = createMockActionContext({
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 123,
+        tokenDescription: 'Gitlab sample pipeline',
+        branch: 'main',
+      },
+      workspacePath: 'repository',
+    });
+
+    mockGitlabClient.PipelineTriggerTokens.create.mockResolvedValue({
+      id: 42,
+      description: 'Gitlab sample pipeline',
+      createdAt: new Date().toISOString(),
+      last_used: null,
+      token: 'abcdd-ghijkl',
+      updated_at: new Date().toISOString(),
+      owner: null,
+    });
+
+    mockGitlabClient.PipelineTriggerTokens.trigger.mockResolvedValue({
+      id: 99,
+      web_url: 'https://gitlab.com/hangar18-/pipelines/99',
+    });
+
+    let input;
+    try {
+      input = yaml.parse(examples[3].example).steps[0].input;
+    } catch (error) {
+      console.error('Failed to parse YAML:', error);
+    }
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        ...input,
+      },
+    });
+
+    expect(mockGitlabClient.PipelineTriggerTokens.create).toHaveBeenCalledWith(
+      input.projectId,
+      input.tokenDescription,
+    );
+
+    expect(mockGitlabClient.PipelineTriggerTokens.trigger).toHaveBeenCalledWith(
+      input.projectId,
+      'main',
+      'abcdd-ghijkl',
+      { variables: input.variables },
+    );
+
+    expect(mockGitlabClient.PipelineTriggerTokens.remove).toHaveBeenCalledWith(
+      input.projectId,
+      42,
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'pipelineUrl',
+      'https://gitlab.com/hangar18-/pipelines/99',
+    );
+  });
+});
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.examples.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.examples.ts
index d0840030df..f213fcd83f 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.examples.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabPipelineTrigger.examples.ts
@@ -39,4 +39,67 @@ export const examples: TemplateExample[] = [
       ],
     }),
   },
+  {
+    description: 'Trigger a GitLab Project Pipeline with No Variables',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'triggerPipeline',
+          name: 'Trigger Project Pipeline',
+          action: 'gitlab:pipeline:trigger',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            tokenDescription:
+              'This is the text that will appear in the pipeline token',
+            token: 'glpt-xxxxxxxxxxxx',
+            branch: 'main',
+            variables: {},
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Trigger a GitLab Project Pipeline with Single Variables',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'triggerPipeline',
+          name: 'Trigger Project Pipeline',
+          action: 'gitlab:pipeline:trigger',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            tokenDescription:
+              'This is the text that will appear in the pipeline token',
+            token: 'glpt-xxxxxxxxxxxx',
+            branch: 'main',
+            variables: { var_one: 'one' },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Trigger a GitLab Project Pipeline with Multiple Variables',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'triggerPipeline',
+          name: 'Trigger Project Pipeline',
+          action: 'gitlab:pipeline:trigger',
+          input: {
+            ...commonGitlabConfigExample,
+            projectId: 12,
+            tokenDescription:
+              'This is the text that will appear in the pipeline token',
+            token: 'glpt-xxxxxxxxxxxx',
+            branch: 'main',
+            variables: { var_one: 'one', var_two: 'two', var_three: 'three' },
+          },
+        },
+      ],
+    }),
+  },
 ];

From e53074fb0ec07d93025beefa783f52de2ce21b4c Mon Sep 17 00:00:00 2001
From: Stephen Glass <stephen@stephen.glass>
Date: Sun, 21 Jul 2024 01:44:13 -0400
Subject: [PATCH 111/225] Update default backend plugin to use
 RootConfigService

Signed-off-by: Stephen Glass <stephen@stephen.glass>
---
 .changeset/heavy-numbers-love.md                             | 5 +++++
 .../cli/templates/default-backend-plugin/package.json.hbs    | 1 -
 .../templates/default-backend-plugin/src/service/router.ts   | 5 ++---
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/heavy-numbers-love.md

diff --git a/.changeset/heavy-numbers-love.md b/.changeset/heavy-numbers-love.md
new file mode 100644
index 0000000000..c18d144636
--- /dev/null
+++ b/.changeset/heavy-numbers-love.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated default backend plugin to use `RootConfigService` instead of `Config`. This also removes the dependency on `@backstage/config` as it's no longer used.
diff --git a/packages/cli/templates/default-backend-plugin/package.json.hbs b/packages/cli/templates/default-backend-plugin/package.json.hbs
index 3b808fc5e5..8dd31cbc38 100644
--- a/packages/cli/templates/default-backend-plugin/package.json.hbs
+++ b/packages/cli/templates/default-backend-plugin/package.json.hbs
@@ -31,7 +31,6 @@
     "@backstage/backend-common": "{{versionQuery '@backstage/backend-common'}}",
     "@backstage/backend-defaults": "{{versionQuery '@backstage/backend-defaults'}}",
     "@backstage/backend-plugin-api": "{{versionQuery '@backstage/backend-plugin-api'}}",
-    "@backstage/config": "{{versionQuery '@backstage/config'}}",
     "express": "{{versionQuery 'express' '4.17.1'}}",
     "express-promise-router": "{{versionQuery 'express-promise-router' '4.1.0'}}",
     "node-fetch": "{{versionQuery 'node-fetch' '2.6.7'}}"
diff --git a/packages/cli/templates/default-backend-plugin/src/service/router.ts b/packages/cli/templates/default-backend-plugin/src/service/router.ts
index 312d7e252e..ced654aa82 100644
--- a/packages/cli/templates/default-backend-plugin/src/service/router.ts
+++ b/packages/cli/templates/default-backend-plugin/src/service/router.ts
@@ -1,12 +1,11 @@
 import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
-import { LoggerService } from '@backstage/backend-plugin-api';
-import { Config } from '@backstage/config';
+import { LoggerService, RootConfigService } from '@backstage/backend-plugin-api';
 import express from 'express';
 import Router from 'express-promise-router';
 
 export interface RouterOptions {
   logger: LoggerService;
-  config: Config;
+  config: RootConfigService;
 }
 
 export async function createRouter(

From ef742dc56e889f254983cd1a0575c0880a104aa0 Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Sun, 21 Jul 2024 12:29:54 +0530
Subject: [PATCH 112/225] Added test cases for gitlab:projectAccessToken:create
 example

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .changeset/six-rats-kick.md                   |   5 +
 ...bProjectAccessTokenCreate.examples.test.ts | 256 ++++++++++++++++++
 ...gitlabProjectAccessTokenCreate.examples.ts | 158 +++++++++++
 .../gitlabProjectAccessTokenCreate.test.ts    | 221 +++++++++++++++
 4 files changed, 640 insertions(+)
 create mode 100644 .changeset/six-rats-kick.md
 create mode 100644 plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.test.ts

diff --git a/.changeset/six-rats-kick.md b/.changeset/six-rats-kick.md
new file mode 100644
index 0000000000..23958a2502
--- /dev/null
+++ b/.changeset/six-rats-kick.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': patch
+---
+
+Added test cases for gitlab:projectAccessToken:create example
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
index 811926cc82..0762212809 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
@@ -51,6 +51,10 @@ describe('gitlab:projectAccessToken:create examples', () => {
           host: 'hosted.gitlab.com',
           apiBaseUrl: 'https://api.hosted.gitlab.com',
         },
+        {
+          host: 'gitlab.example.com',
+          apiBaseUrl: 'https://api.gitlab.example.com',
+        },
       ],
     },
   });
@@ -192,4 +196,256 @@ describe('gitlab:projectAccessToken:create examples', () => {
 
     expect(mockContext.output).toHaveBeenCalledWith('access_token', 'TOKEN');
   });
+
+  it(`should ${examples[5].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[5].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '456',
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 30,
+        expiresAt: '2025-07-21',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
+
+  it(`should ${examples[6].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[6].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '456',
+      'full-access-token',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: '2024-12-31',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
+
+  it(`should ${examples[7].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[7].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '101112',
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: '2025-07-21',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
+
+  it(`should ${examples[8].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[8].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '101112',
+      'tokenname',
+      ['read_repository', 'read_api'],
+      {
+        accessLevel: 40,
+        expiresAt: '2025-07-21',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
+
+  it(`should ${examples[9].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[9].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '101112',
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 10,
+        expiresAt: '2025-07-21',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
+
+  it(`should ${examples[10].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[10].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '101112',
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: '2025-07-21',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
+
+  it(`should ${examples[11].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[11].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '101112',
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 50,
+        expiresAt: '2025-07-21',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
+
+  it(`should ${examples[12].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[12].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '101112',
+      'no-expiry-token',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: '2025-07-21',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
+
+  it(`should ${examples[13].description}`, async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'personal-access-token',
+      username: 'gitlab-user',
+    });
+
+    const input = yaml.parse(examples[13].example).steps[0].input;
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '101112',
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: '2025-07-21',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'personal-access-token',
+    );
+  });
 });
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.ts
index 8d4f335a46..89f8ae6269 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.ts
@@ -102,4 +102,162 @@ export const examples: TemplateExample[] = [
       ],
     }),
   },
+  {
+    description: 'Create a GitLab project access token with an access level',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.com?repo=repo&owner=owner',
+            projectId: '456',
+            accessLevel: 30,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitLab project access token with multiple options',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.com?repo=repo&owner=owner',
+            projectId: '456',
+            accessLevel: 40,
+            name: 'full-access-token',
+            expiresAt: '2024-12-31',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Create a GitLab project access token with a token for authorization',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.com?repo=repo&owner=owner',
+            projectId: '101112',
+            token: 'personal-access-token',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitLab project access token with read-only scopes',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.com?repo=repo&owner=owner',
+            projectId: '101112',
+            scopes: ['read_repository', 'read_api'],
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitLab project access token with guest access level',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.com?repo=repo&owner=owner',
+            projectId: '101112',
+            accessLevel: 10,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Create a GitLab project access token with maintainer access level',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.com?repo=repo&owner=owner',
+            projectId: '101112',
+            accessLevel: 40,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitLab project access token with owner access level',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.com?repo=repo&owner=owner',
+            projectId: '101112',
+            accessLevel: 50,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Create a GitLab project access token with a specified name and no expiration date',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.com?repo=repo&owner=owner',
+            projectId: '101112',
+            name: 'no-expiry-token',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Create a GitLab project access token for a specific gitlab instance',
+    example: yaml.stringify({
+      steps: [
+        {
+          id: 'createAccessToken',
+          action: 'gitlab:projectAccessToken:create',
+          name: 'Create GitLab Project Access Token',
+          input: {
+            repoUrl: 'gitlab.example.com?repo=repo&owner=owner',
+            projectId: '101112',
+          },
+        },
+      ],
+    }),
+  },
 ];
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.test.ts
new file mode 100644
index 0000000000..34ce8878f2
--- /dev/null
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.test.ts
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConfigReader } from '@backstage/config';
+import { ScmIntegrations } from '@backstage/integration';
+import { createMockActionContext } from '@backstage/plugin-scaffolder-node-test-utils';
+import { createGitlabProjectAccessTokenAction } from './gitlabProjectAccessTokenCreate'; // Adjust the import based on your project structure
+
+import { DateTime } from 'luxon';
+
+jest.mock('node-fetch');
+
+const mockGitlabClient = {
+  ProjectAccessTokens: {
+    create: jest.fn(),
+  },
+};
+
+jest.mock('@gitbeaker/rest', () => ({
+  Gitlab: class {
+    constructor() {
+      return mockGitlabClient;
+    }
+  },
+}));
+
+describe('gitlab:projectAccessToken:create examples', () => {
+  const config = new ConfigReader({
+    integrations: {
+      gitlab: [
+        {
+          host: 'gitlab.com',
+          token: 'gitlab-token',
+          apiBaseUrl: 'https://api.gitlab.com',
+        },
+        {
+          host: 'hosted.gitlab.com',
+          apiBaseUrl: 'https://api.hosted.gitlab.com',
+        },
+      ],
+    },
+  });
+
+  const integrations = ScmIntegrations.fromConfig(config);
+  const action = createGitlabProjectAccessTokenAction({ integrations });
+
+  const mockContext = createMockActionContext({
+    input: {
+      repoUrl: 'gitlab.com?repo=repo&owner=owner',
+    },
+  });
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should create a GitLab project access token with minimal options.', async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'gitlab-token',
+      username: 'gitlab-user',
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: '987',
+      },
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '987',
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'gitlab-token',
+    );
+  });
+
+  it('should create a GitLab project access token with custom scopes.', async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'gitlab-token',
+      username: 'gitlab-user',
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: '987',
+        scopes: ['read_registry', 'write_repository'],
+      },
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '987',
+      'tokenname',
+      ['read_registry', 'write_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'gitlab-token',
+    );
+  });
+
+  it('should create a GitLab project access token with a specified name.', async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'gitlab-token',
+      username: 'gitlab-user',
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: '2110',
+        name: 'token',
+      },
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '2110',
+      'token',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'gitlab-token',
+    );
+  });
+
+  it('should create a GitLab project access token with a numeric project ID.', async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'gitlab-token',
+      username: 'gitlab-user',
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: 23,
+      },
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      23,
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'gitlab-token',
+    );
+  });
+
+  it('should create a GitLab project access token with a specified expired Date.', async () => {
+    mockGitlabClient.ProjectAccessTokens.create.mockResolvedValue({
+      token: 'gitlab-token',
+      username: 'gitlab-user',
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        projectId: '123',
+        expiresAt: '1999-07-14',
+      },
+    });
+
+    expect(mockGitlabClient.ProjectAccessTokens.create).toHaveBeenCalledWith(
+      '123',
+      'tokenname',
+      ['read_repository'],
+      {
+        accessLevel: 40,
+        expiresAt: '1999-07-14',
+      },
+    );
+
+    expect(mockContext.output).toHaveBeenCalledWith(
+      'access_token',
+      'gitlab-token',
+    );
+  });
+});

From fba7537ad1fd83d9578d71ea546b36b3cf1be9f3 Mon Sep 17 00:00:00 2001
From: Jordan Slott <jordan.slott@twosigma.com>
Date: Sun, 21 Jul 2024 15:31:35 -0400
Subject: [PATCH 113/225] Fixes #25709 Memoize filtered entity graph nodes

Signed-off-by: Jordan Slott <jordan.slott@twosigma.com>
---
 .changeset/light-pianos-exercise.md                  |  5 +++++
 .../EntityRelationsGraph/useEntityRelationGraph.ts   | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/light-pianos-exercise.md

diff --git a/.changeset/light-pianos-exercise.md b/.changeset/light-pianos-exercise.md
new file mode 100644
index 0000000000..4bf161eb06
--- /dev/null
+++ b/.changeset/light-pianos-exercise.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-graph': patch
+---
+
+Memoize entity graph nodes when applying an `entityFilter` to prevent repeated redraws
diff --git a/plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityRelationGraph.ts b/plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityRelationGraph.ts
index af2a491ada..07e3085f1f 100644
--- a/plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityRelationGraph.ts
+++ b/plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityRelationGraph.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Entity } from '@backstage/catalog-model';
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useEntityStore } from './useEntityStore';
 import { pickBy } from 'lodash';
 
@@ -104,9 +104,13 @@ export function useEntityRelationGraph({
     requestEntities,
   ]);
 
-  const filteredEntities = entityFilter
-    ? pickBy(entities, (value, _key) => entityFilter(value))
-    : entities;
+  const filteredEntities = useMemo(
+    () =>
+      entityFilter
+        ? pickBy(entities, (value, _key) => entityFilter(value))
+        : entities,
+    [entities, entityFilter],
+  );
 
   return {
     entities: filteredEntities,

From 4e79d199ccb03c1b57dd4b889b83c058b13fd399 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 17 Jul 2024 19:59:42 +0200
Subject: [PATCH 114/225] backend-defaults,test-utils: use, export, and test
 health service

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/gentle-dryers-smile.md             |  5 ++
 .changeset/soft-gorillas-refuse.md            |  5 ++
 .../api-report-rootHttpRouter.md              |  8 ++
 .../rootHttpRouter/createHealthRouter.ts      |  6 +-
 .../src/entrypoints/rootHttpRouter/index.ts   |  1 +
 .../rootHttpRouterServiceFactory.test.ts      | 74 +++++++++++++++++++
 .../src/next/wiring/TestBackend.test.ts       |  9 +++
 .../src/next/wiring/TestBackend.ts            |  7 +-
 8 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/gentle-dryers-smile.md
 create mode 100644 .changeset/soft-gorillas-refuse.md
 create mode 100644 packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.test.ts

diff --git a/.changeset/gentle-dryers-smile.md b/.changeset/gentle-dryers-smile.md
new file mode 100644
index 0000000000..b061461da1
--- /dev/null
+++ b/.changeset/gentle-dryers-smile.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+The `createHealthRouter` utility that allows you to create a health check router is now exported via `@backstage/backend-defaults/rootHttpRouter`.
diff --git a/.changeset/soft-gorillas-refuse.md b/.changeset/soft-gorillas-refuse.md
new file mode 100644
index 0000000000..323c4d20d2
--- /dev/null
+++ b/.changeset/soft-gorillas-refuse.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+The default services for `startTestBackend` and `ServiceFactoryTester` now includes the Root Health Service.
diff --git a/packages/backend-defaults/api-report-rootHttpRouter.md b/packages/backend-defaults/api-report-rootHttpRouter.md
index 329398a7b8..36f3aa3ab6 100644
--- a/packages/backend-defaults/api-report-rootHttpRouter.md
+++ b/packages/backend-defaults/api-report-rootHttpRouter.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="express" />
 /// <reference types="node" />
 
 import { Config } from '@backstage/config';
@@ -17,10 +18,17 @@ import { LoggerService } from '@backstage/backend-plugin-api';
 import { RequestHandler } from 'express';
 import { RequestListener } from 'http';
 import { RootConfigService } from '@backstage/backend-plugin-api';
+import { RootHealthService } from '@backstage/backend-plugin-api';
 import { RootHttpRouterService } from '@backstage/backend-plugin-api';
+import { Router } from 'express';
 import type { Server } from 'node:http';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
 
+// @public (undocumented)
+export function createHealthRouter(options: {
+  health: RootHealthService;
+}): Router;
+
 // @public
 export function createHttpServer(
   listener: RequestListener,
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/createHealthRouter.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/createHealthRouter.ts
index 007d1dd9cd..3772ab0fab 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/createHealthRouter.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/createHealthRouter.ts
@@ -1,5 +1,3 @@
-import { RootHealthService } from '@backstage/backend-plugin-api';
-
 /*
  * Copyright 2024 The Backstage Authors
  *
@@ -16,9 +14,13 @@ import { RootHealthService } from '@backstage/backend-plugin-api';
  * limitations under the License.
  */
 
+import { RootHealthService } from '@backstage/backend-plugin-api';
 import Router from 'express-promise-router';
 import { Request, Response } from 'express';
 
+/**
+ * @public
+ */
 export function createHealthRouter(options: { health: RootHealthService }) {
   const router = Router();
 
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/index.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/index.ts
index 9c2d96dab2..e9aee8a0e0 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/index.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/index.ts
@@ -18,6 +18,7 @@ export {
   DefaultRootHttpRouter,
   type DefaultRootHttpRouterOptions,
 } from './DefaultRootHttpRouter';
+export { createHealthRouter } from './createHealthRouter';
 export * from './http';
 export {
   rootHttpRouterServiceFactory,
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.test.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.test.ts
new file mode 100644
index 0000000000..dea0159dff
--- /dev/null
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.test.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  ServiceFactoryTester,
+  mockServices,
+} from '@backstage/backend-test-utils';
+import { Express } from 'express';
+import request from 'supertest';
+import { rootHttpRouterServiceFactory } from './rootHttpRouterServiceFactory';
+import { coreServices } from '@backstage/backend-plugin-api';
+
+describe('rootHttpRouterServiceFactory', () => {
+  it('should make the health endpoints available', async () => {
+    let app: Express | undefined = undefined;
+
+    const tester = ServiceFactoryTester.from(
+      rootHttpRouterServiceFactory({
+        configure(options) {
+          options.applyDefaults();
+          app = options.app;
+        },
+      }),
+      {
+        dependencies: [
+          mockServices.rootConfig.factory({
+            data: {
+              app: { baseUrl: 'http://localhost' },
+              backend: {
+                baseUrl: 'http://localhost',
+                listen: { host: '', port: 0 },
+              },
+            },
+          }),
+        ],
+      },
+    );
+
+    // Trigger creation of the http service, accessing the app instance through the configure callback
+    await tester.getSubject();
+
+    await request(app!)
+      .get('/.backstage/health/v1/liveness')
+      .expect(200, { status: 'ok' });
+
+    await request(app!).get('/.backstage/health/v1/readiness').expect(503, {
+      message: 'Backend has not started yet',
+      status: 'error',
+    });
+
+    const lifecycle = await tester.getService(coreServices.rootLifecycle);
+
+    await (lifecycle as any).startup(); // Trigger startup by calling the private startup method
+
+    await request(app!).get('/.backstage/health/v1/readiness').expect(200, {
+      status: 'ok',
+    });
+
+    expect('test').toBe('test');
+  });
+});
diff --git a/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts b/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts
index ecba34290d..a01d4bebf5 100644
--- a/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts
+++ b/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts
@@ -242,6 +242,15 @@ describe('TestBackend', () => {
     expect(res.body).toEqual({ message: 'pong' });
   });
 
+  it('should expose health check endpoints', async () => {
+    const { server } = await startTestBackend({ features: [] });
+
+    const res = await request(server).get('/.backstage/health/v1/liveness');
+
+    expect(res.status).toEqual(200);
+    expect(res.body).toEqual({ status: 'ok' });
+  });
+
   it('should provide extension point implementations', async () => {
     expect.assertions(3);
 
diff --git a/packages/backend-test-utils/src/next/wiring/TestBackend.ts b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
index 16ee6b78d2..3d662a8c12 100644
--- a/packages/backend-test-utils/src/next/wiring/TestBackend.ts
+++ b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
@@ -37,6 +37,7 @@ import express from 'express';
 // Direct internal import to avoid duplication
 // eslint-disable-next-line @backstage/no-forbidden-package-imports
 import { InternalBackendFeature } from '@backstage/backend-plugin-api/src/wiring/types';
+import { createHealthRouter } from '@backstage/backend-defaults/rootHttpRouter';
 
 /** @public */
 export interface TestBackendOptions<TExtensionPoints extends any[]> {
@@ -73,6 +74,7 @@ export const defaultServiceFactories = [
   mockServices.lifecycle.factory(),
   mockServices.logger.factory(),
   mockServices.permissions.factory(),
+  mockServices.rootHealth.factory(),
   mockServices.rootLifecycle.factory(),
   mockServices.rootLogger.factory(),
   mockServices.scheduler.factory(),
@@ -251,15 +253,18 @@ export async function startTestBackend<TExtensionPoints extends any[]>(
       config: coreServices.rootConfig,
       lifecycle: coreServices.rootLifecycle,
       rootLogger: coreServices.rootLogger,
+      health: coreServices.rootHealth,
     },
-    async factory({ config, lifecycle, rootLogger }) {
+    async factory({ config, lifecycle, rootLogger, health }) {
       const router = DefaultRootHttpRouter.create();
       const logger = rootLogger.child({ service: 'rootHttpRouter' });
 
       const app = express();
 
       const middleware = MiddlewareFactory.create({ config, logger });
+      const healthRouter = createHealthRouter({ health });
 
+      app.use(healthRouter);
       app.use(router.handler());
       app.use(middleware.notFound());
       app.use(middleware.error());

From 31bfc4417f7a4d04d5899ce1d638505c30f9f627 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 20 Jul 2024 12:47:09 +0200
Subject: [PATCH 115/225] frontend-plugin-api: update extension data ref
 declaration to allow embedding of ID in type

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/dull-ghosts-double.md              |  7 ++
 .changeset/tiny-oranges-pretend.md            | 19 ++++++
 .../architecture/03-extensions.md             |  4 +-
 .../architecture/08-naming-patterns.md        | 20 +++---
 .../src/tree/instantiateAppNodeTree.test.ts   |  8 ++-
 packages/frontend-plugin-api/api-report.md    | 52 +++++++++++---
 .../src/extensions/createApiExtension.ts      |  5 +-
 .../createAppRootWrapperExtension.tsx         |  7 +-
 .../extensions/createComponentExtension.tsx   |  2 +-
 .../src/extensions/createNavItemExtension.tsx |  2 +-
 .../src/extensions/createNavLogoExtension.tsx |  2 +-
 .../src/extensions/createRouterExtension.tsx  |  7 +-
 .../extensions/createSignInPageExtension.tsx  |  2 +-
 .../src/extensions/createThemeExtension.ts    |  5 +-
 .../extensions/createTranslationExtension.ts  |  2 +-
 .../src/wiring/coreExtensionData.ts           |  8 ++-
 .../src/wiring/createExtension.test.ts        |  2 +-
 .../src/wiring/createExtension.ts             |  2 +-
 .../src/wiring/createExtensionDataRef.test.ts |  9 +++
 .../src/wiring/createExtensionDataRef.ts      | 68 +++++++++++++------
 .../src/wiring/createPlugin.test.ts           |  4 +-
 plugins/catalog-react/api-report-alpha.md     | 13 +++-
 plugins/catalog-react/src/alpha.tsx           | 18 ++---
 plugins/home/api-report-alpha.md              |  6 +-
 plugins/home/src/alpha.tsx                    |  4 +-
 plugins/search-react/api-report-alpha.md      |  1 +
 plugins/search-react/src/alpha.tsx            |  2 +-
 27 files changed, 204 insertions(+), 77 deletions(-)
 create mode 100644 .changeset/dull-ghosts-double.md
 create mode 100644 .changeset/tiny-oranges-pretend.md

diff --git a/.changeset/dull-ghosts-double.md b/.changeset/dull-ghosts-double.md
new file mode 100644
index 0000000000..0bc5a09791
--- /dev/null
+++ b/.changeset/dull-ghosts-double.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-catalog-react': patch
+'@backstage/plugin-search-react': patch
+'@backstage/plugin-home': patch
+---
+
+Updated alpha definitions of extension data references.
diff --git a/.changeset/tiny-oranges-pretend.md b/.changeset/tiny-oranges-pretend.md
new file mode 100644
index 0000000000..87227fb962
--- /dev/null
+++ b/.changeset/tiny-oranges-pretend.md
@@ -0,0 +1,19 @@
+---
+'@backstage/frontend-plugin-api': patch
+---
+
+Extension data references can now be defined in a way that encapsulates the ID string in the type, in addition to the data type itself. The old way of creating extension data references is deprecated and will be removed in a future release.
+
+For example, the following code:
+
+```ts
+export const myExtension = createExtensionDataRef<MyType>('my-plugin.my-data');
+```
+
+Should be updated to the following:
+
+```ts
+export const myExtension = createExtensionDataRef<MyType>().with({
+  id: 'my-plugin.my-data',
+});
+```
diff --git a/docs/frontend-system/architecture/03-extensions.md b/docs/frontend-system/architecture/03-extensions.md
index cdc73a17ec..2f3daba6f8 100644
--- a/docs/frontend-system/architecture/03-extensions.md
+++ b/docs/frontend-system/architecture/03-extensions.md
@@ -91,7 +91,9 @@ To create a new extension data reference to represent a type of shared extension
 
 ```ts
 export const reactElementExtensionDataRef =
-  createExtensionDataRef<React.JSX.Element>('my-plugin.reactElement');
+  createExtensionDataRef<React.JSX.Element>().with({
+    id: 'my-plugin.reactElement',
+  });
 ```
 
 The `ExtensionDataRef` can then be used to describe an output property of the extension. This will enforce typing on the return value of the extension factory:
diff --git a/docs/frontend-system/architecture/08-naming-patterns.md b/docs/frontend-system/architecture/08-naming-patterns.md
index a17525f3ce..f031b80d84 100644
--- a/docs/frontend-system/architecture/08-naming-patterns.md
+++ b/docs/frontend-system/architecture/08-naming-patterns.md
@@ -98,9 +98,9 @@ export interface SearchResultItemExtensionData {
 }
 
 export const searchResultItemExtensionDataRef =
-  createExtensionDataRef<SearchResultItemExtensionData>(
-    'search.search-result-item',
-  );
+  createExtensionDataRef<SearchResultItemExtensionData>().with({
+    id: 'search.search-result-item',
+  });
 ```
 
 #### Grouped Extension Data
@@ -109,8 +109,12 @@ This way of defining extension data is similar to the standalone way, but it use
 
 ```ts
 export const coreExtensionData = {
-  reactElement: createExtensionDataRef<ReactElement>('core.react-element'),
-  routePath: createExtensionDataRef<string>('core.route-path'),
+  reactElement: createExtensionDataRef<ReactElement>().with({
+    id: 'core.react-element',
+  }),
+  routePath: createExtensionDataRef<string>().with({
+    id: 'core.route-path',
+  }),
 };
 ```
 
@@ -125,9 +129,9 @@ export function createGraphiQLEndpointExtension(options) {
 
 // Use a TypeScript namespace to merge the extension data references with the extension creator
 export namespace createGraphiQLEndpointExtension {
-  export const endpointDataRef = createExtensionDataRef</* ... */>(
-    'graphiql.graphiql-endpoint.endpoint',
-  );
+  export const endpointDataRef = createExtensionDataRef</* ... */>().with({
+    id: 'graphiql.graphiql-endpoint.endpoint',
+  });
 }
 ```
 
diff --git a/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts b/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
index 3330b9add8..c5c66e8319 100644
--- a/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
+++ b/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
@@ -32,9 +32,11 @@ import { resolveAppTree } from './resolveAppTree';
 import { resolveExtensionDefinition } from '../../../frontend-plugin-api/src/wiring/resolveExtensionDefinition';
 import { withLogCollector } from '@backstage/test-utils';
 
-const testDataRef = createExtensionDataRef<string>('test');
-const otherDataRef = createExtensionDataRef<number>('other');
-const inputMirrorDataRef = createExtensionDataRef<unknown>('mirror');
+const testDataRef = createExtensionDataRef<string>().with({ id: 'test' });
+const otherDataRef = createExtensionDataRef<number>().with({ id: 'other' });
+const inputMirrorDataRef = createExtensionDataRef<unknown>().with({
+  id: 'mirror',
+});
 
 const simpleExtension = resolveExtensionDefinition(
   createExtension({
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 29c165aaaa..65445b5c4d 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -151,6 +151,7 @@ export { AnyApiRef };
 export type AnyExtensionDataMap = {
   [name in string]: ExtensionDataRef<
     unknown,
+    string,
     {
       optional?: true;
     }
@@ -317,13 +318,15 @@ export { configApiRef };
 
 // @public (undocumented)
 export interface ConfigurableExtensionDataRef<
+  TId extends string,
   TData,
   TConfig extends {
     optional?: true;
   } = {},
-> extends ExtensionDataRef<TData, TConfig> {
+> extends ExtensionDataRef<TData, TId, TConfig> {
   // (undocumented)
   optional(): ConfigurableExtensionDataRef<
+    TId,
     TData,
     TData & {
       optional: true;
@@ -347,9 +350,17 @@ export type CoreErrorBoundaryFallbackProps = {
 
 // @public (undocumented)
 export const coreExtensionData: {
-  reactElement: ConfigurableExtensionDataRef<JSX_2.Element, {}>;
-  routePath: ConfigurableExtensionDataRef<string, {}>;
-  routeRef: ConfigurableExtensionDataRef<RouteRef<AnyRouteRefParams>, {}>;
+  reactElement: ConfigurableExtensionDataRef<
+    'core.reactElement',
+    JSX_2.Element,
+    {}
+  >;
+  routePath: ConfigurableExtensionDataRef<'core.routing.path', string, {}>;
+  routeRef: ConfigurableExtensionDataRef<
+    'core.routing.ref',
+    RouteRef<AnyRouteRefParams>,
+    {}
+  >;
 };
 
 // @public (undocumented)
@@ -385,7 +396,11 @@ export function createApiExtension<
 // @public (undocumented)
 export namespace createApiExtension {
   const // (undocumented)
-    factoryDataRef: ConfigurableExtensionDataRef<AnyApiFactory, {}>;
+    factoryDataRef: ConfigurableExtensionDataRef<
+      'core.api.factory',
+      AnyApiFactory,
+      {}
+    >;
 }
 
 export { createApiFactory };
@@ -440,6 +455,7 @@ export function createAppRootWrapperExtension<
 export namespace createAppRootWrapperExtension {
   const // (undocumented)
     componentDataRef: ConfigurableExtensionDataRef<
+      'app.root.wrapper',
       React_2.ComponentType<{
         children?: React_2.ReactNode;
       }>,
@@ -477,6 +493,7 @@ export function createComponentExtension<
 export namespace createComponentExtension {
   const // (undocumented)
     componentDataRef: ConfigurableExtensionDataRef<
+      'core.component.component',
       {
         ref: ComponentRef;
         impl: ComponentType;
@@ -544,10 +561,17 @@ export interface CreateExtensionBlueprintOptions<
   output: TOutput;
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export function createExtensionDataRef<TData>(
   id: string,
-): ConfigurableExtensionDataRef<TData>;
+): ConfigurableExtensionDataRef<string, TData>;
+
+// @public (undocumented)
+export function createExtensionDataRef<TData>(): {
+  with<TId extends string>(options: {
+    id: TId;
+  }): ConfigurableExtensionDataRef<TId, TData>;
+};
 
 // @public (undocumented)
 export function createExtensionInput<
@@ -646,6 +670,7 @@ export function createNavItemExtension(options: {
 export namespace createNavItemExtension {
   const // (undocumented)
     targetDataRef: ConfigurableExtensionDataRef<
+      'core.nav-item.target',
       {
         title: string;
         icon: IconComponent_2;
@@ -667,6 +692,7 @@ export function createNavLogoExtension(options: {
 export namespace createNavLogoExtension {
   const // (undocumented)
     logoElementsDataRef: ConfigurableExtensionDataRef<
+      'core.nav-logo.logo-elements',
       {
         logoIcon?: JSX.Element | undefined;
         logoFull?: JSX.Element | undefined;
@@ -760,6 +786,7 @@ export function createRouterExtension<
 export namespace createRouterExtension {
   const // (undocumented)
     componentDataRef: ConfigurableExtensionDataRef<
+      'app.router.wrapper',
       React_2.ComponentType<{
         children?: React_2.ReactNode;
       }>,
@@ -796,6 +823,7 @@ export function createSignInPageExtension<
 export namespace createSignInPageExtension {
   const // (undocumented)
     componentDataRef: ConfigurableExtensionDataRef<
+      'core.sign-in-page.component',
       React_2.ComponentType<SignInPageProps>,
       {}
     >;
@@ -818,7 +846,11 @@ export function createThemeExtension(
 // @public (undocumented)
 export namespace createThemeExtension {
   const // (undocumented)
-    themeDataRef: ConfigurableExtensionDataRef<AppTheme, {}>;
+    themeDataRef: ConfigurableExtensionDataRef<
+      'core.theme.theme',
+      AppTheme,
+      {}
+    >;
 }
 
 // @public (undocumented)
@@ -831,6 +863,7 @@ export function createTranslationExtension(options: {
 export namespace createTranslationExtension {
   const // (undocumented)
     translationDataRef: ConfigurableExtensionDataRef<
+      'core.translation.translation',
       | TranslationResource<string>
       | TranslationMessages<
           string,
@@ -934,11 +967,12 @@ export interface ExtensionBoundaryProps {
 // @public (undocumented)
 export type ExtensionDataRef<
   TData,
+  TId extends string = string,
   TConfig extends {
     optional?: true;
   } = {},
 > = {
-  id: string;
+  id: TId;
   T: TData;
   config: TConfig;
   $$type: '@backstage/ExtensionDataRef';
diff --git a/packages/frontend-plugin-api/src/extensions/createApiExtension.ts b/packages/frontend-plugin-api/src/extensions/createApiExtension.ts
index 1680332960..93346f1ec9 100644
--- a/packages/frontend-plugin-api/src/extensions/createApiExtension.ts
+++ b/packages/frontend-plugin-api/src/extensions/createApiExtension.ts
@@ -72,6 +72,7 @@ export function createApiExtension<
 
 /** @public */
 export namespace createApiExtension {
-  export const factoryDataRef =
-    createExtensionDataRef<AnyApiFactory>('core.api.factory');
+  export const factoryDataRef = createExtensionDataRef<AnyApiFactory>().with({
+    id: 'core.api.factory',
+  });
 }
diff --git a/packages/frontend-plugin-api/src/extensions/createAppRootWrapperExtension.tsx b/packages/frontend-plugin-api/src/extensions/createAppRootWrapperExtension.tsx
index bbc51806af..ce2eb89f25 100644
--- a/packages/frontend-plugin-api/src/extensions/createAppRootWrapperExtension.tsx
+++ b/packages/frontend-plugin-api/src/extensions/createAppRootWrapperExtension.tsx
@@ -77,8 +77,7 @@ export function createAppRootWrapperExtension<
 
 /** @public */
 export namespace createAppRootWrapperExtension {
-  export const componentDataRef =
-    createExtensionDataRef<ComponentType<PropsWithChildren<{}>>>(
-      'app.root.wrapper',
-    );
+  export const componentDataRef = createExtensionDataRef<
+    ComponentType<PropsWithChildren<{}>>
+  >().with({ id: 'app.root.wrapper' });
 }
diff --git a/packages/frontend-plugin-api/src/extensions/createComponentExtension.tsx b/packages/frontend-plugin-api/src/extensions/createComponentExtension.tsx
index a1231d8353..a40ee3b069 100644
--- a/packages/frontend-plugin-api/src/extensions/createComponentExtension.tsx
+++ b/packages/frontend-plugin-api/src/extensions/createComponentExtension.tsx
@@ -92,5 +92,5 @@ export namespace createComponentExtension {
   export const componentDataRef = createExtensionDataRef<{
     ref: ComponentRef;
     impl: ComponentType;
-  }>('core.component.component');
+  }>().with({ id: 'core.component.component' });
 }
diff --git a/packages/frontend-plugin-api/src/extensions/createNavItemExtension.tsx b/packages/frontend-plugin-api/src/extensions/createNavItemExtension.tsx
index 4b92d4dace..2a2c47835a 100644
--- a/packages/frontend-plugin-api/src/extensions/createNavItemExtension.tsx
+++ b/packages/frontend-plugin-api/src/extensions/createNavItemExtension.tsx
@@ -61,5 +61,5 @@ export namespace createNavItemExtension {
     title: string;
     icon: IconComponent;
     routeRef: RouteRef<undefined>;
-  }>('core.nav-item.target');
+  }>().with({ id: 'core.nav-item.target' });
 }
diff --git a/packages/frontend-plugin-api/src/extensions/createNavLogoExtension.tsx b/packages/frontend-plugin-api/src/extensions/createNavLogoExtension.tsx
index 3d66b26d6b..1f2419bd02 100644
--- a/packages/frontend-plugin-api/src/extensions/createNavLogoExtension.tsx
+++ b/packages/frontend-plugin-api/src/extensions/createNavLogoExtension.tsx
@@ -51,5 +51,5 @@ export namespace createNavLogoExtension {
   export const logoElementsDataRef = createExtensionDataRef<{
     logoIcon?: JSX.Element;
     logoFull?: JSX.Element;
-  }>('core.nav-logo.logo-elements');
+  }>().with({ id: 'core.nav-logo.logo-elements' });
 }
diff --git a/packages/frontend-plugin-api/src/extensions/createRouterExtension.tsx b/packages/frontend-plugin-api/src/extensions/createRouterExtension.tsx
index 32d61f7e60..12f946e8a7 100644
--- a/packages/frontend-plugin-api/src/extensions/createRouterExtension.tsx
+++ b/packages/frontend-plugin-api/src/extensions/createRouterExtension.tsx
@@ -77,8 +77,7 @@ export function createRouterExtension<
 
 /** @public */
 export namespace createRouterExtension {
-  export const componentDataRef =
-    createExtensionDataRef<ComponentType<PropsWithChildren<{}>>>(
-      'app.router.wrapper',
-    );
+  export const componentDataRef = createExtensionDataRef<
+    ComponentType<PropsWithChildren<{}>>
+  >().with({ id: 'app.router.wrapper' });
 }
diff --git a/packages/frontend-plugin-api/src/extensions/createSignInPageExtension.tsx b/packages/frontend-plugin-api/src/extensions/createSignInPageExtension.tsx
index b525cc3a7b..312d30c78c 100644
--- a/packages/frontend-plugin-api/src/extensions/createSignInPageExtension.tsx
+++ b/packages/frontend-plugin-api/src/extensions/createSignInPageExtension.tsx
@@ -79,5 +79,5 @@ export function createSignInPageExtension<
 export namespace createSignInPageExtension {
   export const componentDataRef = createExtensionDataRef<
     ComponentType<SignInPageProps>
-  >('core.sign-in-page.component');
+  >().with({ id: 'core.sign-in-page.component' });
 }
diff --git a/packages/frontend-plugin-api/src/extensions/createThemeExtension.ts b/packages/frontend-plugin-api/src/extensions/createThemeExtension.ts
index cc6dbdabe9..1740f05a5a 100644
--- a/packages/frontend-plugin-api/src/extensions/createThemeExtension.ts
+++ b/packages/frontend-plugin-api/src/extensions/createThemeExtension.ts
@@ -33,6 +33,7 @@ export function createThemeExtension(theme: AppTheme) {
 
 /** @public */
 export namespace createThemeExtension {
-  export const themeDataRef =
-    createExtensionDataRef<AppTheme>('core.theme.theme');
+  export const themeDataRef = createExtensionDataRef<AppTheme>().with({
+    id: 'core.theme.theme',
+  });
 }
diff --git a/packages/frontend-plugin-api/src/extensions/createTranslationExtension.ts b/packages/frontend-plugin-api/src/extensions/createTranslationExtension.ts
index 8497a64b88..9445e32e24 100644
--- a/packages/frontend-plugin-api/src/extensions/createTranslationExtension.ts
+++ b/packages/frontend-plugin-api/src/extensions/createTranslationExtension.ts
@@ -38,5 +38,5 @@ export function createTranslationExtension(options: {
 export namespace createTranslationExtension {
   export const translationDataRef = createExtensionDataRef<
     TranslationResource | TranslationMessages
-  >('core.translation.translation');
+  >().with({ id: 'core.translation.translation' });
 }
diff --git a/packages/frontend-plugin-api/src/wiring/coreExtensionData.ts b/packages/frontend-plugin-api/src/wiring/coreExtensionData.ts
index a6ff41f6b0..cb48cb8df3 100644
--- a/packages/frontend-plugin-api/src/wiring/coreExtensionData.ts
+++ b/packages/frontend-plugin-api/src/wiring/coreExtensionData.ts
@@ -20,7 +20,9 @@ import { createExtensionDataRef } from './createExtensionDataRef';
 
 /** @public */
 export const coreExtensionData = {
-  reactElement: createExtensionDataRef<JSX.Element>('core.reactElement'),
-  routePath: createExtensionDataRef<string>('core.routing.path'),
-  routeRef: createExtensionDataRef<RouteRef>('core.routing.ref'),
+  reactElement: createExtensionDataRef<JSX.Element>().with({
+    id: 'core.reactElement',
+  }),
+  routePath: createExtensionDataRef<string>().with({ id: 'core.routing.path' }),
+  routeRef: createExtensionDataRef<RouteRef>().with({ id: 'core.routing.ref' }),
 };
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index 42ab21db80..4323737540 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -18,7 +18,7 @@ import { createExtension } from './createExtension';
 import { createExtensionDataRef } from './createExtensionDataRef';
 import { createExtensionInput } from './createExtensionInput';
 
-const stringData = createExtensionDataRef<string>('string');
+const stringData = createExtensionDataRef<string>().with({ id: 'string' });
 
 function unused(..._any: any[]) {}
 
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 28dc6a4e29..e87f3a638e 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -22,7 +22,7 @@ import { ExtensionInput } from './createExtensionInput';
 
 /** @public */
 export type AnyExtensionDataMap = {
-  [name in string]: ExtensionDataRef<unknown, { optional?: true }>;
+  [name in string]: ExtensionDataRef<unknown, string, { optional?: true }>;
 };
 
 /** @public */
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.test.ts b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.test.ts
index f7a0dc82d0..f979a7def0 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.test.ts
@@ -18,6 +18,15 @@ import { createExtensionDataRef } from './createExtensionDataRef';
 
 describe('createExtensionDataRef', () => {
   it('can be created and read', () => {
+    const ref = createExtensionDataRef().with({ id: 'foo' });
+    expect(ref.id).toBe('foo');
+    expect(String(ref)).toBe('ExtensionDataRef{id=foo,optional=false}');
+    const refOptional = ref.optional();
+    expect(refOptional.id).toBe('foo');
+    expect(String(refOptional)).toBe('ExtensionDataRef{id=foo,optional=true}');
+  });
+
+  it('can be created and read in the deprecated way', () => {
     const ref = createExtensionDataRef('foo');
     expect(ref.id).toBe('foo');
     expect(String(ref)).toBe('ExtensionDataRef{id=foo,optional=false}');
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
index a7f4e4374e..a1c7b462f2 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
@@ -17,9 +17,10 @@
 /** @public */
 export type ExtensionDataRef<
   TData,
+  TId extends string = string,
   TConfig extends { optional?: true } = {},
 > = {
-  id: string;
+  id: TId;
   T: TData;
   config: TConfig;
   $$type: '@backstage/ExtensionDataRef';
@@ -27,30 +28,59 @@ export type ExtensionDataRef<
 
 /** @public */
 export interface ConfigurableExtensionDataRef<
+  TId extends string,
   TData,
   TConfig extends { optional?: true } = {},
-> extends ExtensionDataRef<TData, TConfig> {
-  optional(): ConfigurableExtensionDataRef<TData, TData & { optional: true }>;
+> extends ExtensionDataRef<TData, TId, TConfig> {
+  optional(): ConfigurableExtensionDataRef<
+    TId,
+    TData,
+    TData & { optional: true }
+  >;
 }
 
-// TODO: change to options object with ID.
-/** @public */
+/**
+ * @public
+ * @deprecated Use the following form instead: `createExtensionDataRef<Type>().with({ id: 'core.foo' })`
+ */
 export function createExtensionDataRef<TData>(
   id: string,
-): ConfigurableExtensionDataRef<TData> {
+): ConfigurableExtensionDataRef<string, TData>;
+/** @public */
+export function createExtensionDataRef<TData>(): {
+  with<TId extends string>(options: {
+    id: TId;
+  }): ConfigurableExtensionDataRef<TId, TData>;
+};
+export function createExtensionDataRef<TData>(id?: string):
+  | ConfigurableExtensionDataRef<string, TData>
+  | {
+      with<TId extends string>(options: {
+        id: TId;
+      }): ConfigurableExtensionDataRef<TId, TData>;
+    } {
+  const createRef = <TId extends string>(refId: TId) =>
+    ({
+      id: refId,
+      $$type: '@backstage/ExtensionDataRef',
+      config: {},
+      optional() {
+        return {
+          ...this,
+          config: { ...this.config, optional: true },
+        };
+      },
+      toString() {
+        const optional = Boolean(this.config.optional);
+        return `ExtensionDataRef{id=${refId},optional=${optional}}`;
+      },
+    } as ConfigurableExtensionDataRef<TId, TData, { optional?: true }>);
+  if (id) {
+    return createRef(id);
+  }
   return {
-    id,
-    $$type: '@backstage/ExtensionDataRef',
-    config: {},
-    optional() {
-      return {
-        ...this,
-        config: { ...this.config, optional: true },
-      };
+    with<TId extends string>(options: { id: TId }) {
+      return createRef(options.id);
     },
-    toString() {
-      const optional = Boolean(this.config.optional);
-      return `ExtensionDataRef{id=${id},optional=${optional}}`;
-    },
-  } as ConfigurableExtensionDataRef<TData, { optional?: true }>;
+  };
 }
diff --git a/packages/frontend-plugin-api/src/wiring/createPlugin.test.ts b/packages/frontend-plugin-api/src/wiring/createPlugin.test.ts
index dab8a9778a..bb9bdc2107 100644
--- a/packages/frontend-plugin-api/src/wiring/createPlugin.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createPlugin.test.ts
@@ -27,7 +27,9 @@ import { MockConfigApi, renderWithEffects } from '@backstage/test-utils';
 import { createExtensionInput } from './createExtensionInput';
 import { BackstagePlugin } from './types';
 
-const nameExtensionDataRef = createExtensionDataRef<string>('name');
+const nameExtensionDataRef = createExtensionDataRef<string>().with({
+  id: 'name',
+});
 
 const Extension1 = createExtension({
   name: '1',
diff --git a/plugins/catalog-react/api-report-alpha.md b/plugins/catalog-react/api-report-alpha.md
index b82c7ae3e2..d2bfb29458 100644
--- a/plugins/catalog-react/api-report-alpha.md
+++ b/plugins/catalog-react/api-report-alpha.md
@@ -17,12 +17,21 @@ import { TranslationRef } from '@backstage/core-plugin-api/alpha';
 
 // @alpha (undocumented)
 export const catalogExtensionData: {
-  entityContentTitle: ConfigurableExtensionDataRef<string, {}>;
+  entityContentTitle: ConfigurableExtensionDataRef<
+    'catalog.entity-content-title',
+    string,
+    {}
+  >;
   entityFilterFunction: ConfigurableExtensionDataRef<
+    'catalog.entity-filter-function',
     (entity: Entity) => boolean,
     {}
   >;
-  entityFilterExpression: ConfigurableExtensionDataRef<string, {}>;
+  entityFilterExpression: ConfigurableExtensionDataRef<
+    'catalog.entity-filter-expression',
+    string,
+    {}
+  >;
 };
 
 // @alpha (undocumented)
diff --git a/plugins/catalog-react/src/alpha.tsx b/plugins/catalog-react/src/alpha.tsx
index 85712b358a..e81b8e5ebf 100644
--- a/plugins/catalog-react/src/alpha.tsx
+++ b/plugins/catalog-react/src/alpha.tsx
@@ -36,15 +36,15 @@ export * from './translation';
 
 /** @alpha */
 export const catalogExtensionData = {
-  entityContentTitle: createExtensionDataRef<string>(
-    'catalog.entity-content-title',
-  ),
-  entityFilterFunction: createExtensionDataRef<(entity: Entity) => boolean>(
-    'catalog.entity-filter-function',
-  ),
-  entityFilterExpression: createExtensionDataRef<string>(
-    'catalog.entity-filter-expression',
-  ),
+  entityContentTitle: createExtensionDataRef<string>().with({
+    id: 'catalog.entity-content-title',
+  }),
+  entityFilterFunction: createExtensionDataRef<
+    (entity: Entity) => boolean
+  >().with({ id: 'catalog.entity-filter-function' }),
+  entityFilterExpression: createExtensionDataRef<string>().with({
+    id: 'catalog.entity-filter-expression',
+  }),
 };
 
 // TODO: Figure out how to merge with provided config schema
diff --git a/plugins/home/api-report-alpha.md b/plugins/home/api-report-alpha.md
index 35ce0bb86c..1dd3da96be 100644
--- a/plugins/home/api-report-alpha.md
+++ b/plugins/home/api-report-alpha.md
@@ -11,7 +11,11 @@ const _default: BackstagePlugin<{}, {}>;
 export default _default;
 
 // @alpha (undocumented)
-export const titleExtensionDataRef: ConfigurableExtensionDataRef<string, {}>;
+export const titleExtensionDataRef: ConfigurableExtensionDataRef<
+  'title',
+  string,
+  {}
+>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/home/src/alpha.tsx b/plugins/home/src/alpha.tsx
index e9ff26c9e1..b13c2a2e0e 100644
--- a/plugins/home/src/alpha.tsx
+++ b/plugins/home/src/alpha.tsx
@@ -31,7 +31,9 @@ const rootRouteRef = createRouteRef();
 /**
  * @alpha
  */
-export const titleExtensionDataRef = createExtensionDataRef<string>('title');
+export const titleExtensionDataRef = createExtensionDataRef<string>().with({
+  id: 'title',
+});
 
 const homePage = createPageExtension({
   defaultPath: '/home',
diff --git a/plugins/search-react/api-report-alpha.md b/plugins/search-react/api-report-alpha.md
index 36f5f049c5..aea85d0f81 100644
--- a/plugins/search-react/api-report-alpha.md
+++ b/plugins/search-react/api-report-alpha.md
@@ -31,6 +31,7 @@ export function createSearchResultListItemExtension<
 export namespace createSearchResultListItemExtension {
   const // (undocumented)
     itemDataRef: ConfigurableExtensionDataRef<
+      'search.search-result-list-item.item',
       {
         predicate?: SearchResultItemExtensionPredicate | undefined;
         component: SearchResultItemExtensionComponent;
diff --git a/plugins/search-react/src/alpha.tsx b/plugins/search-react/src/alpha.tsx
index db198fa99d..a22eaf4244 100644
--- a/plugins/search-react/src/alpha.tsx
+++ b/plugins/search-react/src/alpha.tsx
@@ -137,5 +137,5 @@ export namespace createSearchResultListItemExtension {
   export const itemDataRef = createExtensionDataRef<{
     predicate?: SearchResultItemExtensionPredicate;
     component: SearchResultItemExtensionComponent;
-  }>('search.search-result-list-item.item');
+  }>().with({ id: 'search.search-result-list-item.item' });
 }

From 0bfe7efa2284b31592c9966278f6d5ad5850c27a Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 18 Jul 2024 14:54:24 +0200
Subject: [PATCH 116/225] chore: wip Signed-off-by: blam <ben@blam.sh>

Signed-off-by: blam <ben@blam.sh>
---
 .../frontend-app-api/src/wiring/createApp.tsx |  1 +
 .../src/extensions/IconBundleBlueprint.ts     | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts

diff --git a/packages/frontend-app-api/src/wiring/createApp.tsx b/packages/frontend-app-api/src/wiring/createApp.tsx
index cf6ea6dab4..ae7283f301 100644
--- a/packages/frontend-app-api/src/wiring/createApp.tsx
+++ b/packages/frontend-app-api/src/wiring/createApp.tsx
@@ -171,6 +171,7 @@ export interface CreateAppFeatureLoader {
 
 /** @public */
 export function createApp(options?: {
+  /** @deprecated - TODO */
   icons?: { [key in string]: IconComponent };
   features?: (FrontendFeature | CreateAppFeatureLoader)[];
   configLoader?: () => Promise<{ config: ConfigApi }>;
diff --git a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
new file mode 100644
index 0000000000..7008dba5a1
--- /dev/null
+++ b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { IconComponent } from '../icons';
+import { createExtensionBlueprint, createExtensionDataRef } from '../wiring';
+
+const iconsDataRef =
+  createExtensionDataRef<{ [key in string]: IconComponent }>('core.icons');
+
+/** @public */
+export const IconBundleBlueprint = createExtensionBlueprint({
+  kind: 'icon-bundle',
+  namespace: 'app',
+  attachTo: { id: 'app', input: 'icons' },
+  output: {
+    icons: iconsDataRef,
+  },
+  factory: (_, params: { icons: { [key in string]: IconComponent } }) => params,
+});

From 39f36a944251d056362702622d82eacd6ff54bb6 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 22 Jul 2024 14:06:27 +0200
Subject: [PATCH 117/225] auth-backend-module-microsoft-provider: update scope
 handling to define required scopes in backend

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/new-scissors-try.md                |  5 ++
 docs/auth/microsoft/provider.md               |  4 +-
 .../src/authenticator.ts                      | 20 ++++--
 .../src/module.test.ts                        | 65 ++++++++++++++++++-
 4 files changed, 83 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/new-scissors-try.md

diff --git a/.changeset/new-scissors-try.md b/.changeset/new-scissors-try.md
new file mode 100644
index 0000000000..a9e9a45ce7
--- /dev/null
+++ b/.changeset/new-scissors-try.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend-module-microsoft-provider': patch
+---
+
+Updated the Microsoft authenticator to accurately define required scopes, but to also omit the required and additional scopes when requesting resource scopes.
diff --git a/docs/auth/microsoft/provider.md b/docs/auth/microsoft/provider.md
index f799eeb627..60104b99b7 100644
--- a/docs/auth/microsoft/provider.md
+++ b/docs/auth/microsoft/provider.md
@@ -67,8 +67,6 @@ auth:
         clientSecret: ${AZURE_CLIENT_SECRET}
         tenantId: ${AZURE_TENANT_ID}
         domainHint: ${AZURE_TENANT_ID}
-        additionalScopes:
-          - Mail.Send
         signIn:
           resolvers:
             # typically you would pick one of these
@@ -86,7 +84,7 @@ The Microsoft provider is a structure with three mandatory configuration keys:
   Leave blank if your app registration is multi tenant.
   When specified, this reduces login friction for users with accounts in multiple tenants by automatically filtering away accounts from other tenants.
   For more details, see [Home Realm Discovery](https://learn.microsoft.com/en-us/azure/active-directory/manage-apps/home-realm-discovery-policy)
-- `additionalScopes` (optional): List of scopes for the App Registration. The default and mandatory value is ['user.read'].
+- `additionalScopes` (optional): List of scopes for the App Registration, to be requested in addition to the required ones.
 
 ### Resolvers
 
diff --git a/plugins/auth-backend-module-microsoft-provider/src/authenticator.ts b/plugins/auth-backend-module-microsoft-provider/src/authenticator.ts
index 1b6eb87fae..fe7dc8f7e1 100644
--- a/plugins/auth-backend-module-microsoft-provider/src/authenticator.ts
+++ b/plugins/auth-backend-module-microsoft-provider/src/authenticator.ts
@@ -21,21 +21,30 @@ import {
   PassportProfile,
 } from '@backstage/plugin-auth-node';
 import { ExtendedMicrosoftStrategy } from './strategy';
-import { union } from 'lodash';
 
 /** @public */
 export const microsoftAuthenticator = createOAuthAuthenticator({
   defaultProfileTransform:
     PassportOAuthAuthenticatorHelper.defaultProfileTransform,
+  scopes: {
+    required: ['email', 'openid', 'offline_access', 'user.read'],
+    transform({ requested, granted, required, additional }) {
+      // Resources scopes are of the form `<resource>/<scope>`, and are handled
+      // separately from the normal scopes in the client. When request a
+      // resource scope we should only include forward the request scope along
+      // with offline_access.
+      const hasResourceScope = Array.from(requested).some(s => s.includes('/'));
+      if (hasResourceScope) {
+        return [...requested, 'offline_access'];
+      }
+      return [...requested, ...granted, ...required, ...additional];
+    },
+  },
   initialize({ callbackUrl, config }) {
     const clientId = config.getString('clientId');
     const clientSecret = config.getString('clientSecret');
     const tenantId = config.getString('tenantId');
     const domainHint = config.getOptionalString('domainHint');
-    const scope = union(
-      ['user.read'],
-      config.getOptionalStringArray('additionalScopes'),
-    );
 
     const helper = PassportOAuthAuthenticatorHelper.from(
       new ExtendedMicrosoftStrategy(
@@ -44,7 +53,6 @@ export const microsoftAuthenticator = createOAuthAuthenticator({
           clientSecret: clientSecret,
           callbackURL: callbackUrl,
           tenant: tenantId,
-          scope: scope,
         },
         (
           accessToken: string,
diff --git a/plugins/auth-backend-module-microsoft-provider/src/module.test.ts b/plugins/auth-backend-module-microsoft-provider/src/module.test.ts
index b50956b9eb..a072b99bde 100644
--- a/plugins/auth-backend-module-microsoft-provider/src/module.test.ts
+++ b/plugins/auth-backend-module-microsoft-provider/src/module.test.ts
@@ -67,7 +67,7 @@ describe('authModuleMicrosoftProvider', () => {
     expect(startUrl.pathname).toBe('/my-tenant-id/oauth2/v2.0/authorize');
     expect(Object.fromEntries(startUrl.searchParams)).toEqual({
       response_type: 'code',
-      scope: 'User.Read.All',
+      scope: 'email openid offline_access user.read User.Read.All',
       client_id: 'my-client-id',
       redirect_uri: `http://localhost:${server.port()}/api/auth/microsoft/handler/frame`,
       state: expect.any(String),
@@ -97,6 +97,7 @@ describe('authModuleMicrosoftProvider', () => {
                     clientSecret: 'another-client-secret',
                     tenantId: 'another-tenant-id',
                     domainHint: 'somedomain',
+                    additionalScopes: ['some-extra-scope'],
                   },
                 },
               },
@@ -125,7 +126,7 @@ describe('authModuleMicrosoftProvider', () => {
     expect(startUrl.pathname).toBe('/another-tenant-id/oauth2/v2.0/authorize');
     expect(Object.fromEntries(startUrl.searchParams)).toEqual({
       response_type: 'code',
-      scope: 'user.read',
+      scope: 'email openid offline_access user.read some-extra-scope',
       client_id: 'another-client-id',
       redirect_uri: `http://localhost:${server.port()}/api/auth/microsoft/handler/frame`,
       state: expect.any(String),
@@ -137,4 +138,64 @@ describe('authModuleMicrosoftProvider', () => {
       nonce: decodeURIComponent(nonceCookie.value),
     });
   });
+
+  it('should not include required scopes for resources', async () => {
+    const { server } = await startTestBackend({
+      features: [
+        authPlugin,
+        authModuleMicrosoftProvider,
+        mockServices.rootConfig.factory({
+          data: {
+            app: {
+              baseUrl: 'http://localhost:3000',
+            },
+            auth: {
+              providers: {
+                microsoft: {
+                  development: {
+                    clientId: 'another-client-id',
+                    clientSecret: 'another-client-secret',
+                    tenantId: 'another-tenant-id',
+                    additionalScopes: ['some-extra-scope'],
+                  },
+                },
+              },
+            },
+          },
+        }),
+      ],
+    });
+
+    const agent = request.agent(server);
+
+    const res = await agent.get(
+      '/api/auth/microsoft/start?env=development&scope=some-resource/some-scope',
+    );
+
+    expect(res.status).toEqual(302);
+
+    const nonceCookie = agent.jar.getCookie('microsoft-nonce', {
+      domain: 'localhost',
+      path: '/api/auth/microsoft/handler',
+      script: false,
+      secure: false,
+    });
+    expect(nonceCookie).toBeDefined();
+
+    const startUrl = new URL(res.get('location'));
+    expect(startUrl.origin).toBe('https://login.microsoftonline.com');
+    expect(startUrl.pathname).toBe('/another-tenant-id/oauth2/v2.0/authorize');
+    expect(Object.fromEntries(startUrl.searchParams)).toEqual({
+      response_type: 'code',
+      scope: 'some-resource/some-scope offline_access',
+      client_id: 'another-client-id',
+      redirect_uri: `http://localhost:${server.port()}/api/auth/microsoft/handler/frame`,
+      state: expect.any(String),
+    });
+
+    expect(decodeOAuthState(startUrl.searchParams.get('state')!)).toEqual({
+      env: 'development',
+      nonce: decodeURIComponent(nonceCookie.value),
+    });
+  });
 });

From 09d1370799f92e7043ae0d1d5ebbd0798ab917d3 Mon Sep 17 00:00:00 2001
From: Calvin Lee <calvin.lee@harness.io>
Date: Mon, 22 Jul 2024 22:29:47 +0900
Subject: [PATCH 118/225] Update .changeset/witty-bears-behave.md

Co-authored-by: Ben Lambert <ben@blam.sh>
Signed-off-by: Calvin Lee <calvin.lee@harness.io>
---
 .changeset/witty-bears-behave.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/witty-bears-behave.md b/.changeset/witty-bears-behave.md
index 7514759189..174467b9eb 100644
--- a/.changeset/witty-bears-behave.md
+++ b/.changeset/witty-bears-behave.md
@@ -2,4 +2,4 @@
 '@backstage/integration': patch
 ---
 
-Updated functions for getHarnessEditContentsUrl, getHarnessFileContentsUrl, getHarnessArchiveUrl, getHarnessLatestCommitUrl and parseHarnessUrl to handle account and org level urls
+Updated functions for `getHarnessEditContentsUrl`, `getHarnessFileContentsUrl`, `getHarnessArchiveUrl`, `getHarnessLatestCommitUrl` and `parseHarnessUrl` to handle account and org level urls

From dc37210a290aa28ed4e12d4d22a3f4696c693af1 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 22 Jul 2024 15:38:22 +0200
Subject: [PATCH 119/225] feat: add support for collecting icons using the new
 extension blueprint

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-app-api/src/extensions/App.tsx   |  4 ++++
 packages/frontend-app-api/src/wiring/createApp.tsx | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-app-api/src/extensions/App.tsx b/packages/frontend-app-api/src/extensions/App.tsx
index 82e7600178..7794aceb79 100644
--- a/packages/frontend-app-api/src/extensions/App.tsx
+++ b/packages/frontend-app-api/src/extensions/App.tsx
@@ -24,6 +24,7 @@ import {
   createExtensionInput,
   createThemeExtension,
   createTranslationExtension,
+  IconBundleBlueprint,
 } from '@backstage/frontend-plugin-api';
 
 export const App = createExtension({
@@ -42,6 +43,9 @@ export const App = createExtension({
     translations: createExtensionInput({
       translation: createTranslationExtension.translationDataRef,
     }),
+    icons: createExtensionInput({
+      icon: IconBundleBlueprint.dataRefs.icons,
+    }),
     root: createExtensionInput(
       {
         element: coreExtensionData.reactElement,
diff --git a/packages/frontend-app-api/src/wiring/createApp.tsx b/packages/frontend-app-api/src/wiring/createApp.tsx
index ae7283f301..4d929b206f 100644
--- a/packages/frontend-app-api/src/wiring/createApp.tsx
+++ b/packages/frontend-app-api/src/wiring/createApp.tsx
@@ -25,6 +25,7 @@ import {
   createThemeExtension,
   createTranslationExtension,
   FrontendFeature,
+  IconBundleBlueprint,
   iconsApiRef,
   RouteResolutionApi,
   routeResolutionApiRef,
@@ -247,6 +248,7 @@ export function createApp(options?: {
  * @public
  */
 export function createSpecializedApp(options?: {
+  /** @deprecated - TODO */
   icons?: { [key in string]: IconComponent };
   features?: FrontendFeature[];
   config?: ConfigApi;
@@ -374,6 +376,11 @@ function createApiHolder(
         (x): x is typeof createTranslationExtension.translationDataRef.T => !!x,
       ) ?? [];
 
+  const extensionIcons = tree.root.edges.attachments
+    .get('icons')
+    ?.map(e => e.instance?.getData(IconBundleBlueprint.dataRefs.icons))
+    .reduce((acc, bundle) => ({ ...acc, ...bundle }), {});
+
   for (const factory of pluginApis) {
     factoryRegistry.register('default', factory);
   }
@@ -414,7 +421,8 @@ function createApiHolder(
   factoryRegistry.register('static', {
     api: iconsApiRef,
     deps: {},
-    factory: () => new DefaultIconsApi({ ...defaultIcons, ...icons }),
+    factory: () =>
+      new DefaultIconsApi({ ...defaultIcons, ...extensionIcons, ...icons }),
   });
 
   factoryRegistry.register('static', {

From 4a18c942be1d49700540005f9d6a1566d0268f98 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 22 Jul 2024 15:39:33 +0200
Subject: [PATCH 120/225] feat: support exporting of dataRefs through
 blueprints

Signed-off-by: blam <ben@blam.sh>
---
 .../src/extensions/IconBundleBlueprint.ts     | 10 ++++---
 .../src/extensions/index.ts                   |  1 +
 .../src/wiring/createExtensionBlueprint.ts    | 27 ++++++++++++++++---
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
index 7008dba5a1..2ad1404102 100644
--- a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
+++ b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
@@ -16,8 +16,9 @@
 import { IconComponent } from '../icons';
 import { createExtensionBlueprint, createExtensionDataRef } from '../wiring';
 
-const iconsDataRef =
-  createExtensionDataRef<{ [key in string]: IconComponent }>('core.icons');
+const iconsDataRef = createExtensionDataRef<{
+  [key in string]: IconComponent;
+}>().with({ id: 'core.icons' });
 
 /** @public */
 export const IconBundleBlueprint = createExtensionBlueprint({
@@ -27,5 +28,8 @@ export const IconBundleBlueprint = createExtensionBlueprint({
   output: {
     icons: iconsDataRef,
   },
-  factory: (_, params: { icons: { [key in string]: IconComponent } }) => params,
+  factory: (params: { icons: { [key in string]: IconComponent } }) => params,
+  dataRefs: {
+    icons: iconsDataRef,
+  },
 });
diff --git a/packages/frontend-plugin-api/src/extensions/index.ts b/packages/frontend-plugin-api/src/extensions/index.ts
index 562cb728cb..267201db81 100644
--- a/packages/frontend-plugin-api/src/extensions/index.ts
+++ b/packages/frontend-plugin-api/src/extensions/index.ts
@@ -25,3 +25,4 @@ export { createSignInPageExtension } from './createSignInPageExtension';
 export { createThemeExtension } from './createThemeExtension';
 export { createComponentExtension } from './createComponentExtension';
 export { createTranslationExtension } from './createTranslationExtension';
+export { IconBundleBlueprint } from './IconBundleBlueprint';
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 6c79017a0a..b504db5f03 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -34,6 +34,7 @@ export interface CreateExtensionBlueprintOptions<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
+  TDataRefs extends AnyExtensionDataMap,
 > {
   kind: string;
   namespace?: string;
@@ -50,6 +51,8 @@ export interface CreateExtensionBlueprintOptions<
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
   ): Expand<ExtensionDataValues<TOutput>>;
+
+  dataRefs?: TDataRefs;
 }
 
 /**
@@ -60,7 +63,10 @@ export interface ExtensionBlueprint<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
+  TDataRefs extends AnyExtensionDataMap,
 > {
+  dataRefs: TDataRefs;
+
   make(args: {
     namespace?: string;
     name?: string;
@@ -97,15 +103,21 @@ class ExtensionBlueprintImpl<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
+  TDataRefs extends AnyExtensionDataMap,
 > {
   constructor(
     private readonly options: CreateExtensionBlueprintOptions<
       TParams,
       TInputs,
       TOutput,
-      TConfig
+      TConfig,
+      TDataRefs
     >,
-  ) {}
+  ) {
+    this.dataRefs = options.dataRefs!;
+  }
+
+  dataRefs: TDataRefs;
 
   public make(args: {
     namespace?: string;
@@ -184,8 +196,15 @@ export function createExtensionBlueprint<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
+  TDataRefs extends AnyExtensionDataMap = never,
 >(
-  options: CreateExtensionBlueprintOptions<TParams, TInputs, TOutput, TConfig>,
-): ExtensionBlueprint<TParams, TInputs, TOutput, TConfig> {
+  options: CreateExtensionBlueprintOptions<
+    TParams,
+    TInputs,
+    TOutput,
+    TConfig,
+    TDataRefs
+  >,
+): ExtensionBlueprint<TParams, TInputs, TOutput, TConfig, TDataRefs> {
   return new ExtensionBlueprintImpl(options);
 }

From 7777b5fb40b96fcefe6a418c0d3d657b3ae6b6a1 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 22 Jul 2024 15:45:01 +0200
Subject: [PATCH 121/225] chore: added changeset

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/forty-ties-agree.md    | 18 ++++++++++++++++++
 .changeset/forty-ties-disagree.md |  5 +++++
 2 files changed, 23 insertions(+)
 create mode 100644 .changeset/forty-ties-agree.md
 create mode 100644 .changeset/forty-ties-disagree.md

diff --git a/.changeset/forty-ties-agree.md b/.changeset/forty-ties-agree.md
new file mode 100644
index 0000000000..caa45841a2
--- /dev/null
+++ b/.changeset/forty-ties-agree.md
@@ -0,0 +1,18 @@
+---
+'@backstage/frontend-plugin-api': patch
+---
+
+Added a new `IconBundleBlueprint` that lets you create icon bundle extensions that can be installed in an App in order to override or add new app icons.
+
+```tsx
+import { IconBundleBlueprint } from '@backstage/frontend-plugin-api';
+
+const exampleIconBundle = IconBundleBlueprint.make({
+  name: 'example-bundle',
+  params: {
+    icons: {
+      user: MyOwnUserIcon,
+    },
+  },
+});
+```
diff --git a/.changeset/forty-ties-disagree.md b/.changeset/forty-ties-disagree.md
new file mode 100644
index 0000000000..214097b35d
--- /dev/null
+++ b/.changeset/forty-ties-disagree.md
@@ -0,0 +1,5 @@
+---
+'@backstage/frontend-app-api': patch
+---
+
+Support icon overriding with the new `IconBundleBlueprint` API.

From be5cb5ea365f09044cc18788e7b5d9eaa6b3689e Mon Sep 17 00:00:00 2001
From: Devin Lauderdale <devinlauderdale2@gmail.com>
Date: Mon, 22 Jul 2024 08:58:25 -0500
Subject: [PATCH 122/225] docs: remove unmaintained dora-metrics plugin

Signed-off-by: Devin Lauderdale <devinlauderdale2@gmail.com>
---
 microsite/data/plugins/dora-metrics.yaml |  10 ----------
 microsite/static/img/okay.png            | Bin 46181 -> 0 bytes
 2 files changed, 10 deletions(-)
 delete mode 100644 microsite/data/plugins/dora-metrics.yaml
 delete mode 100644 microsite/static/img/okay.png

diff --git a/microsite/data/plugins/dora-metrics.yaml b/microsite/data/plugins/dora-metrics.yaml
deleted file mode 100644
index 3f59902f46..0000000000
--- a/microsite/data/plugins/dora-metrics.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: DORA Metrics
-author: Okay
-authorUrl: https://www.okayhq.com
-category: Metrics
-description: Embed dashboards (like DORA metrics) in your team or service pages from any dev tools (including Github, Gitlab, Jira, Argo, CircleCI, Buildkite, Pagerduty, Rollbar, Sentry, etc).
-documentation: https://github.com/OkayHQ/backstage-plugin
-iconUrl: /img/okay.png
-npmPackageName: '@okayhq/backstage-plugin'
-addedDate: '2022-06-16'
diff --git a/microsite/static/img/okay.png b/microsite/static/img/okay.png
deleted file mode 100644
index 357219d9d2c51e1d9a16f3f7a0c4fc476936d685..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46181
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


From cf9da6dafbe6c2fd038d9b8176a2f28816b76e10 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 22 Jul 2024 16:10:05 +0200
Subject: [PATCH 123/225] chore: added test for dataRef exporting

Signed-off-by: blam <ben@blam.sh>
---
 .../wiring/createExtensionBlueprint.test.tsx  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index c7b077bdbd..87b3cec152 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -18,6 +18,7 @@ import React from 'react';
 import { coreExtensionData } from './coreExtensionData';
 import { createExtensionBlueprint } from './createExtensionBlueprint';
 import { createExtensionTester } from '@backstage/frontend-test-utils';
+import { createExtensionDataRef } from './createExtensionDataRef';
 
 describe('createExtensionBlueprint', () => {
   it('should allow creation of extension blueprints', () => {
@@ -102,4 +103,28 @@ describe('createExtensionBlueprint', () => {
     const { container } = createExtensionTester(extension).render();
     expect(container.querySelector('h2')).toHaveTextContent('Hello, world!');
   });
+
+  it('should allow exporting the dataRefs from the extension blueprint', () => {
+    const dataRef = createExtensionDataRef<string>().with({ id: 'test.data' });
+
+    const TestExtensionBlueprint = createExtensionBlueprint({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      dataRefs: {
+        data: dataRef,
+      },
+      factory(params: { text: string }) {
+        return {
+          element: <h1>{params.text}</h1>,
+        };
+      },
+    });
+
+    expect(TestExtensionBlueprint.dataRefs).toEqual({
+      data: dataRef,
+    });
+  });
 });

From 493feaca4d4af19c4174a531d268f4d6e63c1a9e Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Thu, 18 Jul 2024 11:10:18 +0100
Subject: [PATCH 124/225] cli: allow running with no configuration files

Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 .changeset/rich-mugs-dress.md                 |  7 ++++++
 packages/cli/src/lib/bundler/config.ts        |  6 ++++-
 packages/cli/src/lib/config.ts                |  8 ++++---
 packages/config-loader/api-report.md          |  1 +
 .../src/sources/ConfigSources.test.ts         | 13 +++++++++-
 .../src/sources/ConfigSources.ts              | 24 +++++++++++++------
 6 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/rich-mugs-dress.md

diff --git a/.changeset/rich-mugs-dress.md b/.changeset/rich-mugs-dress.md
new file mode 100644
index 0000000000..5008e33a70
--- /dev/null
+++ b/.changeset/rich-mugs-dress.md
@@ -0,0 +1,7 @@
+---
+'@backstage/config-loader': patch
+---
+
+Add boolean `allowMissingDefaultConfig` option to `ConfigSources.default` and
+`ConfigSources.defaultForTargets`, which results in omission of a ConfigSource
+for the default app-config.yaml configuration file if it's not present.
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 1f08f74a85..042f74d1f3 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -48,8 +48,12 @@ const BUILD_CACHE_ENV_VAR = 'BACKSTAGE_CLI_EXPERIMENTAL_BUILD_CACHE';
 
 export function resolveBaseUrl(config: Config): URL {
   const baseUrl = config.getOptionalString('app.baseUrl');
+
   try {
-    return new URL(baseUrl ?? '/', 'http://localhost:3000');
+    return new URL(
+      baseUrl ?? '/',
+      `http://localhost:${process.env.PORT ?? '3000'}`,
+    );
   } catch (error) {
     throw new Error(`Invalid app.baseUrl, ${error}`);
   }
diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts
index 0c657b640e..0be20b0185 100644
--- a/packages/cli/src/lib/config.ts
+++ b/packages/cli/src/lib/config.ts
@@ -96,11 +96,13 @@ export async function loadCliConfig(options: Options) {
     },
   });
 
+  const configurationLoadedMessage = appConfigs.length
+    ? `Loaded config from ${appConfigs.map(c => c.context).join(', ')}`
+    : `No configuration files found, running without config`;
+
   // printing to stderr to not clobber stdout in case the cli command
   // outputs structured data (e.g. as config:schema does)
-  process.stderr.write(
-    `Loaded config from ${appConfigs.map(c => c.context).join(', ')}\n`,
-  );
+  process.stderr.write(`${configurationLoadedMessage}\n`);
 
   try {
     const frontendAppConfigs = schema.process(appConfigs, {
diff --git a/packages/config-loader/api-report.md b/packages/config-loader/api-report.md
index bc8f217bbb..835e53351d 100644
--- a/packages/config-loader/api-report.md
+++ b/packages/config-loader/api-report.md
@@ -21,6 +21,7 @@ export type AsyncConfigSourceGenerator = AsyncGenerator<
 
 // @public
 export interface BaseConfigSourcesOptions {
+  allowMissingDefaultConfig?: boolean;
   // (undocumented)
   remote?: Pick<RemoteConfigSourceOptions, 'reloadInterval'>;
   // (undocumented)
diff --git a/packages/config-loader/src/sources/ConfigSources.test.ts b/packages/config-loader/src/sources/ConfigSources.test.ts
index 4b14572666..e19ac1d51f 100644
--- a/packages/config-loader/src/sources/ConfigSources.test.ts
+++ b/packages/config-loader/src/sources/ConfigSources.test.ts
@@ -69,13 +69,18 @@ describe('ConfigSources', () => {
   });
 
   it('should create default sources for targets', () => {
+    const fsSpy = jest.spyOn(fs, 'pathExistsSync').mockImplementation(path => {
+      return path === `${root}app-config.yaml`;
+    });
+
     expect(
       mergeSources(
         ConfigSources.defaultForTargets({ rootDir: '/', targets: [] }),
       ),
     ).toEqual([{ name: 'FileConfigSource', path: `${root}app-config.yaml` }]);
 
-    const fsSpy = jest.spyOn(fs, 'pathExistsSync').mockReturnValue(true);
+    fsSpy.mockReturnValue(true);
+
     expect(
       mergeSources(
         ConfigSources.defaultForTargets({ rootDir: '/', targets: [] }),
@@ -159,6 +164,10 @@ describe('ConfigSources', () => {
   });
 
   it('should create a default source', () => {
+    const fsSpy = jest.spyOn(fs, 'pathExistsSync').mockImplementation(path => {
+      return path === `${root}app-config.yaml`;
+    });
+
     expect(
       mergeSources(
         ConfigSources.default({
@@ -184,6 +193,8 @@ describe('ConfigSources', () => {
       { name: 'FileConfigSource', path: resolvePath('b.yaml') },
       { name: 'EnvConfigSource', env: { HOME: '/' } },
     ]);
+
+    fsSpy.mockRestore();
   });
 
   it('should merge sources', () => {
diff --git a/packages/config-loader/src/sources/ConfigSources.ts b/packages/config-loader/src/sources/ConfigSources.ts
index ecff39da2d..be8892f9a9 100644
--- a/packages/config-loader/src/sources/ConfigSources.ts
+++ b/packages/config-loader/src/sources/ConfigSources.ts
@@ -74,6 +74,11 @@ export interface BaseConfigSourcesOptions {
   watch?: boolean;
   rootDir?: string;
   remote?: Pick<RemoteConfigSourceOptions, 'reloadInterval'>;
+  /**
+   * Allow the default app-config.yaml to be missing, in which case the source
+   * will not be created.
+   */
+  allowMissingDefaultConfig?: boolean;
 
   /**
    * A custom substitution function that overrides the default one.
@@ -177,14 +182,19 @@ export class ConfigSources {
     if (argSources.length === 0) {
       const defaultPath = resolvePath(rootDir, 'app-config.yaml');
       const localPath = resolvePath(rootDir, 'app-config.local.yaml');
+      const alwaysIncludeDefaultConfigSource =
+        !options.allowMissingDefaultConfig;
+
+      if (alwaysIncludeDefaultConfigSource || fs.pathExistsSync(defaultPath)) {
+        argSources.push(
+          FileConfigSource.create({
+            watch: options.watch,
+            path: defaultPath,
+            substitutionFunc: options.substitutionFunc,
+          }),
+        );
+      }
 
-      argSources.push(
-        FileConfigSource.create({
-          watch: options.watch,
-          path: defaultPath,
-          substitutionFunc: options.substitutionFunc,
-        }),
-      );
       if (fs.pathExistsSync(localPath)) {
         argSources.push(
           FileConfigSource.create({

From 0eedec304dbe8e4f8b1e982a1e29b081cbed3ddd Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Thu, 18 Jul 2024 11:18:07 +0100
Subject: [PATCH 125/225] cli: add changeset for module federation local
 development changes

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 .changeset/strong-otters-compete.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/strong-otters-compete.md

diff --git a/.changeset/strong-otters-compete.md b/.changeset/strong-otters-compete.md
new file mode 100644
index 0000000000..fdcb982b88
--- /dev/null
+++ b/.changeset/strong-otters-compete.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Add support for dynamic plugins via the EXPERIMENTAL_MODULE_FEDERATION environment variable when running `yarn start`.

From 9d661bb3807a534cf023dc84d816cee5d3c81472 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:28:13 +0100
Subject: [PATCH 126/225] cli: only consider PORT environment variable for
 module federation remotes

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/cli/src/lib/bundler/config.ts | 43 +++++++++++++++++++-------
 packages/cli/src/lib/bundler/server.ts |  7 +++--
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index 042f74d1f3..42cdae24e3 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { BackendBundlingOptions, BundlingOptions } from './types';
+import {
+  BackendBundlingOptions,
+  BundlingOptions,
+  ModuleFederationOptions,
+} from './types';
 import { posix as posixPath, resolve as resolvePath, dirname } from 'path';
 import chalk from 'chalk';
 import webpack, { ProvidePlugin } from 'webpack';
@@ -46,24 +50,32 @@ import { hasReactDomClient } from './hasReactDomClient';
 
 const BUILD_CACHE_ENV_VAR = 'BACKSTAGE_CLI_EXPERIMENTAL_BUILD_CACHE';
 
-export function resolveBaseUrl(config: Config): URL {
+export function resolveBaseUrl(
+  config: Config,
+  moduleFederation?: ModuleFederationOptions,
+): URL {
   const baseUrl = config.getOptionalString('app.baseUrl');
 
+  const defaultBaseUrl =
+    moduleFederation?.mode === 'remote'
+      ? `http://localhost:${process.env.PORT ?? '3000'}`
+      : 'http://localhost:3000';
+
   try {
-    return new URL(
-      baseUrl ?? '/',
-      `http://localhost:${process.env.PORT ?? '3000'}`,
-    );
+    return new URL(baseUrl ?? '/', defaultBaseUrl);
   } catch (error) {
     throw new Error(`Invalid app.baseUrl, ${error}`);
   }
 }
 
-export function resolveEndpoint(config: Config): {
+export function resolveEndpoint(
+  config: Config,
+  moduleFederation?: ModuleFederationOptions,
+): {
   host: string;
   port: number;
 } {
-  const url = resolveBaseUrl(config);
+  const url = resolveBaseUrl(config, moduleFederation);
 
   return {
     host: config.getOptionalString('app.listen.host') ?? url.hostname,
@@ -114,7 +126,13 @@ export async function createConfig(
   paths: BundlingPaths,
   options: BundlingOptions,
 ): Promise<webpack.Configuration> {
-  const { checksEnabled, isDev, frontendConfig, publicSubPath = '' } = options;
+  const {
+    checksEnabled,
+    isDev,
+    frontendConfig,
+    moduleFederation,
+    publicSubPath = '',
+  } = options;
 
   const { plugins, loaders } = transforms(options);
   // Any package that is part of the monorepo but outside the monorepo root dir need
@@ -122,14 +140,17 @@ export async function createConfig(
   const { packages } = await getPackages(cliPaths.targetDir);
   const externalPkgs = packages.filter(p => !isChildPath(paths.root, p.dir));
 
-  const validBaseUrl = resolveBaseUrl(frontendConfig);
+  const validBaseUrl = resolveBaseUrl(frontendConfig, moduleFederation);
   let publicPath = validBaseUrl.pathname.replace(/\/$/, '');
   if (publicSubPath) {
     publicPath = `${publicPath}${publicSubPath}`.replace('//', '/');
   }
 
   if (isDev) {
-    const { host, port } = resolveEndpoint(options.frontendConfig);
+    const { host, port } = resolveEndpoint(
+      options.frontendConfig,
+      options.moduleFederation,
+    );
 
     plugins.push(
       new ReactRefreshPlugin({
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index 0421f4d019..6b89847fb6 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -130,8 +130,11 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
   }
 
   const { frontendConfig, fullConfig } = cliConfig;
-  const url = resolveBaseUrl(frontendConfig);
-  const { host, port } = resolveEndpoint(frontendConfig);
+  const url = resolveBaseUrl(frontendConfig, options.moduleFederation);
+  const { host, port } = resolveEndpoint(
+    frontendConfig,
+    options.moduleFederation,
+  );
 
   const detectedModulesEntryPoint = await createDetectedModulesEntryPoint({
     config: fullConfig,

From 239dffc970b4b040ffdf9aee24f6937c4994f5ba Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Mon, 22 Jul 2024 11:06:42 +0100
Subject: [PATCH 127/225] cli: remove usage of deprecated functionality from
 @backstage/config-loader

Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 .changeset/ninety-icons-smile.md |  5 +++
 packages/cli/src/lib/config.ts   | 76 +++++++++++++++++++-------------
 2 files changed, 51 insertions(+), 30 deletions(-)
 create mode 100644 .changeset/ninety-icons-smile.md

diff --git a/.changeset/ninety-icons-smile.md b/.changeset/ninety-icons-smile.md
new file mode 100644
index 0000000000..f137879706
--- /dev/null
+++ b/.changeset/ninety-icons-smile.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Remove usage of deprecated functionality from @backstage/config-loader
diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts
index 0be20b0185..49cce1f1ed 100644
--- a/packages/cli/src/lib/config.ts
+++ b/packages/cli/src/lib/config.ts
@@ -14,14 +14,9 @@
  * limitations under the License.
  */
 
-import {
-  ConfigTarget,
-  loadConfig,
-  loadConfigSchema,
-} from '@backstage/config-loader';
+import { ConfigSources, loadConfigSchema } from '@backstage/config-loader';
 import { AppConfig, ConfigReader } from '@backstage/config';
 import { paths } from './paths';
-import { isValidUrl } from './urls';
 import { getPackages } from '@manypkg/get-packages';
 import { PackageGraph } from '@backstage/cli-node';
 
@@ -37,13 +32,6 @@ type Options = {
 };
 
 export async function loadCliConfig(options: Options) {
-  const configTargets: ConfigTarget[] = [];
-  options.args.forEach(arg => {
-    if (!isValidUrl(arg)) {
-      configTargets.push({ path: paths.resolveTarget(arg) });
-    }
-  });
-
   // Consider all packages in the monorepo when loading in config
   const { packages } = await getPackages(paths.targetDir);
 
@@ -75,25 +63,53 @@ export async function loadCliConfig(options: Options) {
     noUndeclaredProperties: options.strict,
   });
 
-  const { appConfigs } = await loadConfig({
-    experimentalEnvFunc: options.mockEnv
+  const source = ConfigSources.default({
+    allowMissingDefaultConfig: true,
+    substitutionFunc: options.mockEnv
       ? async name => process.env[name] || 'x'
       : undefined,
-    configRoot: paths.targetRoot,
-    configTargets: configTargets,
-    watch: options.watch && {
-      onChange(newAppConfigs) {
-        const newFrontendAppConfigs = schema.process(newAppConfigs, {
-          visibility: options.fullVisibility
-            ? ['frontend', 'backend', 'secret']
-            : ['frontend'],
-          withFilteredKeys: options.withFilteredKeys,
-          withDeprecatedKeys: options.withDeprecatedKeys,
-          ignoreSchemaErrors: !options.strict,
-        });
-        options.watch?.(newFrontendAppConfigs);
-      },
-    },
+    watch: Boolean(options.watch),
+    rootDir: paths.targetRoot,
+    argv: options.args,
+  });
+
+  const appConfigs = await new Promise<AppConfig[]>((resolve, reject) => {
+    async function loadConfigReaderLoop() {
+      let loaded = false;
+
+      try {
+        const abortController = new AbortController();
+        for await (const { configs } of source.readConfigData({
+          signal: abortController.signal,
+        })) {
+          if (loaded) {
+            const newFrontendAppConfigs = schema.process(configs, {
+              visibility: options.fullVisibility
+                ? ['frontend', 'backend', 'secret']
+                : ['frontend'],
+              withFilteredKeys: options.withFilteredKeys,
+              withDeprecatedKeys: options.withDeprecatedKeys,
+              ignoreSchemaErrors: !options.strict,
+            });
+            options.watch?.(newFrontendAppConfigs);
+          } else {
+            resolve(configs);
+            loaded = true;
+
+            if (!options.watch) {
+              abortController.abort();
+            }
+          }
+        }
+      } catch (error) {
+        if (loaded) {
+          console.error(`Failed to reload configuration, ${error}`);
+        } else {
+          reject(error);
+        }
+      }
+    }
+    loadConfigReaderLoop();
   });
 
   const configurationLoadedMessage = appConfigs.length

From 348087a09636d79e3a2894325b16afef79275ec9 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 22 Jul 2024 16:22:29 +0200
Subject: [PATCH 128/225] auth-backend-module-microsoft-provider: cleanup deps

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/auth-backend-module-microsoft-provider/package.json | 2 --
 yarn.lock                                                   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/plugins/auth-backend-module-microsoft-provider/package.json b/plugins/auth-backend-module-microsoft-provider/package.json
index 67a898cf80..b67fb8c447 100644
--- a/plugins/auth-backend-module-microsoft-provider/package.json
+++ b/plugins/auth-backend-module-microsoft-provider/package.json
@@ -38,9 +38,7 @@
     "@backstage/plugin-auth-node": "workspace:^",
     "express": "^4.18.2",
     "jose": "^5.0.0",
-    "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
-    "passport": "^0.7.0",
     "passport-microsoft": "^1.0.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index a8ed83a61a..ff5eac7b1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4861,10 +4861,8 @@ __metadata:
     "@types/passport-microsoft": ^1.0.0
     express: ^4.18.2
     jose: ^5.0.0
-    lodash: ^4.17.21
     msw: ^1.0.0
     node-fetch: ^2.6.7
-    passport: ^0.7.0
     passport-microsoft: ^1.0.0
     supertest: ^6.3.3
   languageName: unknown

From b1f3c44e42a8f880698e2b4e5c59be133c000738 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 22 Jul 2024 16:31:09 +0200
Subject: [PATCH 129/225] chore: api-reports

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

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 65445b5c4d..3c082a7694 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -522,9 +522,16 @@ export function createExtensionBlueprint<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
+  TDataRefs extends AnyExtensionDataMap = never,
 >(
-  options: CreateExtensionBlueprintOptions<TParams, TInputs, TOutput, TConfig>,
-): ExtensionBlueprint<TParams, TInputs, TOutput, TConfig>;
+  options: CreateExtensionBlueprintOptions<
+    TParams,
+    TInputs,
+    TOutput,
+    TConfig,
+    TDataRefs
+  >,
+): ExtensionBlueprint<TParams, TInputs, TOutput, TConfig, TDataRefs>;
 
 // @public (undocumented)
 export interface CreateExtensionBlueprintOptions<
@@ -532,6 +539,7 @@ export interface CreateExtensionBlueprintOptions<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
+  TDataRefs extends AnyExtensionDataMap,
 > {
   // (undocumented)
   attachTo: {
@@ -541,6 +549,8 @@ export interface CreateExtensionBlueprintOptions<
   // (undocumented)
   configSchema?: PortableSchema<TConfig>;
   // (undocumented)
+  dataRefs?: TDataRefs;
+  // (undocumented)
   disabled?: boolean;
   // (undocumented)
   factory(
@@ -917,7 +927,10 @@ export interface ExtensionBlueprint<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig,
+  TDataRefs extends AnyExtensionDataMap,
 > {
+  // (undocumented)
+  dataRefs: TDataRefs;
   // (undocumented)
   make(args: {
     namespace?: string;
@@ -1085,6 +1098,35 @@ export { gitlabAuthApiRef };
 
 export { googleAuthApiRef };
 
+// @public (undocumented)
+export const IconBundleBlueprint: ExtensionBlueprint<
+  {
+    icons: {
+      [x: string]: IconComponent;
+    };
+  },
+  AnyExtensionInputMap,
+  {
+    icons: ConfigurableExtensionDataRef<
+      'core.icons',
+      {
+        [x: string]: IconComponent;
+      },
+      {}
+    >;
+  },
+  unknown,
+  {
+    icons: ConfigurableExtensionDataRef<
+      'core.icons',
+      {
+        [x: string]: IconComponent;
+      },
+      {}
+    >;
+  }
+>;
+
 // @public
 export type IconComponent = ComponentType<
   | {

From 98ea3e2ca9329f6b131e3d3f038ba5101b039beb Mon Sep 17 00:00:00 2001
From: Adam Letizia <43392371+koalaty-code@users.noreply.github.com>
Date: Mon, 22 Jul 2024 09:40:18 -0500
Subject: [PATCH 130/225] chore(changeset): new change description

Co-authored-by: Ben Lambert <ben@blam.sh>
Signed-off-by: Adam Letizia <43392371+koalaty-code@users.noreply.github.com>
---
 .changeset/tough-lies-repair.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/tough-lies-repair.md b/.changeset/tough-lies-repair.md
index 25b1884bbc..b2f848e292 100644
--- a/.changeset/tough-lies-repair.md
+++ b/.changeset/tough-lies-repair.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder': patch
 ---
 
-RepoUrlPicker: refetch user credentials when a new host is selected
+Fix issue with `RepoUrlPicker` not refreshing the credentials for a different host

From d0e95a70369cb81bf2c74850a5c3b80250388110 Mon Sep 17 00:00:00 2001
From: Rich Barton-Cooper <58304039+richcooper95@users.noreply.github.com>
Date: Fri, 3 May 2024 16:01:05 +0100
Subject: [PATCH 131/225] feat: expose uiSchema and formContext in FormProps

This commit exposes two extra fields in the FormProps: `uiSchema` and `formContext`.

Signed-off-by: Rich Barton-Cooper <rich@syntasso.io>
Co-authored-by: Chunyi Lyu <chunyineko@gmail.com>
---
 .changeset/flat-plums-grow.md                    | 6 ++++++
 plugins/scaffolder-react/api-report.md           | 2 +-
 plugins/scaffolder-react/src/components/types.ts | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/flat-plums-grow.md

diff --git a/.changeset/flat-plums-grow.md b/.changeset/flat-plums-grow.md
new file mode 100644
index 0000000000..b62f3e65a9
--- /dev/null
+++ b/.changeset/flat-plums-grow.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Add ability to customise form fields in the UI by exposing `uiSchema` and `formContext` in
+`FormProps`
diff --git a/plugins/scaffolder-react/api-report.md b/plugins/scaffolder-react/api-report.md
index a14490b80c..a19a656d17 100644
--- a/plugins/scaffolder-react/api-report.md
+++ b/plugins/scaffolder-react/api-report.md
@@ -128,7 +128,7 @@ export interface FieldExtensionUiSchema<TFieldReturnValue, TUiOptions>
 // @public
 export type FormProps = Pick<
   FormProps_2,
-  'transformErrors' | 'noHtml5Validate'
+  'transformErrors' | 'noHtml5Validate' | 'uiSchema' | 'formContext'
 >;
 
 // @public
diff --git a/plugins/scaffolder-react/src/components/types.ts b/plugins/scaffolder-react/src/components/types.ts
index 597998bac4..d5d317015d 100644
--- a/plugins/scaffolder-react/src/components/types.ts
+++ b/plugins/scaffolder-react/src/components/types.ts
@@ -32,7 +32,7 @@ export type TemplateGroupFilter = {
  */
 export type FormProps = Pick<
   SchemaFormProps,
-  'transformErrors' | 'noHtml5Validate'
+  'transformErrors' | 'noHtml5Validate' | 'uiSchema' | 'formContext'
 >;
 
 /**

From 8cdd846abc49841100cdaf5273d4793a821b475e Mon Sep 17 00:00:00 2001
From: Rich Barton-Cooper <rich@syntasso.io>
Date: Mon, 22 Jul 2024 15:55:23 +0100
Subject: [PATCH 132/225] fix: merge uiSchema and formContext in Stepper
 component

This commit ensures that the uiSchema and formContext are merged in the
Stepper component form, with the non-props values taking precedence over
the props values.

The uiSchemas are deep-merged using `lodash.merge` to ensure that nested
values are correctly merged.

Signed-off-by: Rich Barton-Cooper <rich@syntasso.io>
---
 .../next/components/Stepper/Stepper.test.tsx  | 60 +++++++++++++++++++
 .../src/next/components/Stepper/Stepper.tsx   | 15 ++++-
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
index df58d971fb..78aef3428f 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
@@ -549,6 +549,66 @@ describe('Stepper', () => {
     });
   });
 
+  it('should allow overrides to the uiSchema and formContext correctly', async () => {
+    const manifest: TemplateParameterSchema = {
+      title: 'Custom Fields',
+      steps: [
+        {
+          title: 'Test',
+          schema: {
+            properties: {
+              name: {
+                type: 'string',
+                'ui:placeholder': 'Enter your name',
+              },
+              age: {
+                type: 'number',
+                'ui:placeholder': 'Enter your age',
+              },
+            },
+          },
+        },
+      ],
+    };
+
+    const uiSchema = {
+      name: {
+        'ui:readonly': true,
+        'ui:placeholder': 'Should be overwritten',
+      },
+    };
+
+    const formContext = {
+      readOnlyAsDisabled: true,
+    };
+
+    const { getByRole } = await renderInTestApp(
+      <SecretsContextProvider>
+        <Stepper
+          manifest={manifest}
+          onCreate={jest.fn()}
+          extensions={[]}
+          formProps={{ uiSchema, formContext }}
+          initialState={{ name: 'Some Name', age: 40 }}
+        />
+      </SecretsContextProvider>,
+    );
+
+    expect(getByRole('textbox', { name: 'name' })).toHaveValue('Some Name');
+    expect(getByRole('textbox', { name: 'name' })).toBeDisabled();
+    expect(getByRole('textbox', { name: 'name' })).toHaveAttribute(
+      'placeholder',
+      'Enter your name',
+    );
+
+    expect(getByRole('spinbutton', { name: 'age' })).toHaveValue(40);
+    expect(getByRole('spinbutton', { name: 'age' })).toBeEnabled();
+    expect(getByRole('spinbutton', { name: 'age' })).toHaveAttribute(
+      'placeholder',
+      'Enter your age',
+    );
+  });
+
   describe('Scaffolder Layouts', () => {
     it('should render the step in the scaffolder layout', async () => {
       const ScaffolderLayout: LayoutTemplate = ({ properties }) => (
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
index 788c7cd715..3a8858144b 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
@@ -51,6 +51,7 @@ import { ErrorListTemplate } from './ErrorListTemplate';
 import { makeStyles } from '@material-ui/core/styles';
 import { PasswordWidget } from '../PasswordWidget/PasswordWidget';
 import ajvErrors from 'ajv-errors';
+import { merge } from 'lodash';
 
 const validator = customizeValidator();
 ajvErrors(validator.ajv);
@@ -193,6 +194,14 @@ export const Stepper = (stepperProps: StepperProps) => {
     setFormState(current => ({ ...current, ...formData }));
   };
 
+  const {
+    formContext: propFormContext,
+    uiSchema: propUiSchema,
+    ...restFormProps
+  } = props.formProps ?? {};
+
+  const mergedUiSchema = merge({}, propUiSchema, currentStep?.uiSchema);
+
   return (
     <>
       {isValidating && <LinearProgress variant="indeterminate" />}
@@ -229,9 +238,9 @@ export const Stepper = (stepperProps: StepperProps) => {
             validator={validator}
             extraErrors={errors as unknown as ErrorSchema}
             formData={formState}
-            formContext={{ formData: formState }}
+            formContext={{ ...propFormContext, formData: formState }}
             schema={currentStep.schema}
-            uiSchema={currentStep.uiSchema}
+            uiSchema={mergedUiSchema}
             onSubmit={handleNext}
             fields={fields}
             showErrorList="top"
@@ -241,7 +250,7 @@ export const Stepper = (stepperProps: StepperProps) => {
             experimental_defaultFormStateBehavior={{
               allOf: 'populateDefaults',
             }}
-            {...(props.formProps ?? {})}
+            {...restFormProps}
           >
             <div className={styles.footer}>
               <Button

From 3ca333b683d542cee92998256f0a4607f45be452 Mon Sep 17 00:00:00 2001
From: Thomas Cardonne <thomas.cardonne@adevinta.com>
Date: Mon, 22 Jul 2024 22:19:06 +0200
Subject: [PATCH 133/225] test(scaffolder-backend-module-gitlab): fix tests for
 gitlabProjectAccessTokenCreate examples

Fixes tests created in #25713

Signed-off-by: Thomas Cardonne <thomas.cardonne@adevinta.com>
---
 ...tlabProjectAccessTokenCreate.examples.test.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
index 0762212809..bdf14ce1c8 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectAccessTokenCreate.examples.test.ts
@@ -215,7 +215,7 @@ describe('gitlab:projectAccessToken:create examples', () => {
       ['read_repository'],
       {
         accessLevel: 30,
-        expiresAt: '2025-07-21',
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -271,7 +271,7 @@ describe('gitlab:projectAccessToken:create examples', () => {
       ['read_repository'],
       {
         accessLevel: 40,
-        expiresAt: '2025-07-21',
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -299,7 +299,7 @@ describe('gitlab:projectAccessToken:create examples', () => {
       ['read_repository', 'read_api'],
       {
         accessLevel: 40,
-        expiresAt: '2025-07-21',
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -327,7 +327,7 @@ describe('gitlab:projectAccessToken:create examples', () => {
       ['read_repository'],
       {
         accessLevel: 10,
-        expiresAt: '2025-07-21',
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -355,7 +355,7 @@ describe('gitlab:projectAccessToken:create examples', () => {
       ['read_repository'],
       {
         accessLevel: 40,
-        expiresAt: '2025-07-21',
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -383,7 +383,7 @@ describe('gitlab:projectAccessToken:create examples', () => {
       ['read_repository'],
       {
         accessLevel: 50,
-        expiresAt: '2025-07-21',
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -411,7 +411,7 @@ describe('gitlab:projectAccessToken:create examples', () => {
       ['read_repository'],
       {
         accessLevel: 40,
-        expiresAt: '2025-07-21',
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 
@@ -439,7 +439,7 @@ describe('gitlab:projectAccessToken:create examples', () => {
       ['read_repository'],
       {
         accessLevel: 40,
-        expiresAt: '2025-07-21',
+        expiresAt: DateTime.now().plus({ days: 365 }).toISODate()!,
       },
     );
 

From 97abfa22b9e98ad3c8b950628e19b4240243cb52 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 08:01:34 +0200
Subject: [PATCH 134/225] chore: added some docs and cleanup the todos

Signed-off-by: blam <ben@blam.sh>
---
 .../building-apps/03-built-in-extensions.md   |  1 +
 .../building-apps/08-migrating.md             | 25 +++++++++++++++++++
 .../building-plugins/03-extension-types.md    |  4 +++
 .../frontend-app-api/src/wiring/createApp.tsx |  4 +--
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/docs/frontend-system/building-apps/03-built-in-extensions.md b/docs/frontend-system/building-apps/03-built-in-extensions.md
index 4f8417f74f..a5e6476eb0 100644
--- a/docs/frontend-system/building-apps/03-built-in-extensions.md
+++ b/docs/frontend-system/building-apps/03-built-in-extensions.md
@@ -45,6 +45,7 @@ This extension is the first extension attached to the extension tree. It is resp
 | themes       | The app themes list.       | [createThemeExtension.themeDataRef](https://backstage.io/docs/reference/frontend-plugin-api.createthemeextension.themedataref)                         | false    | See [default themes](#default-theme-extensions).          | [createThemeExtension](https://backstage.io/docs/reference/frontend-plugin-api.createthemeextension)             |
 | components   | The app components list.   | [createComponentExtension.componentDataRef](https://backstage.io/docs/reference/frontend-plugin-api.createcomponentextension.componentdataref)         | false    | See [default components](#default-components-extensions). | [createComponentExtension](https://backstage.io/docs/reference/frontend-plugin-api.createcomponentextension)     |
 | translations | The app translations list. | [createTranslationExtension.translationDataRef](https://backstage.io/docs/reference/frontend-plugin-api.createtranslationextension.translationdataref) | false    | -                                                         | [createTranslationExtension](https://backstage.io/docs/reference/frontend-plugin-api.createtranslationextension) |
+| icons        | The app icons list.        | [IconBundleBlueprint.dataRefs.icons](https://backstage.io/docs/reference/frontend-plugin-api.iconbundleblueprint.dataRefs.icons)                       | true     | -                                                         | [IconBundleBlueprint](https://backstage.io/docs/reference/frontend-plugin-api.iconbundleblueprint)               |
 
 #### Default theme extensions
 
diff --git a/docs/frontend-system/building-apps/08-migrating.md b/docs/frontend-system/building-apps/08-migrating.md
index 0abdd2aac3..716e0da772 100644
--- a/docs/frontend-system/building-apps/08-migrating.md
+++ b/docs/frontend-system/building-apps/08-migrating.md
@@ -314,6 +314,31 @@ const app = createApp({
 });
 ```
 
+### `icons`
+
+Icons are now installed as extensions, using the `IconBundleBlueprint` to make new instances which can be added to the app.
+
+```ts
+import { IconBundleBlueprint } from '@backstage/frontend-plugin-api';
+
+const exampleIconBundle = IconBundleBlueprint.make({
+  name: 'example-bundle',
+  params: {
+    icons: {
+      user: MyOwnUserIcon,
+    },
+  },
+});
+
+const app = createApp({
+  features: [
+    createExtensionOverrides({
+      extensions: [exampleIconBundle],
+    }),
+  ],
+});
+```
+
 ### `bindRoutes`
 
 Route bindings can still be done using this option, but you now also have the ability to bind routes using static configuration instead. See the section on [binding routes](../architecture/07-routes.md#binding-external-route-references) for more information.
diff --git a/docs/frontend-system/building-plugins/03-extension-types.md b/docs/frontend-system/building-plugins/03-extension-types.md
index 2bea073ed6..1f3baaa710 100644
--- a/docs/frontend-system/building-plugins/03-extension-types.md
+++ b/docs/frontend-system/building-plugins/03-extension-types.md
@@ -38,6 +38,10 @@ Sign-in page extension have a single purpose - to implement a custom sign-in pag
 
 Theme extensions provide custom themes for the app. They are always attached to the app extension and you can have any number of themes extensions installed in an app at once, letting the user choose which theme to use.
 
+### Icons - [Reference](../../reference/frontend-plugin-api.iconbundleblueprint.md)
+
+Icon bundle extensions provide the ability to replace or provide new icons to the app. You can use the above blueprint to make new extension instances which can be installed into the app.
+
 ### Translation - [Reference](../../reference/frontend-plugin-api.createtranslationextension.md)
 
 Translation extension provide custom translation messages for the app. They can be used both to override the default english messages to custom ones, as well as provide translations for additional languages.
diff --git a/packages/frontend-app-api/src/wiring/createApp.tsx b/packages/frontend-app-api/src/wiring/createApp.tsx
index 4d929b206f..8d39cb65aa 100644
--- a/packages/frontend-app-api/src/wiring/createApp.tsx
+++ b/packages/frontend-app-api/src/wiring/createApp.tsx
@@ -172,7 +172,7 @@ export interface CreateAppFeatureLoader {
 
 /** @public */
 export function createApp(options?: {
-  /** @deprecated - TODO */
+  /** @deprecated - Please use {@link @backstage/frontend-app-api#IconBundleBlueprint} to make new icon bundles which can be installed in the app seperately */
   icons?: { [key in string]: IconComponent };
   features?: (FrontendFeature | CreateAppFeatureLoader)[];
   configLoader?: () => Promise<{ config: ConfigApi }>;
@@ -248,7 +248,7 @@ export function createApp(options?: {
  * @public
  */
 export function createSpecializedApp(options?: {
-  /** @deprecated - TODO */
+  /** @deprecated - Please use {@link @backstage/frontend-app-api#IconBundleBlueprint} to make new icon bundles which can be installed in the app seperately */
   icons?: { [key in string]: IconComponent };
   features?: FrontendFeature[];
   config?: ConfigApi;

From 2b4358b04429c02b6108bc93b285006ebd1a1be3 Mon Sep 17 00:00:00 2001
From: Ben Lambert <blam@spotify.com>
Date: Tue, 23 Jul 2024 08:07:57 +0200
Subject: [PATCH 135/225] Update flat-plums-grow.md

Signed-off-by: Ben Lambert <blam@spotify.com>
---
 .changeset/flat-plums-grow.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.changeset/flat-plums-grow.md b/.changeset/flat-plums-grow.md
index b62f3e65a9..7057216786 100644
--- a/.changeset/flat-plums-grow.md
+++ b/.changeset/flat-plums-grow.md
@@ -2,5 +2,4 @@
 '@backstage/plugin-scaffolder-react': patch
 ---
 
-Add ability to customise form fields in the UI by exposing `uiSchema` and `formContext` in
-`FormProps`
+Add ability to customise form fields in the UI by exposing `uiSchema` and `formContext` in `FormProps`

From d4e33aca1adc461063130fa36e255498490785ec Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 08:19:53 +0200
Subject: [PATCH 136/225] chore: fixing tests

Signed-off-by: blam <ben@blam.sh>
---
 .../src/components/TabbedLayout/RoutedTabs.test.tsx          | 5 +++--
 .../src/components/TabbedLayout/RoutedTabs.tsx               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx
index 991276c5d3..754ac2ec8d 100644
--- a/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx
+++ b/packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx
@@ -162,14 +162,15 @@ describe('RoutedTabs', () => {
   });
 
   it('should render the tabs as <a> links', async () => {
-    const routes = [testRoute2, testRoute1, testRoute3];
+    const routes = [testRoute1, testRoute2, testRoute3];
+    const expectedHrefs = ['/', '/some-other-path', '/some-other-path-similar'];
     const rendered = await renderInTestApp(<RoutedTabs routes={routes} />);
 
     const tabs = rendered.queryAllByRole('tab');
 
     for (const [k, v] of Object.entries(tabs)) {
       expect(v.tagName).toBe('A');
-      expect(v).toHaveAttribute('href', routes[Number(k)].path);
+      expect(v).toHaveAttribute('href', expectedHrefs[Number(k)]);
     }
   });
 });
diff --git a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
index d6f6eab144..b57a3782bb 100644
--- a/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
+++ b/packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
@@ -79,9 +79,9 @@ export function RoutedTabs(props: { routes: SubRoute[] }) {
           id: path,
           label: title,
           tabProps: {
-            ...tabProps,
             component: Link,
             to,
+            ...tabProps,
           },
         };
       }),

From 663568ebb6946f09a16458feca290059cb2ae79a Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 08:28:46 +0200
Subject: [PATCH 137/225] chore: fixing todo package

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-app-api/src/wiring/createApp.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-app-api/src/wiring/createApp.tsx b/packages/frontend-app-api/src/wiring/createApp.tsx
index 8d39cb65aa..d82d0ca782 100644
--- a/packages/frontend-app-api/src/wiring/createApp.tsx
+++ b/packages/frontend-app-api/src/wiring/createApp.tsx
@@ -172,7 +172,7 @@ export interface CreateAppFeatureLoader {
 
 /** @public */
 export function createApp(options?: {
-  /** @deprecated - Please use {@link @backstage/frontend-app-api#IconBundleBlueprint} to make new icon bundles which can be installed in the app seperately */
+  /** @deprecated - Please use {@link @backstage/frontend-plugin-api#IconBundleBlueprint} to make new icon bundles which can be installed in the app seperately */
   icons?: { [key in string]: IconComponent };
   features?: (FrontendFeature | CreateAppFeatureLoader)[];
   configLoader?: () => Promise<{ config: ConfigApi }>;
@@ -248,7 +248,7 @@ export function createApp(options?: {
  * @public
  */
 export function createSpecializedApp(options?: {
-  /** @deprecated - Please use {@link @backstage/frontend-app-api#IconBundleBlueprint} to make new icon bundles which can be installed in the app seperately */
+  /** @deprecated - Please use {@link @backstage/frontend-plugin-api#IconBundleBlueprint} to make new icon bundles which can be installed in the app seperately */
   icons?: { [key in string]: IconComponent };
   features?: FrontendFeature[];
   config?: ConfigApi;

From fbc7819133216ada61e2782a91b96a5d7954a0b2 Mon Sep 17 00:00:00 2001
From: Heikki Hellgren <heikki.hellgren@op.fi>
Date: Tue, 23 Jul 2024 10:17:41 +0300
Subject: [PATCH 138/225] fix: use es2022 in cli bundler and in storybook

fixes #25737

Signed-off-by: Heikki Hellgren <heikki.hellgren@op.fi>
---
 .changeset/cuddly-zebras-crash.md            | 5 +++++
 packages/cli/src/lib/bundler/optimization.ts | 4 ++--
 packages/cli/src/lib/bundler/transforms.ts   | 6 +++---
 storybook/.storybook/main.js                 | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/cuddly-zebras-crash.md

diff --git a/.changeset/cuddly-zebras-crash.md b/.changeset/cuddly-zebras-crash.md
new file mode 100644
index 0000000000..473ac4053f
--- /dev/null
+++ b/.changeset/cuddly-zebras-crash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Use ES2022 in CLI bundler
diff --git a/packages/cli/src/lib/bundler/optimization.ts b/packages/cli/src/lib/bundler/optimization.ts
index 891e0793fe..cf240b4791 100644
--- a/packages/cli/src/lib/bundler/optimization.ts
+++ b/packages/cli/src/lib/bundler/optimization.ts
@@ -28,13 +28,13 @@ export const optimization = (
     minimize: !isDev,
     minimizer: [
       new EsbuildPlugin({
-        target: 'es2019',
+        target: 'ES2022',
         format: 'iife',
         exclude: 'remoteEntry.js',
       }),
       // Avoid iife wrapping of module federation remote entry as it breaks the variable assignment
       new EsbuildPlugin({
-        target: 'es2019',
+        target: 'ES2022',
         format: undefined,
         include: 'remoteEntry.js',
       }),
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index 0900b8e48e..1be54f7a73 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -57,7 +57,7 @@ export const transforms = (options: TransformOptions): Transforms => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'es2019',
+              target: 'ES2022',
               externalHelpers: !isBackend,
               parser: {
                 syntax: 'typescript',
@@ -85,7 +85,7 @@ export const transforms = (options: TransformOptions): Transforms => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'es2019',
+              target: 'ES2022',
               externalHelpers: !isBackend,
               parser: {
                 syntax: 'ecmascript',
@@ -118,7 +118,7 @@ export const transforms = (options: TransformOptions): Transforms => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'es2019',
+              target: 'es2022',
               externalHelpers: !isBackend,
               parser: {
                 syntax: 'ecmascript',
diff --git a/storybook/.storybook/main.js b/storybook/.storybook/main.js
index cb5f364a32..799c6c7c85 100644
--- a/storybook/.storybook/main.js
+++ b/storybook/.storybook/main.js
@@ -69,7 +69,7 @@ module.exports = Object.assign(({ args }) => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'es2019',
+              target: 'ES2022',
               parser: {
                 syntax: 'typescript',
                 tsx: true,
@@ -89,7 +89,7 @@ module.exports = Object.assign(({ args }) => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'es2019',
+              target: 'ES2022',
               parser: {
                 syntax: 'ecmascript',
                 jsx: true,

From faa1b465e9d5fb64110ff3fe121959f4839fbe3e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Jul 2024 09:52:28 +0200
Subject: [PATCH 139/225] app-next,docs: add example for public index entry
 point in new frontend system

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 docs/tutorials/enable-public-entry.md         | 43 ++++++++++++++++
 packages/app-next/src/App.tsx                 | 17 ++-----
 .../src/index-public-experimental.tsx         | 49 +++++++++++++++++++
 .../app-next/src/overrides/SignInPage.tsx     | 31 ++++++++++++
 4 files changed, 126 insertions(+), 14 deletions(-)
 create mode 100644 packages/app-next/src/index-public-experimental.tsx
 create mode 100644 packages/app-next/src/overrides/SignInPage.tsx

diff --git a/docs/tutorials/enable-public-entry.md b/docs/tutorials/enable-public-entry.md
index 6282f66418..d257753413 100644
--- a/docs/tutorials/enable-public-entry.md
+++ b/docs/tutorials/enable-public-entry.md
@@ -100,3 +100,46 @@ With that, Backstage's cli and backend will detect public entry point and serve
 5. Finally, as soon as you log in, you will be redirected to the main app home page (inspect the page and see that the protected bundle was served from the app backend after the redirect).
 
 That's it!
+
+## New Frontend System
+
+If your app uses the new frontend system, you can still use the public entry point feature. The `index-public-experimental.tsx` file does end up looking a bit different in this case:
+
+```tsx title="in packages/app/src/index-public-experimental.tsx"
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { CookieAuthRedirect } from '@backstage/plugin-auth-react';
+import { createApp } from '@backstage/frontend-app-api';
+import {
+  coreExtensionData,
+  createExtension,
+  createExtensionOverrides,
+} from '@backstage/frontend-plugin-api';
+
+const signInPage = createSignInPageExtension({
+  name: 'guest',
+  loader: async () => props => <SignInPage {...props} providers={['guest']} />,
+});
+
+const authRedirectExtension = createExtension({
+  namespace: 'app',
+  name: 'layout',
+  attachTo: { id: 'app/root', input: 'children' },
+  output: {
+    element: coreExtensionData.reactElement,
+  },
+  factory: () => ({
+    element: <CookieAuthRedirect />,
+  }),
+});
+
+const app = createApp({
+  features: [
+    createExtensionOverrides({
+      extensions: [signInPage, authRedirectExtension],
+    }),
+  ],
+});
+
+ReactDOM.createRoot(document.getElementById('root')!).render(app.createRoot());
+```
diff --git a/packages/app-next/src/App.tsx b/packages/app-next/src/App.tsx
index c911a01258..14c4da8467 100644
--- a/packages/app-next/src/App.tsx
+++ b/packages/app-next/src/App.tsx
@@ -36,18 +36,13 @@ import { convertLegacyApp } from '@backstage/core-compat-api';
 import { FlatRoutes } from '@backstage/core-app-api';
 import { Route } from 'react-router';
 import { CatalogImportPage } from '@backstage/plugin-catalog-import';
-import {
-  createApiFactory,
-  configApiRef,
-  SignInPageProps,
-} from '@backstage/core-plugin-api';
+import { createApiFactory, configApiRef } from '@backstage/core-plugin-api';
 import {
   ScmAuth,
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import { createSignInPageExtension } from '@backstage/frontend-plugin-api';
-import { SignInPage } from '@backstage/core-components';
+import { signInPageOverrides } from './overrides/SignInPage';
 
 /*
 
@@ -90,12 +85,6 @@ const homePageExtension = createExtension({
   },
 });
 
-const signInPage = createSignInPageExtension({
-  name: 'guest',
-  loader: async () => (props: SignInPageProps) =>
-    <SignInPage {...props} providers={['guest']} />,
-});
-
 const scmAuthExtension = createApiExtension({
   factory: ScmAuth.createDefaultApiFactory(),
 });
@@ -121,13 +110,13 @@ const app = createApp({
     userSettingsPlugin,
     homePlugin,
     appVisualizerPlugin,
+    signInPageOverrides,
     ...collectedLegacyPlugins,
     createExtensionOverrides({
       extensions: [
         homePageExtension,
         scmAuthExtension,
         scmIntegrationApi,
-        signInPage,
         notFoundErrorPage,
       ],
     }),
diff --git a/packages/app-next/src/index-public-experimental.tsx b/packages/app-next/src/index-public-experimental.tsx
new file mode 100644
index 0000000000..56bc698ffd
--- /dev/null
+++ b/packages/app-next/src/index-public-experimental.tsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { CookieAuthRedirect } from '@backstage/plugin-auth-react';
+import { createApp } from '@backstage/frontend-app-api';
+import { signInPageOverrides } from './overrides/SignInPage';
+import {
+  coreExtensionData,
+  createExtension,
+  createExtensionOverrides,
+} from '@backstage/frontend-plugin-api';
+
+const authRedirectExtension = createExtension({
+  namespace: 'app',
+  name: 'layout',
+  attachTo: { id: 'app/root', input: 'children' },
+  output: {
+    element: coreExtensionData.reactElement,
+  },
+  factory: () => ({
+    element: <CookieAuthRedirect />,
+  }),
+});
+
+const app = createApp({
+  features: [
+    signInPageOverrides,
+    createExtensionOverrides({
+      extensions: [authRedirectExtension],
+    }),
+  ],
+});
+
+ReactDOM.createRoot(document.getElementById('root')!).render(app.createRoot());
diff --git a/packages/app-next/src/overrides/SignInPage.tsx b/packages/app-next/src/overrides/SignInPage.tsx
new file mode 100644
index 0000000000..364a749293
--- /dev/null
+++ b/packages/app-next/src/overrides/SignInPage.tsx
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { SignInPage } from '@backstage/core-components';
+import {
+  createExtensionOverrides,
+  createSignInPageExtension,
+} from '@backstage/frontend-plugin-api';
+
+const signInPage = createSignInPageExtension({
+  name: 'guest',
+  loader: async () => props => <SignInPage {...props} providers={['guest']} />,
+});
+
+export const signInPageOverrides = createExtensionOverrides({
+  extensions: [signInPage],
+});

From c79eac60653eefe154ea0d68ccd0a9a72785bbc4 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Jul 2024 10:04:38 +0200
Subject: [PATCH 140/225] scaffolder: fix deprecation comment formatting

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/deprecated.ts                         | 12 +++--
 .../src/scaffolder/actions/deprecated.ts      | 54 ++++++++++++-------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts b/plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts
index a17c88c3a4..a9daa771f0 100644
--- a/plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts
+++ b/plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts
@@ -19,25 +19,29 @@ import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bi
 export { createPublishBitbucketAction } from './actions/bitbucket';
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-cloud` instead
  */
 export const createPublishBitbucketCloudAction =
   bitbucketCloud.createPublishBitbucketCloudAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-cloud` instead
  */
 export const createBitbucketPipelinesRunAction =
   bitbucketCloud.createBitbucketPipelinesRunAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-server` instead
  */
 export const createPublishBitbucketServerAction =
   bitbucketServer.createPublishBitbucketServerAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-server` instead
  */
 export const createPublishBitbucketServerPullRequestAction =
   bitbucketServer.createPublishBitbucketServerPullRequestAction;
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts b/plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts
index fd5fdd49e8..5d037b44b6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts
@@ -22,56 +22,66 @@ import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bi
 import * as gerrit from '@backstage/plugin-scaffolder-backend-module-gerrit';
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createGithubActionsDispatchAction =
   github.createGithubActionsDispatchAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createGithubDeployKeyAction = github.createGithubDeployKeyAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createGithubEnvironmentAction =
   github.createGithubEnvironmentAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createGithubIssuesLabelAction =
   github.createGithubIssuesLabelAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export type CreateGithubPullRequestActionOptions =
   github.CreateGithubPullRequestActionOptions;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createGithubRepoCreateAction = github.createGithubRepoCreateAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createGithubRepoPushAction = github.createGithubRepoPushAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createGithubWebhookAction = github.createGithubWebhookAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createPublishGithubAction = github.createPublishGithubAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export const createPublishGithubPullRequestAction =
   github.createPublishGithubPullRequestAction;
@@ -83,46 +93,54 @@ export const createPublishBitbucketAction =
   bitbucket.createPublishBitbucketAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-cloud` instead
  */
 export const createPublishBitbucketCloudAction =
   bitbucketCloud.createPublishBitbucketCloudAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-server` instead
  */
 export const createPublishBitbucketServerAction =
   bitbucketServer.createPublishBitbucketServerAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-server` instead
  */
 export const createPublishBitbucketServerPullRequestAction =
   bitbucketServer.createPublishBitbucketServerPullRequestAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-azure instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-azure` instead
  */
 export const createPublishAzureAction = azure.createPublishAzureAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-gerrit instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-gerrit` instead
  */
 export const createPublishGerritAction = gerrit.createPublishGerritAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-gerrit instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-gerrit` instead
  */
 export const createPublishGerritReviewAction =
   gerrit.createPublishGerritReviewAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-gitlab instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-gitlab` instead
  */
 export const createPublishGitlabAction = gitlab.createPublishGitlabAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-gitlab instead
+ * @public
+ * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-gitlab` instead
  */
 export const createPublishGitlabMergeRequestAction =
   gitlab.createPublishGitlabMergeRequestAction;

From a6603e4f34e1b6c2338ebfa3d8034e6744efcb21 Mon Sep 17 00:00:00 2001
From: Yghore <yhgore@gmail.com>
Date: Mon, 8 Jul 2024 21:32:28 +0200
Subject: [PATCH 141/225] feat: add automatic commited action for merge-request
 gitlab

Signed-off-by: Yghore <yhgore@gmail.com>
---
 .changeset/wild-eggs-exist.md                 | 10 ++++
 .../src/actions/gitlabMergeRequest.ts         | 53 ++++++++++++++-----
 2 files changed, 50 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/wild-eggs-exist.md

diff --git a/.changeset/wild-eggs-exist.md b/.changeset/wild-eggs-exist.md
new file mode 100644
index 0000000000..68c49e343b
--- /dev/null
+++ b/.changeset/wild-eggs-exist.md
@@ -0,0 +1,10 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': patch
+---
+
+Add custom action for merge request: **auto**
+
+The **Auto** action selects the committed action between _create_ and _update_.
+
+The **Auto** action fetches files using the **/projects/repository/tree endpoint**.
+After fetching, it checks if the file exists locally and in the repository. If it does, it chooses **update**; otherwise, it chooses **create**.
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
index a549585426..6032b4ac28 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
@@ -17,6 +17,7 @@
 import {
   createTemplateAction,
   parseRepoUrl,
+  SerializedFile,
   serializeDirectoryContents,
 } from '@backstage/plugin-scaffolder-node';
 import { Types } from '@gitbeaker/core';
@@ -27,6 +28,20 @@ import { resolveSafeChildPath } from '@backstage/backend-plugin-api';
 import { createGitlabApi } from './helpers';
 import { examples } from './gitlabMergeRequest.examples';
 
+function getFileAction(
+  file: SerializedFile,
+  remoteFiles: Types.RepositoryTreeSchema[],
+  defaultCommitAction: 'create' | 'delete' | 'update' | 'auto' | undefined,
+): 'create' | 'delete' | 'update' {
+  if (defaultCommitAction === 'auto') {
+    return remoteFiles &&
+      remoteFiles.some(remoteFile => remoteFile.path === file.path)
+      ? 'update'
+      : 'create';
+  }
+  return defaultCommitAction ?? 'create';
+}
+
 /**
  * Create a new action that creates a gitlab merge request.
  *
@@ -46,7 +61,7 @@ export const createPublishGitlabMergeRequestAction = (options: {
     sourcePath?: string;
     targetPath?: string;
     token?: string;
-    commitAction?: 'create' | 'delete' | 'update';
+    commitAction?: 'create' | 'delete' | 'update' | 'auto';
     /** @deprecated projectID passed as query parameters in the repoUrl */
     projectid?: string;
     removeSourceBranch?: boolean;
@@ -109,9 +124,9 @@ export const createPublishGitlabMergeRequestAction = (options: {
           commitAction: {
             title: 'Commit action',
             type: 'string',
-            enum: ['create', 'update', 'delete'],
+            enum: ['create', 'update', 'delete', 'auto'],
             description:
-              'The action to be used for git commit. Defaults to create.',
+              'The action to be used for git commit. Defaults to create. "auto" is custom action provide by backstage, (automatic assign create or update action) /!\\ Use more api calls /!\\ *',
           },
           removeSourceBranch: {
             title: 'Delete source branch',
@@ -199,16 +214,7 @@ export const createPublishGitlabMergeRequestAction = (options: {
         gitignore: true,
       });
 
-      const actions: Types.CommitAction[] = fileContents.map(file => ({
-        action: ctx.input.commitAction ?? 'create',
-        filePath: targetPath
-          ? path.posix.join(targetPath, file.path)
-          : file.path,
-        encoding: 'base64',
-        content: file.content.toString('base64'),
-        execute_filemode: file.executable,
-      }));
-
+      let remoteFiles: Types.RepositoryTreeSchema[];
       let targetBranch = targetBranchName;
       if (!targetBranch) {
         const projects = await api.Projects.show(repoID);
@@ -216,6 +222,27 @@ export const createPublishGitlabMergeRequestAction = (options: {
         const { default_branch: defaultBranch } = projects;
         targetBranch = defaultBranch!;
       }
+      try {
+        remoteFiles = await api.Repositories.tree(repoID, {
+          ref: targetBranch,
+          recursive: true,
+          path: targetPath ?? undefined,
+        });
+      } catch (e) {
+        ctx.logger.warn(
+          `Could not retrieve the list of files for ${repoID} (branch: ${targetBranch}) : ${e}`,
+        );
+      }
+
+      const actions: Types.CommitAction[] = fileContents.map(file => ({
+        action: getFileAction(file, remoteFiles, ctx.input.commitAction),
+        filePath: targetPath
+          ? path.posix.join(targetPath, file.path)
+          : file.path,
+        encoding: 'base64',
+        content: file.content.toString('base64'),
+        execute_filemode: file.executable,
+      }));
 
       try {
         await api.Branches.create(repoID, branchName, String(targetBranch));

From 224958e95239ddf67176fbf4695635dfad70d80d Mon Sep 17 00:00:00 2001
From: Yghore <yhgore@gmail.com>
Date: Mon, 8 Jul 2024 21:55:46 +0200
Subject: [PATCH 142/225] doc: add api report

Signed-off-by: Yghore <yhgore@gmail.com>
---
 .../scaffolder-backend-module-gitlab/api-report.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/scaffolder-backend-module-gitlab/api-report.md b/plugins/scaffolder-backend-module-gitlab/api-report.md
index b1f240029e..4b5dc491ca 100644
--- a/plugins/scaffolder-backend-module-gitlab/api-report.md
+++ b/plugins/scaffolder-backend-module-gitlab/api-report.md
@@ -33,11 +33,11 @@ export const createGitlabIssueAction: (options: {
     projectId: number;
     labels?: string | undefined;
     description?: string | undefined;
-    weight?: number | undefined;
     token?: string | undefined;
+    weight?: number | undefined;
     assignees?: number[] | undefined;
-    createdAt?: string | undefined;
     confidential?: boolean | undefined;
+    createdAt?: string | undefined;
     milestoneId?: number | undefined;
     epicId?: number | undefined;
     dueDate?: string | undefined;
@@ -61,8 +61,8 @@ export const createGitlabProjectAccessTokenAction: (options: {
     projectId: string | number;
     name?: string | undefined;
     token?: string | undefined;
-    scopes?: string[] | undefined;
     expiresAt?: string | undefined;
+    scopes?: string[] | undefined;
     accessLevel?: number | undefined;
   },
   {
@@ -118,7 +118,7 @@ export const createGitlabRepoPushAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'update' | 'delete' | 'create' | undefined;
+    commitAction?: 'update' | 'create' | 'delete' | undefined;
   },
   JsonObject
 >;
@@ -193,7 +193,7 @@ export const createPublishGitlabMergeRequestAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'update' | 'delete' | 'create' | undefined;
+    commitAction?: 'auto' | 'update' | 'create' | 'delete' | undefined;
     projectid?: string | undefined;
     removeSourceBranch?: boolean | undefined;
     assignee?: string | undefined;
@@ -206,8 +206,8 @@ export const createTriggerGitlabPipelineAction: (options: {
   integrations: ScmIntegrationRegistry;
 }) => TemplateAction<
   {
-    branch: string;
     repoUrl: string;
+    branch: string;
     projectId: number;
     tokenDescription: string;
     token?: string | undefined;
@@ -229,8 +229,8 @@ export const editGitlabIssueAction: (options: {
     title?: string | undefined;
     labels?: string | undefined;
     description?: string | undefined;
-    weight?: number | undefined;
     token?: string | undefined;
+    weight?: number | undefined;
     assignees?: number[] | undefined;
     addLabels?: string | undefined;
     confidential?: boolean | undefined;

From ed0bea5d93d4b2e1f52d04469eb6b288fc13abde Mon Sep 17 00:00:00 2001
From: Yghore <yhgore@gmail.com>
Date: Sun, 14 Jul 2024 22:56:19 +0200
Subject: [PATCH 143/225] fix(default action) create -> auto

Signed-off-by: Yghore <yhgore@gmail.com>
---
 .../scaffolder-backend-module-gitlab/api-report.md | 14 +++++++-------
 .../src/actions/gitlabMergeRequest.ts              |  6 +++---
 plugins/scaffolder-backend/api-report.md           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/scaffolder-backend-module-gitlab/api-report.md b/plugins/scaffolder-backend-module-gitlab/api-report.md
index 4b5dc491ca..ab89669ede 100644
--- a/plugins/scaffolder-backend-module-gitlab/api-report.md
+++ b/plugins/scaffolder-backend-module-gitlab/api-report.md
@@ -33,11 +33,11 @@ export const createGitlabIssueAction: (options: {
     projectId: number;
     labels?: string | undefined;
     description?: string | undefined;
-    token?: string | undefined;
     weight?: number | undefined;
+    token?: string | undefined;
     assignees?: number[] | undefined;
-    confidential?: boolean | undefined;
     createdAt?: string | undefined;
+    confidential?: boolean | undefined;
     milestoneId?: number | undefined;
     epicId?: number | undefined;
     dueDate?: string | undefined;
@@ -61,8 +61,8 @@ export const createGitlabProjectAccessTokenAction: (options: {
     projectId: string | number;
     name?: string | undefined;
     token?: string | undefined;
-    expiresAt?: string | undefined;
     scopes?: string[] | undefined;
+    expiresAt?: string | undefined;
     accessLevel?: number | undefined;
   },
   {
@@ -118,7 +118,7 @@ export const createGitlabRepoPushAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'update' | 'create' | 'delete' | undefined;
+    commitAction?: 'update' | 'delete' | 'create' | undefined;
   },
   JsonObject
 >;
@@ -193,7 +193,7 @@ export const createPublishGitlabMergeRequestAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'auto' | 'update' | 'create' | 'delete' | undefined;
+    commitAction?: 'auto' | 'update' | 'delete' | 'create' | undefined;
     projectid?: string | undefined;
     removeSourceBranch?: boolean | undefined;
     assignee?: string | undefined;
@@ -206,8 +206,8 @@ export const createTriggerGitlabPipelineAction: (options: {
   integrations: ScmIntegrationRegistry;
 }) => TemplateAction<
   {
-    repoUrl: string;
     branch: string;
+    repoUrl: string;
     projectId: number;
     tokenDescription: string;
     token?: string | undefined;
@@ -229,8 +229,8 @@ export const editGitlabIssueAction: (options: {
     title?: string | undefined;
     labels?: string | undefined;
     description?: string | undefined;
-    token?: string | undefined;
     weight?: number | undefined;
+    token?: string | undefined;
     assignees?: number[] | undefined;
     addLabels?: string | undefined;
     confidential?: boolean | undefined;
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
index 6032b4ac28..d256a2166b 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
@@ -33,13 +33,13 @@ function getFileAction(
   remoteFiles: Types.RepositoryTreeSchema[],
   defaultCommitAction: 'create' | 'delete' | 'update' | 'auto' | undefined,
 ): 'create' | 'delete' | 'update' {
-  if (defaultCommitAction === 'auto') {
+  if (!defaultCommitAction || defaultCommitAction === 'auto') {
     return remoteFiles &&
       remoteFiles.some(remoteFile => remoteFile.path === file.path)
       ? 'update'
       : 'create';
   }
-  return defaultCommitAction ?? 'create';
+  return defaultCommitAction;
 }
 
 /**
@@ -126,7 +126,7 @@ export const createPublishGitlabMergeRequestAction = (options: {
             type: 'string',
             enum: ['create', 'update', 'delete', 'auto'],
             description:
-              'The action to be used for git commit. Defaults to create. "auto" is custom action provide by backstage, (automatic assign create or update action) /!\\ Use more api calls /!\\ *',
+              'The action to be used for git commit. Defaults to auto. "auto" is custom action provide by backstage, (automatic assign create or update action) /!\\ Use more api calls /!\\ *',
           },
           removeSourceBranch: {
             title: 'Delete source branch',
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index a3beee2b53..907a30b541 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -312,7 +312,7 @@ export const createPublishGitlabMergeRequestAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'update' | 'delete' | 'create' | undefined;
+    commitAction?: 'auto' | 'update' | 'delete' | 'create' | undefined;
     projectid?: string | undefined;
     removeSourceBranch?: boolean | undefined;
     assignee?: string | undefined;

From 3afa2966b2e2b2d90196e604fffa939450e145e8 Mon Sep 17 00:00:00 2001
From: Yghore <yhgore@gmail.com>
Date: Tue, 9 Jul 2024 13:12:25 +0000
Subject: [PATCH 144/225] fix: remote file was always fetched even without auto
 commit action

Signed-off-by: Yghore <yhgore@gmail.com>
---
 .../src/actions/gitlabMergeRequest.ts         | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
index d256a2166b..0c6a6fad48 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
@@ -214,7 +214,6 @@ export const createPublishGitlabMergeRequestAction = (options: {
         gitignore: true,
       });
 
-      let remoteFiles: Types.RepositoryTreeSchema[];
       let targetBranch = targetBranchName;
       if (!targetBranch) {
         const projects = await api.Projects.show(repoID);
@@ -222,16 +221,20 @@ export const createPublishGitlabMergeRequestAction = (options: {
         const { default_branch: defaultBranch } = projects;
         targetBranch = defaultBranch!;
       }
-      try {
-        remoteFiles = await api.Repositories.tree(repoID, {
-          ref: targetBranch,
-          recursive: true,
-          path: targetPath ?? undefined,
-        });
-      } catch (e) {
-        ctx.logger.warn(
-          `Could not retrieve the list of files for ${repoID} (branch: ${targetBranch}) : ${e}`,
-        );
+
+      let remoteFiles: Types.RepositoryTreeSchema[] = [];
+      if (ctx.input.commitAction && ctx.input.commitAction === 'auto') {
+        try {
+          remoteFiles = await api.Repositories.tree(repoID, {
+            ref: targetBranch,
+            recursive: true,
+            path: targetPath ?? undefined,
+          });
+        } catch (e) {
+          ctx.logger.warn(
+            `Could not retrieve the list of files for ${repoID} (branch: ${targetBranch}) : ${e}`,
+          );
+        }
       }
 
       const actions: Types.CommitAction[] = fileContents.map(file => ({

From 9281a5e9bd60da001cc413dd58a7043a94232e72 Mon Sep 17 00:00:00 2001
From: Yghore <yhgore@gmail.com>
Date: Mon, 15 Jul 2024 12:29:41 +0000
Subject: [PATCH 145/225] fix(filepath if targetPath is set), fix(default
 commitAction not retrieve repo files)

Signed-off-by: Yghore <yhgore@gmail.com>
---
 .../src/actions/gitlabMergeRequest.ts               | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
index 0c6a6fad48..733365c6df 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
@@ -29,13 +29,14 @@ import { createGitlabApi } from './helpers';
 import { examples } from './gitlabMergeRequest.examples';
 
 function getFileAction(
-  file: SerializedFile,
+  fileInfo: { file: SerializedFile; targetPath: string | undefined },
   remoteFiles: Types.RepositoryTreeSchema[],
   defaultCommitAction: 'create' | 'delete' | 'update' | 'auto' | undefined,
 ): 'create' | 'delete' | 'update' {
   if (!defaultCommitAction || defaultCommitAction === 'auto') {
+    const filePath = path.join(fileInfo.targetPath ?? '', fileInfo.file.path);
     return remoteFiles &&
-      remoteFiles.some(remoteFile => remoteFile.path === file.path)
+      remoteFiles.some(remoteFile => remoteFile.path === filePath)
       ? 'update'
       : 'create';
   }
@@ -223,7 +224,7 @@ export const createPublishGitlabMergeRequestAction = (options: {
       }
 
       let remoteFiles: Types.RepositoryTreeSchema[] = [];
-      if (ctx.input.commitAction && ctx.input.commitAction === 'auto') {
+      if (!ctx.input.commitAction || ctx.input.commitAction === 'auto') {
         try {
           remoteFiles = await api.Repositories.tree(repoID, {
             ref: targetBranch,
@@ -238,7 +239,11 @@ export const createPublishGitlabMergeRequestAction = (options: {
       }
 
       const actions: Types.CommitAction[] = fileContents.map(file => ({
-        action: getFileAction(file, remoteFiles, ctx.input.commitAction),
+        action: getFileAction(
+          { file, targetPath },
+          remoteFiles,
+          ctx.input.commitAction,
+        ),
         filePath: targetPath
           ? path.posix.join(targetPath, file.path)
           : file.path,

From 422f883e4e8a7b38452ba6f58e0af910d8894ae3 Mon Sep 17 00:00:00 2001
From: Yghore <yhgore@gmail.com>
Date: Mon, 15 Jul 2024 12:33:00 +0000
Subject: [PATCH 146/225] add: test for auto commited action

Signed-off-by: Yghore <yhgore@gmail.com>
---
 .../src/actions/gitlabMergeRequest.test.ts    | 115 +++++++++++++++++-
 1 file changed, 113 insertions(+), 2 deletions(-)

diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
index befc2c01c9..3eda50a924 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
@@ -61,6 +61,28 @@ const mockGitlabClient = {
         ];
     }),
   },
+  Repositories: {
+    tree: jest.fn(
+      async (
+        repoID: string | number,
+        options: { ref: string; recursive: boolean; path: string | undefined },
+      ) => {
+        if (repoID !== 'owner/repo') throw new Error('repo does not exist');
+        if (options.recursive === false) throw new Error('malformed options');
+        else {
+          return [
+            {
+              id: 'a1e8f8d745cc87e3a9248358d9352bb7f9a0aeba',
+              name: 'auto.txt',
+              type: 'blob',
+              path: 'source/auto.txt',
+              mode: '040000',
+            },
+          ];
+        }
+      },
+    ),
+  },
 };
 
 jest.mock('@gitbeaker/node', () => ({
@@ -407,7 +429,7 @@ describe('createGitLabMergeRequest', () => {
   });
 
   describe('createGitLabMergeRequestWithoutCommitAction', () => {
-    it('default commitAction is create', async () => {
+    it('default commitAction is auto', async () => {
       const input = {
         repoUrl: 'gitlab.com?repo=repo&owner=owner',
         title: 'Create my new MR',
@@ -417,7 +439,7 @@ describe('createGitLabMergeRequest', () => {
       };
       mockDir.setContent({
         [workspacePath]: {
-          source: { 'foo.txt': 'Hello there!' },
+          source: { 'foo.txt': 'Hello there!', 'auto.txt': 'File exist' },
           irrelevant: { 'bar.txt': 'Nothing to see here' },
         },
       });
@@ -429,6 +451,13 @@ describe('createGitLabMergeRequest', () => {
         'new-mr',
         'Create my new MR',
         [
+          {
+            action: 'update',
+            filePath: 'source/auto.txt',
+            content: 'RmlsZSBleGlzdA==',
+            encoding: 'base64',
+            execute_filemode: false,
+          },
           {
             action: 'create',
             filePath: 'source/foo.txt',
@@ -512,6 +541,88 @@ describe('createGitLabMergeRequest', () => {
       );
     });
 
+    it('commitAction is auto when auto is passed in options', async () => {
+      const input = {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        title: 'Create my new MR',
+        branchName: 'new-mr',
+        description: 'MR description',
+        commitAction: 'auto',
+      };
+      mockDir.setContent({
+        [workspacePath]: {
+          source: { 'foo.txt': 'Hello there!', 'auto.txt': 'File exist' },
+        },
+      });
+
+      const ctx = createMockActionContext({ input, workspacePath });
+      await instance.handler(ctx);
+
+      expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'Create my new MR',
+        [
+          {
+            action: 'update',
+            filePath: 'source/auto.txt',
+            content: 'RmlsZSBleGlzdA==',
+            encoding: 'base64',
+            execute_filemode: false,
+          },
+          {
+            action: 'create',
+            filePath: 'source/foo.txt',
+            content: 'SGVsbG8gdGhlcmUh',
+            encoding: 'base64',
+            execute_filemode: false,
+          },
+        ],
+      );
+    });
+
+    it('commitAction is auto when auto is passed in options with targetPath', async () => {
+      const input = {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        title: 'Create my new MR',
+        branchName: 'new-mr',
+        description: 'MR description',
+        commitAction: 'auto',
+        targetPath: 'source',
+      };
+      mockDir.setContent({
+        [workspacePath]: {
+          source: { 'foo.txt': 'Hello there!', 'auto.txt': 'File exist' },
+          irrevelant: {},
+        },
+      });
+
+      const ctx = createMockActionContext({ input, workspacePath });
+      await instance.handler(ctx);
+
+      expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'Create my new MR',
+        [
+          {
+            action: 'update',
+            filePath: 'source/auto.txt',
+            content: 'RmlsZSBleGlzdA==',
+            encoding: 'base64',
+            execute_filemode: false,
+          },
+          {
+            action: 'create',
+            filePath: 'source/foo.txt',
+            content: 'SGVsbG8gdGhlcmUh',
+            encoding: 'base64',
+            execute_filemode: false,
+          },
+        ],
+      );
+    });
+
     it('commitAction is delete when delete is passed in options', async () => {
       const input = {
         repoUrl: 'gitlab.com?repo=repo&owner=owner',

From 9999ce0937e33086ca2c8a601400f2967b4ebfb1 Mon Sep 17 00:00:00 2001
From: Yghore <yhgore@gmail.com>
Date: Mon, 15 Jul 2024 12:47:17 +0000
Subject: [PATCH 147/225] fix: add api-report...

Signed-off-by: Yghore <yhgore@gmail.com>
---
 plugins/scaffolder-backend/api-report.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 907a30b541..ca008c4280 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -312,7 +312,10 @@ export const createPublishGitlabMergeRequestAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'auto' | 'update' | 'delete' | 'create' | undefined;
+    commitAction?: 'auto' | 'update' | 'delete' | 'create' | undefined
+    /**
+     * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
+     */;
     projectid?: string | undefined;
     removeSourceBranch?: boolean | undefined;
     assignee?: string | undefined;

From 6bec6090a8bbfb11691118bf87c416afdd77eacc Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 10:21:26 +0200
Subject: [PATCH 148/225] chore: fix api-reports

Signed-off-by: blam <ben@blam.sh>
---
 plugins/scaffolder-backend/api-report.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index ca008c4280..907a30b541 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -312,10 +312,7 @@ export const createPublishGitlabMergeRequestAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'auto' | 'update' | 'delete' | 'create' | undefined
-    /**
-     * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-github instead
-     */;
+    commitAction?: 'auto' | 'update' | 'delete' | 'create' | undefined;
     projectid?: string | undefined;
     removeSourceBranch?: boolean | undefined;
     assignee?: string | undefined;

From c3f56507740906dddeeb6304216db9f77755dec6 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 10:32:30 +0200
Subject: [PATCH 149/225] chore: migrate the EntityCardExtension to
 EntityCardBlueprint

Signed-off-by: blam <ben@blam.sh>
---
 plugins/catalog-react/src/alpha.tsx | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/plugins/catalog-react/src/alpha.tsx b/plugins/catalog-react/src/alpha.tsx
index e81b8e5ebf..7f276b8ea6 100644
--- a/plugins/catalog-react/src/alpha.tsx
+++ b/plugins/catalog-react/src/alpha.tsx
@@ -22,6 +22,7 @@ import {
   RouteRef,
   coreExtensionData,
   createExtension,
+  createExtensionBlueprint,
   createExtensionDataRef,
   createSchemaFromZod,
 } from '@backstage/frontend-plugin-api';
@@ -47,6 +48,44 @@ export const catalogExtensionData = {
   }),
 };
 
+/** @alpha */
+export const EntityCardBlueprint = createExtensionBlueprint({
+  kind: 'entity-card',
+  attachTo: { id: 'entity-content:catalog/overview', input: 'cards' },
+  configSchema: createSchemaFromZod(z =>
+    z.object({
+      filter: z.string().optional(),
+    }),
+  ),
+  output: {
+    element: coreExtensionData.reactElement,
+    filterFunction: catalogExtensionData.entityFilterFunction.optional(),
+    filterExpression: catalogExtensionData.entityFilterExpression.optional(),
+  },
+  factory(
+    params: {
+      filter?:
+        | typeof catalogExtensionData.entityFilterFunction.T
+        | typeof catalogExtensionData.entityFilterExpression.T;
+      loader: () => Promise<JSX.Element>;
+    },
+    { node, config },
+  ) {
+    const ExtensionComponent = lazy(() =>
+      params.loader().then(element => ({ default: () => element })),
+    );
+
+    return {
+      element: (
+        <ExtensionBoundary node={node}>
+          <ExtensionComponent />
+        </ExtensionBoundary>
+      ),
+      ...mergeFilters({ config, options: params }),
+    };
+  },
+});
+
 // TODO: Figure out how to merge with provided config schema
 /** @alpha */
 export function createEntityCardExtension<

From d5bf3b1f4b7dd3f1c2ba76141c3ba972e0dcfd20 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 11:09:33 +0200
Subject: [PATCH 150/225] chore: rework how to define factory functions and
 params in blueprints

Signed-off-by: blam <ben@blam.sh>
---
 .../wiring/createExtensionBlueprint.test.tsx  |  13 +--
 .../src/wiring/createExtensionBlueprint.ts    | 110 ++++++++++--------
 2 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index 87b3cec152..d2373518a3 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -88,20 +88,17 @@ describe('createExtensionBlueprint', () => {
 
     const extension = TestExtensionBlueprint.make({
       name: 'my-extension',
-      params: {
-        text: 'Hello, world!',
-      },
-      factory(params: { text: string }) {
-        return {
-          element: <h2>{params.text}</h2>,
-        };
+      factory(origFactory) {
+        return origFactory({
+          text: 'Hello, world!',
+        });
       },
     });
 
     expect(extension).toBeDefined();
 
     const { container } = createExtensionTester(extension).render();
-    expect(container.querySelector('h2')).toHaveTextContent('Hello, world!');
+    expect(container.querySelector('h1')).toHaveTextContent('Hello, world!');
   });
 
   it('should allow exporting the dataRefs from the extension blueprint', () => {
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index b504db5f03..fb9081f7f8 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -67,32 +67,43 @@ export interface ExtensionBlueprint<
 > {
   dataRefs: TDataRefs;
 
-  make(args: {
-    namespace?: string;
-    name?: string;
-    attachTo?: { id: string; input: string };
-    disabled?: boolean;
-    inputs?: TInputs;
-    output?: TOutput;
-    configSchema?: PortableSchema<TConfig>;
-    params: TParams;
-    factory?(
-      params: TParams,
-      context: {
-        node: AppNode;
-        config: TConfig;
-        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-        orignalFactory(
-          params?: TParams,
-          context?: {
-            node?: AppNode;
-            config?: TConfig;
-            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-          },
-        ): Expand<ExtensionDataValues<TOutput>>;
-      },
-    ): Expand<ExtensionDataValues<TOutput>>;
-  }): ExtensionDefinition<TConfig>;
+  /**
+   * Creates a new extension from the blueprint.
+   *
+   * You must either pass `params` directly, or define a `factory` that can
+   * optionally call the original factory with the same params.
+   */
+  make(
+    args: {
+      namespace?: string;
+      name?: string;
+      attachTo?: { id: string; input: string };
+      disabled?: boolean;
+      inputs?: TInputs;
+      output?: TOutput;
+      configSchema?: PortableSchema<TConfig>;
+    } & (
+      | {
+          factory(
+            originalFactory: (
+              params: TParams,
+              context?: {
+                config?: TConfig;
+                inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+              },
+            ) => Expand<ExtensionDataValues<TOutput>>,
+            context: {
+              node: AppNode;
+              config: TConfig;
+              inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+            },
+          ): Expand<ExtensionDataValues<TOutput>>;
+        }
+      | {
+          params: TParams;
+        }
+    ),
+  ): ExtensionDefinition<TConfig>;
 }
 
 /**
@@ -127,21 +138,19 @@ class ExtensionBlueprintImpl<
     inputs?: TInputs;
     output?: TOutput;
     configSchema?: PortableSchema<TConfig>;
-    params: TParams;
+    params?: TParams;
     factory?(
-      params: TParams,
+      originalFactory: (
+        params: TParams,
+        context?: {
+          config?: TConfig;
+          inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+        },
+      ) => Expand<ExtensionDataValues<TOutput>>,
       context: {
         node: AppNode;
         config: TConfig;
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-        orignalFactory(
-          params?: TParams,
-          context?: {
-            node?: AppNode;
-            config?: TConfig;
-            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-          },
-        ): Expand<ExtensionDataValues<TOutput>>;
       },
     ): Expand<ExtensionDataValues<TOutput>>;
   }): ExtensionDefinition<TConfig> {
@@ -156,30 +165,33 @@ class ExtensionBlueprintImpl<
       configSchema: args.configSchema ?? this.options.configSchema, // TODO: some config merging or smth
       factory: ({ node, config, inputs }) => {
         if (args.factory) {
-          return args.factory(args.params, {
-            node,
-            config,
-            inputs,
-            orignalFactory: (
-              innerParams?: TParams,
+          return args.factory(
+            (
+              innerParams: TParams,
               innerContext?: {
                 config?: TConfig;
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
             ) =>
-              this.options.factory(innerParams ?? args.params, {
+              this.options.factory(innerParams, {
                 node,
                 config: innerContext?.config ?? config,
                 inputs: innerContext?.inputs ?? inputs,
               }),
+            {
+              node,
+              config,
+              inputs,
+            },
+          );
+        } else if (args.params) {
+          return this.options.factory(args.params, {
+            node,
+            config,
+            inputs,
           });
         }
-
-        return this.options.factory(args.params, {
-          node,
-          config,
-          inputs,
-        });
+        throw new Error('Either params or factory must be provided');
       },
     });
   }

From 32a38e1f37dd02476a17d78cfc3cc18cc7f08b24 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 21 Jul 2024 13:21:43 +0200
Subject: [PATCH 151/225] cli: remove most lockfile analysis features

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/neat-gifts-join.md                 |   5 +
 .changeset/small-spoons-shout.md              |  13 ++
 .../config/vocabularies/Backstage/accept.txt  |   2 +
 .../keeping-backstage-updated.md              |  24 +-
 docs/tooling/cli/03-commands.md               |  21 +-
 packages/cli/cli-report.md                    |  11 -
 packages/cli/src/commands/index.ts            |   2 +-
 .../cli/src/commands/versions/bump.test.ts    | 174 +-------------
 packages/cli/src/commands/versions/bump.ts    |  98 +-------
 packages/cli/src/commands/versions/lint.ts    | 114 +--------
 packages/cli/src/lib/bundler/server.ts        |  39 ----
 .../cli/src/lib/versioning/Lockfile.test.ts   | 219 ------------------
 packages/cli/src/lib/versioning/Lockfile.ts   | 211 -----------------
 plugins/devtools-backend/src/util/Lockfile.ts | 189 +--------------
 14 files changed, 43 insertions(+), 1079 deletions(-)
 create mode 100644 .changeset/neat-gifts-join.md
 create mode 100644 .changeset/small-spoons-shout.md

diff --git a/.changeset/neat-gifts-join.md b/.changeset/neat-gifts-join.md
new file mode 100644
index 0000000000..cd140c4692
--- /dev/null
+++ b/.changeset/neat-gifts-join.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-devtools-backend': patch
+---
+
+Removed unused code for lockfile analysis.
diff --git a/.changeset/small-spoons-shout.md b/.changeset/small-spoons-shout.md
new file mode 100644
index 0000000000..76c209edc6
--- /dev/null
+++ b/.changeset/small-spoons-shout.md
@@ -0,0 +1,13 @@
+---
+'@backstage/cli': minor
+---
+
+**BREAKING**: The lockfile (`yarn.lock`) dependency analysis and mutations have been removed from several commands.
+
+The `versions:bump` command will no longer attempt to bump and deduplicate dependencies by modifying the lockfile, it will only update `package.json` files.
+
+The `versions:check` command has been removed, since its only purpose was verification and mutation of the lockfile. We recommend using the `yarn dedupe` command instead, or the `yarn-deduplicate` package if you're using Yarn classic.
+
+The check that was built into the `package start` command has been removed, it will no longer warn about lockfile mismatches.
+
+The packages in the Backstage ecosystem handle package duplications much better now than when these CLI features were first introduced, so the need for these features has diminished. By removing them, we drastically reduce the integration between the Backstage CLI and Yarn, making it much easier to add support for other package managers in the future.
diff --git a/.github/vale/config/vocabularies/Backstage/accept.txt b/.github/vale/config/vocabularies/Backstage/accept.txt
index 1092947245..42b0e4895c 100644
--- a/.github/vale/config/vocabularies/Backstage/accept.txt
+++ b/.github/vale/config/vocabularies/Backstage/accept.txt
@@ -85,7 +85,9 @@ debounce
 Debounce
 debuggability
 declaratively
+deduplicate
 deduplicated
+deduplication
 deliverables
 denormalized
 dependabot
diff --git a/docs/getting-started/keeping-backstage-updated.md b/docs/getting-started/keeping-backstage-updated.md
index 1de8874d56..88e4a02ef2 100644
--- a/docs/getting-started/keeping-backstage-updated.md
+++ b/docs/getting-started/keeping-backstage-updated.md
@@ -63,18 +63,16 @@ When a given dependency version is the _same_ between different packages, the
 dependency is hoisted to the main `node_modules` folder in the monorepo root to
 be shared between packages. When _different_ versions of the same dependency are
 encountered, Yarn creates a `node_modules` folder within a particular package.
+This can lead to multiple versions of the same package being installed and used
+in the same app.
 
-This can lead to confusing situations with type definitions, or anything with
-global state. React [Context](https://reactjs.org/docs/context.html), for
-example, depends on global referential equality. This can cause problems in
-Backstage with API lookup, or config loading.
+All Backstage core packages are implemented in such as way that package
+duplication is **not** a problem. For example, duplicate installations of
+packages like `@backstage/core-plugin-api`, `@backstage/core-components`,
+`@backstage/plugin-catalog-react`, and `@backstage/backend-plugin-api` are all
+acceptable.
 
-To help resolve these situations, the Backstage CLI has
-[versions:check](https://backstage.io/docs/tooling/cli/03-commands#versionscheck). This
-will validate versions of `@backstage` packages in your app to check for
-duplicate definitions:
-
-```bash
-# Add --fix to attempt automatic resolution in yarn.lock
-yarn backstage-cli versions:check
-```
+While package duplication might be acceptable in many cases, you might want to
+deduplicate packages for the purpose of optimizing bundle size and installation
+speed. We recommend using deduplication utilities such as `yarn dedupe` to trim
+down the number of duplicate packages.
diff --git a/docs/tooling/cli/03-commands.md b/docs/tooling/cli/03-commands.md
index 234d0d04b7..a6652bd036 100644
--- a/docs/tooling/cli/03-commands.md
+++ b/docs/tooling/cli/03-commands.md
@@ -26,7 +26,6 @@ repo [command]                                 Command that run across an entire
 package [command]                              Lifecycle scripts for individual packages
 migrate [command]                              Migration utilities
 versions:bump [options]                        Bump Backstage packages to the latest versions
-versions:check [options]                       Check Backstage package versioning
 clean                                          Delete cache directories [DEPRECATED]
 build-workspace <workspace-dir> [packages...]  Builds a temporary dist workspace from the provided
                                                 packages
@@ -327,8 +326,7 @@ Options:
 ## versions\:bump
 
 Bump all `@backstage` packages to the latest versions. This checks for updates
-in the package registry, and will update entries both in `yarn.lock` and
-`package.json` files when necessary.
+in the package registry, and will update entries `package.json` files when necessary.
 
 ```text
 Usage: backstage-cli versions:bump [options]
@@ -339,23 +337,6 @@ Options:
   --release <version|next|main> Bump to a specific Backstage release line or version (default: "main")
 ```
 
-## versions\:check
-
-Validate `@backstage` dependencies within the repo, making sure that there are
-no duplicates of packages that might lead to breakages.
-
-By supplying the `--fix` flag the command will attempt to fix any conflict that
-can be resolved by editing `yarn.lock`, but will not attempt to search for
-remote updates or modify any `package.json` files.
-
-```text
-Usage: backstage-cli versions:check [options]
-
-Options:
-  --fix       Fix any auto-fixable versioning problems
-  -h, --help  display help for command
-```
-
 ## build-workspace
 
 Builds a mirror of the workspace using the packaged production version of each
diff --git a/packages/cli/cli-report.md b/packages/cli/cli-report.md
index 01b0f7ddec..907f0298f2 100644
--- a/packages/cli/cli-report.md
+++ b/packages/cli/cli-report.md
@@ -22,7 +22,6 @@ Commands:
   package [command]
   migrate [command]
   versions:bump [options]
-  versions:check [options]
   versions:migrate [options]
   clean
   build-workspace [options] <workspace-dir> [packages...]
@@ -607,16 +606,6 @@ Options:
   -h, --help
 ```
 
-### `backstage-cli versions:check`
-
-```
-Usage: backstage-cli versions:check [options]
-
-Options:
-  --fix
-  -h, --help
-```
-
 ### `backstage-cli versions:migrate`
 
 ```
diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts
index 25a3a4e26c..fa4bb05333 100644
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -396,7 +396,7 @@ export function registerCommands(program: Command) {
     .action(lazy(() => import('./versions/bump').then(m => m.default)));
 
   program
-    .command('versions:check')
+    .command('versions:check', { hidden: true })
     .option('--fix', 'Fix any auto-fixable versioning problems')
     .description('Check Backstage package versioning')
     .action(lazy(() => import('./versions/lint').then(m => m.default)));
diff --git a/packages/cli/src/commands/versions/bump.test.ts b/packages/cli/src/commands/versions/bump.test.ts
index b8677a48c5..cc48b91fd8 100644
--- a/packages/cli/src/commands/versions/bump.test.ts
+++ b/packages/cli/src/commands/versions/bump.test.ts
@@ -23,7 +23,6 @@ import { YarnInfoInspectData } from '../../lib/versioning/packages';
 import { setupServer } from 'msw/node';
 import { rest } from 'msw';
 import { NotFoundError } from '@backstage/errors';
-import { Lockfile } from '../../lib/versioning/Lockfile';
 import {
   MockDirectory,
   createMockDirectory,
@@ -117,17 +116,6 @@ const lockfileMock = `${HEADER}
   version "1.0.3"
 `;
 
-// This is the lockfile that we produce to unlock versions before we run yarn install
-const lockfileMockResult = `${HEADER}
-"@backstage/core@^1.0.5":
-  version "1.0.6"
-  dependencies:
-    "@backstage/core-api" "^1.0.6"
-
-"@backstage/theme@^1.0.0":
-  version "1.0.0"
-`;
-
 // Avoid flakes by comparing sorted log lines. File system access is async, which leads to the log line order being indeterministic
 const expectLogsToMatch = (
   recievedLogs: String[],
@@ -204,11 +192,7 @@ describe('bump', () => {
       'Using default pattern glob @backstage/*',
       'Checking for updates of @backstage/core',
       'Checking for updates of @backstage/theme',
-      'Checking for updates of @backstage/core-api',
       'Some packages are outdated, updating',
-      'unlocking @backstage/core@^1.0.3 ~> 1.0.6',
-      'unlocking @backstage/core-api@^1.0.6 ~> 1.0.7',
-      'unlocking @backstage/core-api@^1.0.3 ~> 1.0.7',
       'bumping @backstage/core in a to ^1.0.6',
       'bumping @backstage/core in b to ^1.0.6',
       'bumping @backstage/theme in b to ^2.0.0',
@@ -220,9 +204,8 @@ describe('bump', () => {
       'Version bump complete!',
     ]);
 
-    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(3);
+    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(2);
     expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/core');
-    expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/core-api');
     expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/theme');
 
     expect(runObj.run).toHaveBeenCalledTimes(1);
@@ -232,12 +215,6 @@ describe('bump', () => {
       expect.any(Object),
     );
 
-    const lockfileContents = await fs.readFile(
-      mockDir.resolve('yarn.lock'),
-      'utf8',
-    );
-    expect(lockfileContents).toBe(lockfileMockResult);
-
     const packageA = await fs.readJson(
       mockDir.resolve('packages/a/package.json'),
     );
@@ -312,11 +289,7 @@ describe('bump', () => {
       'Using default pattern glob @backstage/*',
       'Checking for updates of @backstage/core',
       'Checking for updates of @backstage/theme',
-      'Checking for updates of @backstage/core-api',
       'Some packages are outdated, updating',
-      'unlocking @backstage/core@^1.0.3 ~> 1.0.6',
-      'unlocking @backstage/core-api@^1.0.6 ~> 1.0.7',
-      'unlocking @backstage/core-api@^1.0.3 ~> 1.0.7',
       'bumping @backstage/core in a to ^1.0.6',
       'bumping @backstage/core in b to ^1.0.6',
       'bumping @backstage/theme in b to ^2.0.0',
@@ -328,9 +301,8 @@ describe('bump', () => {
       'Version bump complete!',
     ]);
 
-    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(3);
+    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(2);
     expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/core');
-    expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/core-api');
     expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/theme');
 
     expect(runObj.run).not.toHaveBeenCalledWith(
@@ -339,12 +311,6 @@ describe('bump', () => {
       expect.any(Object),
     );
 
-    const lockfileContents = await fs.readFile(
-      mockDir.resolve('yarn.lock'),
-      'utf8',
-    );
-    expect(lockfileContents).toBe(lockfileMockResult);
-
     const packageA = await fs.readJson(
       mockDir.resolve('packages/a/package.json'),
     );
@@ -425,12 +391,7 @@ describe('bump', () => {
       'Using default pattern glob @backstage/*',
       'Checking for updates of @backstage/core',
       'Checking for updates of @backstage/theme',
-      'Checking for updates of @backstage/theme',
-      'Checking for updates of @backstage/core-api',
       'Some packages are outdated, updating',
-      'unlocking @backstage/core@^1.0.3 ~> 1.0.6',
-      'unlocking @backstage/core-api@^1.0.6 ~> 1.0.7',
-      'unlocking @backstage/core-api@^1.0.3 ~> 1.0.7',
       'bumping @backstage/theme in b to ^5.0.0',
       'bumping @backstage/core in b to ^1.0.6',
       'bumping @backstage/core in a to ^1.0.6',
@@ -443,9 +404,8 @@ describe('bump', () => {
       'Version bump complete!',
     ]);
 
-    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(2);
+    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(1);
     expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/core');
-    expect(mockFetchPackageInfo).not.toHaveBeenCalledWith('@backstage/theme');
 
     expect(runObj.run).toHaveBeenCalledTimes(1);
     expect(runObj.run).toHaveBeenCalledWith(
@@ -454,12 +414,6 @@ describe('bump', () => {
       expect.any(Object),
     );
 
-    const lockfileContents = await fs.readFile(
-      mockDir.resolve('yarn.lock'),
-      'utf8',
-    );
-    expect(lockfileContents).toBe(lockfileMockResult);
-
     const packageA = await fs.readJson(
       mockDir.resolve('packages/a/package.json'),
     );
@@ -629,12 +583,7 @@ describe('bump', () => {
       'Using default pattern glob @backstage/*',
       'Checking for updates of @backstage/core',
       'Checking for updates of @backstage/theme',
-      'Checking for updates of @backstage/theme',
-      'Checking for updates of @backstage/core-api',
       'Some packages are outdated, updating',
-      'unlocking @backstage/core@^1.0.3 ~> 1.0.6',
-      'unlocking @backstage/core-api@^1.0.6 ~> 1.0.7',
-      'unlocking @backstage/core-api@^1.0.3 ~> 1.0.7',
       'bumping @backstage/theme in b to ^5.0.0',
       'bumping @backstage/core in b to ^1.0.6',
       'bumping @backstage/core in a to ^1.0.6',
@@ -658,21 +607,6 @@ describe('bump', () => {
 
 "@backstage-extra/custom-two@^1.0.0":
   version "1.0.0"
-`;
-    const customLockfileMockResult = `${HEADER}
-"@backstage-extra/custom-two@^1.0.0":
-  version "1.0.0"
-
-"@backstage-extra/custom@^1.1.0":
-  version "1.1.0"
-
-"@backstage/core@^1.0.5":
-  version "1.0.6"
-  dependencies:
-    "@backstage/core-api" "^1.0.6"
-
-"@backstage/theme@^1.0.0":
-  version "1.0.0"
 `;
     mockDir.setContent({
       'yarn.lock': customLockfileMock,
@@ -731,12 +665,7 @@ describe('bump', () => {
       'Checking for updates of @backstage-extra/custom',
       'Checking for updates of @backstage-extra/custom-two',
       'Checking for updates of @backstage/theme',
-      'Checking for updates of @backstage/core-api',
       'Some packages are outdated, updating',
-      'unlocking @backstage/core@^1.0.3 ~> 1.0.6',
-      'unlocking @backstage-extra/custom@^1.0.1 ~> 1.1.0',
-      'unlocking @backstage/core-api@^1.0.6 ~> 1.0.7',
-      'unlocking @backstage/core-api@^1.0.3 ~> 1.0.7',
       'bumping @backstage/core in a to ^1.0.6',
       'bumping @backstage-extra/custom in a to ^1.1.0',
       'bumping @backstage-extra/custom-two in a to ^2.0.0',
@@ -754,7 +683,7 @@ describe('bump', () => {
       'Version bump complete!',
     ]);
 
-    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(5);
+    expect(mockFetchPackageInfo).toHaveBeenCalledTimes(4);
     expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/core');
     expect(mockFetchPackageInfo).toHaveBeenCalledWith('@backstage/theme');
 
@@ -765,12 +694,6 @@ describe('bump', () => {
       expect.any(Object),
     );
 
-    const lockfileContents = await fs.readFile(
-      mockDir.resolve('yarn.lock'),
-      'utf8',
-    );
-    expect(lockfileContents).toEqual(customLockfileMockResult);
-
     const packageA = await fs.readJson(
       mockDir.resolve('packages/a/package.json'),
     );
@@ -798,7 +721,7 @@ describe('bump', () => {
 
   it('should ignore not found packages', async () => {
     mockDir.setContent({
-      'yarn.lock': lockfileMockResult,
+      'yarn.lock': lockfileMock,
       'package.json': JSON.stringify({
         workspaces: {
           packages: ['packages/*'],
@@ -848,21 +771,11 @@ describe('bump', () => {
       'Checking for updates of @backstage/theme',
       'Package info not found, ignoring package @backstage/core',
       'Package info not found, ignoring package @backstage/theme',
-      'Checking for updates of @backstage/core',
-      'Checking for updates of @backstage/theme',
-      'Package info not found, ignoring package @backstage/core',
-      'Package info not found, ignoring package @backstage/theme',
       'All Backstage packages are up to date!',
     ]);
 
     expect(runObj.run).toHaveBeenCalledTimes(0);
 
-    const lockfileContents = await fs.readFile(
-      mockDir.resolve('yarn.lock'),
-      'utf8',
-    );
-    expect(lockfileContents).toBe(lockfileMockResult);
-
     const packageA = await fs.readJson(
       mockDir.resolve('packages/a/package.json'),
     );
@@ -883,83 +796,6 @@ describe('bump', () => {
       },
     });
   });
-
-  // eslint-disable-next-line jest/expect-expect
-  it('should log duplicates', async () => {
-    jest.spyOn(Lockfile.prototype, 'analyze').mockReturnValue({
-      invalidRanges: [],
-      newVersions: [],
-      newRanges: [
-        {
-          name: '@backstage/backend-app-api',
-          oldRange: '^1.0.0',
-          newRange: '^2.0.0',
-          oldVersion: '1.0.0',
-          newVersion: '2.0.0',
-        },
-      ],
-    });
-    mockDir.setContent({
-      'yarn.lock': `${HEADER}
-"@backstage/backend-app-api@^1.0.0":
-  version "1.0.0"
-`,
-      'package.json': JSON.stringify({
-        workspaces: {
-          packages: ['packages/*'],
-        },
-      }),
-      packages: {
-        a: {
-          'package.json': JSON.stringify({
-            name: 'a',
-            dependencies: {
-              '@backstage/backend-app-api': '^1.0.0',
-            },
-          }),
-        },
-      },
-    });
-
-    jest.spyOn(runObj, 'run').mockResolvedValue(undefined);
-    worker.use(
-      rest.get(
-        'https://versions.backstage.io/v1/tags/main/manifest.json',
-        (_, res, ctx) =>
-          res(
-            ctx.status(200),
-            ctx.json({
-              packages: [
-                {
-                  name: '@backstage/backend-app-api',
-                  version: '2.0.0',
-                },
-              ],
-            }),
-          ),
-      ),
-    );
-    const { log: logs } = await withLogCollector(['log', 'warn'], async () => {
-      await bump({ pattern: null, release: 'main' } as unknown as Command);
-    });
-    expectLogsToMatch(logs, [
-      'Using default pattern glob @backstage/*',
-      'Checking for updates of @backstage/backend-app-api',
-      'Checking for updates of @backstage/backend-app-api',
-      'Some packages are outdated, updating',
-      'bumping @backstage/backend-app-api in a to ^2.0.0',
-      'Running yarn install to install new versions',
-      'Checking for moved packages to the @backstage-community namespace...',
-      '⚠️  The following packages may have breaking changes:',
-      '  @backstage/backend-app-api : 1.0.0 ~> 2.0.0',
-      '    https://github.com/backstage/backstage/blob/master/packages/backend-app-api/CHANGELOG.md',
-      'Version bump complete!',
-      '  ⚠️ Warning! ⚠️',
-      '  The below package(s) have incompatible duplicate installations, likely due to a bad dependency in a plugin.',
-      '  You can investigate this by running `yarn why <package-name>`, and report the issue to the plugin maintainers.',
-      '    @backstage/backend-app-api',
-    ]);
-  });
 });
 
 describe('bumpBackstageJsonVersion', () => {
diff --git a/packages/cli/src/commands/versions/bump.ts b/packages/cli/src/commands/versions/bump.ts
index d6d5f424ba..5b981d3890 100644
--- a/packages/cli/src/commands/versions/bump.ts
+++ b/packages/cli/src/commands/versions/bump.ts
@@ -24,7 +24,6 @@ import fs from 'fs-extra';
 import chalk from 'chalk';
 import ora from 'ora';
 import semver from 'semver';
-import { minimatch } from 'minimatch';
 import { OptionValues } from 'commander';
 import { isError, NotFoundError } from '@backstage/errors';
 import { resolve as resolvePath } from 'path';
@@ -36,7 +35,6 @@ import {
   Lockfile,
   YarnInfoInspectData,
 } from '../../lib/versioning';
-import { forbiddenDuplicatesFilter } from './lint';
 import { BACKSTAGE_JSON } from '@backstage/cli-common';
 import { runParallelWorkers } from '../../lib/parallel';
 import {
@@ -44,7 +42,6 @@ import {
   getManifestByVersion,
   ReleaseManifest,
 } from '@backstage/release-manifests';
-import { PackageGraph } from '@backstage/cli-node';
 import { migrateMovedPackages } from './migrate';
 
 function shouldUseGlobalAgent(): boolean {
@@ -125,8 +122,6 @@ export default async (opts: OptionValues) => {
 
   // Next check with the package registry to see which dependency ranges we need to bump
   const versionBumps = new Map<string, PkgVersionInfo[]>();
-  // Track package versions that we want to remove from yarn.lock in order to trigger a bump
-  const unlocked = Array<{ name: string; range: string; target: string }>();
 
   await runParallelWorkers({
     parallelismFactor: 4,
@@ -157,72 +152,13 @@ export default async (opts: OptionValues) => {
     },
   });
 
-  const filter = (name: string) => minimatch(name, pattern);
-
-  // Check for updates of transitive backstage dependencies
-  await runParallelWorkers({
-    parallelismFactor: 4,
-    items: lockfile.keys(),
-    async worker(name) {
-      // Only check @backstage packages and friends, we don't want this to do a full update of all deps
-      if (!filter(name)) {
-        return;
-      }
-
-      let target: string;
-      try {
-        target = await findTargetVersion(name);
-      } catch (error) {
-        if (isError(error) && error.name === 'NotFoundError') {
-          console.log(`Package info not found, ignoring package ${name}`);
-          return;
-        }
-        throw error;
-      }
-
-      for (const entry of lockfile.get(name) ?? []) {
-        // Ignore lockfile entries that don't satisfy the version range, since
-        // these can't cause the package to be locked to an older version
-        if (!semver.satisfies(target, entry.range)) {
-          continue;
-        }
-        // Unlock all entries that are within range but on the old version
-        unlocked.push({ name, range: entry.range, target });
-      }
-    },
-  });
-
-  console.log();
-
   // Write all discovered version bumps to package.json in this repo
-  if (versionBumps.size === 0 && unlocked.length === 0) {
+  if (versionBumps.size === 0) {
     console.log(chalk.green('All Backstage packages are up to date!'));
   } else {
     console.log(chalk.yellow('Some packages are outdated, updating'));
     console.log();
 
-    if (unlocked.length > 0) {
-      const removed = new Set<string>();
-      for (const { name, range, target } of unlocked) {
-        // Don't bother removing lockfile entries if they're already on the correct version
-        const existingEntry = lockfile.get(name)?.find(e => e.range === range);
-        if (existingEntry?.version === target) {
-          continue;
-        }
-        const key = JSON.stringify({ name, range });
-        if (!removed.has(key)) {
-          removed.add(key);
-          console.log(
-            `${chalk.magenta('unlocking')} ${name}@${chalk.yellow(
-              range,
-            )} ~> ${chalk.yellow(target)}`,
-          );
-          lockfile.remove(name, range);
-        }
-      }
-      await lockfile.save(lockfilePath);
-    }
-
     const breakingUpdates = new Map<string, { from: string; to: string }>();
     await runParallelWorkers({
       parallelismFactor: 4,
@@ -334,38 +270,6 @@ export default async (opts: OptionValues) => {
   }
 
   console.log();
-
-  // Finally we make sure the new lockfile doesn't have any duplicates
-  const dedupLockfile = await Lockfile.load(lockfilePath);
-
-  const result = dedupLockfile.analyze({
-    filter,
-    localPackages: PackageGraph.fromPackages(
-      await PackageGraph.listTargetPackages(),
-    ),
-  });
-
-  const forbiddenNewRanges = result.newRanges.filter(({ name }) =>
-    forbiddenDuplicatesFilter(name),
-  );
-  if (forbiddenNewRanges.length > 0) {
-    console.log(chalk.yellow('  ⚠️ Warning! ⚠️'));
-    console.log();
-    console.log(
-      chalk.yellow(
-        '  The below package(s) have incompatible duplicate installations, likely due to a bad dependency in a plugin.',
-      ),
-    );
-    console.log(
-      chalk.yellow(
-        '  You can investigate this by running `yarn why <package-name>`, and report the issue to the plugin maintainers.',
-      ),
-    );
-    console.log();
-    for (const { name } of forbiddenNewRanges) {
-      console.log(chalk.yellow(`    ${name}`));
-    }
-  }
 };
 
 export function createStrictVersionFinder(options: {
diff --git a/packages/cli/src/commands/versions/lint.ts b/packages/cli/src/commands/versions/lint.ts
index bfb2a752a0..66b5fc04c4 100644
--- a/packages/cli/src/commands/versions/lint.ts
+++ b/packages/cli/src/commands/versions/lint.ts
@@ -14,116 +14,8 @@
  * limitations under the License.
  */
 
-import { OptionValues } from 'commander';
-import { Lockfile } from '../../lib/versioning';
-import { paths } from '../../lib/paths';
-import partition from 'lodash/partition';
-import { PackageGraph } from '@backstage/cli-node';
-
-// Packages that we try to avoid duplicates for
-const INCLUDED = [/^@backstage\//];
-
-export const includedFilter = (name: string) =>
-  INCLUDED.some(pattern => pattern.test(name));
-
-// Packages that are not allowed to have any duplicates
-const FORBID_DUPLICATES = [/^@backstage\/\w+-app-api$/, /^@backstage\/plugin-/];
-
-// There are some packages that ARE explicitly allowed to have duplicates since
-// they handle that appropriately. This takes precedence over FORBID_DUPLICATES
-// above.
-const ALLOW_DUPLICATES = [
-  /^@backstage\/core-plugin-api$/,
-  // Duplicates of libraries are OK
-  // TODO(Rugvip): Check this using package role instead
-  /^@backstage\/plugin-.*-react$/,
-  /^@backstage\/plugin-.*-node$/,
-  /^@backstage\/plugin-.*-common$/,
-];
-
-export const forbiddenDuplicatesFilter = (name: string) =>
-  FORBID_DUPLICATES.some(pattern => pattern.test(name)) &&
-  !ALLOW_DUPLICATES.some(pattern => pattern.test(name));
-
-export default async (cmd: OptionValues) => {
-  const fix = Boolean(cmd.fix);
-
-  let success = true;
-
-  const lockfilePath = paths.resolveTargetRoot('yarn.lock');
-  const lockfile = await Lockfile.load(lockfilePath);
-  const result = lockfile.analyze({
-    filter: includedFilter,
-    localPackages: PackageGraph.fromPackages(
-      await PackageGraph.listTargetPackages(),
-    ),
-  });
-
-  logArray(
-    result.invalidRanges,
-    "The following packages versions are invalid and can't be analyzed:",
-    e => `  ${e.name} @ ${e.range}`,
+export default async () => {
+  throw new Error(
+    'This command has been removed, please consider alternatives such as `yarn dedupe` instead.',
   );
-
-  if (fix) {
-    lockfile.replaceVersions(result.newVersions);
-    await lockfile.save(lockfilePath);
-  } else {
-    const [newVersionsForbidden, newVersionsAllowed] = partition(
-      result.newVersions,
-      ({ name }) => forbiddenDuplicatesFilter(name),
-    );
-    if (newVersionsForbidden.length && !fix) {
-      success = false;
-    }
-
-    logArray(
-      newVersionsForbidden,
-      'The following packages must be deduplicated, this can be done automatically with --fix',
-      e =>
-        `  ${e.name} @ ${e.range} bumped from ${e.oldVersion} to ${e.newVersion}`,
-    );
-    logArray(
-      newVersionsAllowed,
-      'The following packages can be deduplicated, this can be done automatically with --fix',
-      e =>
-        `  ${e.name} @ ${e.range} bumped from ${e.oldVersion} to ${e.newVersion}`,
-    );
-  }
-
-  const [newRangesForbidden, newRangesAllowed] = partition(
-    result.newRanges,
-    ({ name }) => forbiddenDuplicatesFilter(name),
-  );
-  if (newRangesForbidden.length) {
-    success = false;
-  }
-
-  logArray(
-    newRangesForbidden,
-    'The following packages must be deduplicated by updating dependencies in package.json',
-    e => `  ${e.name} @ ${e.oldRange} should be changed to ${e.newRange}`,
-  );
-  logArray(
-    newRangesAllowed,
-    'The following packages can be deduplicated by updating dependencies in package.json',
-    e => `  ${e.name} @ ${e.oldRange} should be changed to ${e.newRange}`,
-  );
-
-  if (!success) {
-    throw new Error('Failed versioning check');
-  }
 };
-
-function logArray<T>(arr: T[], header: string, each: (item: T) => string) {
-  if (arr.length === 0) {
-    return;
-  }
-
-  console.log(header);
-  console.log();
-  for (const e of arr) {
-    console.log(each(e));
-  }
-  console.log();
-}
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index 6b89847fb6..259f3263eb 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -14,22 +14,15 @@
  * limitations under the License.
  */
 
-import { PackageGraph } from '@backstage/cli-node';
 import { AppConfig } from '@backstage/config';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import uniq from 'lodash/uniq';
 import openBrowser from 'react-dev-utils/openBrowser';
 import webpack from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
 
-import {
-  forbiddenDuplicatesFilter,
-  includedFilter,
-} from '../../commands/versions/lint';
 import { paths as libPaths } from '../../lib/paths';
 import { loadCliConfig } from '../config';
-import { Lockfile } from '../versioning';
 import { createConfig, resolveBaseUrl, resolveEndpoint } from './config';
 import { createDetectedModulesEntryPoint } from './packageDetection';
 import { resolveBundlingPaths, resolveOptionalBundlingPaths } from './paths';
@@ -41,38 +34,6 @@ export async function serveBundle(options: ServeOptions) {
   const targetPkg = await fs.readJson(paths.targetPackageJson);
 
   if (options.verifyVersions) {
-    const lockfile = await Lockfile.load(
-      libPaths.resolveTargetRoot('yarn.lock'),
-    );
-    const result = lockfile.analyze({
-      filter: includedFilter,
-      localPackages: PackageGraph.fromPackages(
-        await PackageGraph.listTargetPackages(),
-      ),
-    });
-    const problemPackages = [...result.newVersions, ...result.newRanges]
-      .map(({ name }) => name)
-      .filter(forbiddenDuplicatesFilter);
-
-    if (problemPackages.length > 1) {
-      console.log(
-        chalk.yellow(
-          `⚠️   Some of the following packages may be outdated or have duplicate installations:
-
-          ${uniq(problemPackages).join(', ')}
-        `,
-        ),
-      );
-      console.log(
-        chalk.yellow(
-          `⚠️   This can be resolved using the following command:
-
-          yarn backstage-cli versions:check --fix
-      `,
-        ),
-      );
-    }
-
     if (
       targetPkg.dependencies?.['react-router']?.includes('beta') ||
       targetPkg.dependencies?.['react-router-dom']?.includes('beta')
diff --git a/packages/cli/src/lib/versioning/Lockfile.test.ts b/packages/cli/src/lib/versioning/Lockfile.test.ts
index a4267acdb7..d6996b9143 100644
--- a/packages/cli/src/lib/versioning/Lockfile.test.ts
+++ b/packages/cli/src/lib/versioning/Lockfile.test.ts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import fs from 'fs-extra';
-import { BackstagePackage } from '@backstage/cli-node';
 import { Lockfile } from './Lockfile';
 import { createMockDirectory } from '@backstage/backend-test-utils';
 
@@ -47,34 +45,6 @@ b@^2:
   version "2.0.0"
 `;
 
-const mockADedup = `${LEGACY_HEADER}
-a@^1:
-  version "1.0.1"
-  resolved "https://my-registry/a-1.0.01.tgz#abc123"
-  integrity sha512-xyz
-  dependencies:
-    b "^2"
-
-b@2.0.x, b@^2:
-  version "2.0.1"
-`;
-
-const mockB = `${LEGACY_HEADER}
-"@s/a@*", "@s/a@1 || 2", "@s/a@^1":
-  version "1.0.1"
-
-"@s/a@^2.0.x":
-  version "2.0.0"
-`;
-
-const mockBDedup = `${LEGACY_HEADER}
-"@s/a@*", "@s/a@1 || 2", "@s/a@^2.0.x":
-  version "2.0.0"
-
-"@s/a@^1":
-  version "1.0.1"
-`;
-
 describe('Lockfile', () => {
   const mockDir = createMockDirectory();
 
@@ -93,75 +63,6 @@ describe('Lockfile', () => {
     ]);
     expect(lockfile.toString()).toBe(mockA);
   });
-
-  it('should deduplicate and save mockA', async () => {
-    mockDir.setContent({
-      'yarn.lock': mockA,
-    });
-
-    const lockfilePath = mockDir.resolve('yarn.lock');
-    const lockfile = await Lockfile.load(lockfilePath);
-    const result = lockfile.analyze({ localPackages: new Map() });
-    expect(result).toEqual({
-      invalidRanges: [],
-      newRanges: [],
-      newVersions: [
-        {
-          name: 'b',
-          range: '^2',
-          oldVersion: '2.0.0',
-          newVersion: '2.0.1',
-        },
-      ],
-    });
-
-    expect(lockfile.toString()).toBe(mockA);
-    lockfile.replaceVersions(result.newVersions);
-    expect(lockfile.toString()).toBe(mockADedup);
-
-    await expect(fs.readFile(lockfilePath, 'utf8')).resolves.toBe(mockA);
-    await expect(lockfile.save(lockfilePath)).resolves.toBeUndefined();
-    await expect(fs.readFile(lockfilePath, 'utf8')).resolves.toBe(mockADedup);
-  });
-
-  it('should deduplicate mockB', async () => {
-    mockDir.setContent({
-      'yarn.lock': mockB,
-    });
-
-    const lockfile = await Lockfile.load(mockDir.resolve('yarn.lock'));
-    const result = lockfile.analyze({ localPackages: new Map() });
-    expect(result).toEqual({
-      invalidRanges: [],
-      newRanges: [
-        {
-          name: '@s/a',
-          oldRange: '^1',
-          newRange: '^2.0.x',
-          oldVersion: '1.0.1',
-          newVersion: '2.0.0',
-        },
-      ],
-      newVersions: [
-        {
-          name: '@s/a',
-          range: '*',
-          oldVersion: '1.0.1',
-          newVersion: '2.0.0',
-        },
-        {
-          name: '@s/a',
-          range: '1 || 2',
-          oldVersion: '1.0.1',
-          newVersion: '2.0.0',
-        },
-      ],
-    });
-
-    expect(lockfile.toString()).toBe(mockB);
-    lockfile.replaceVersions(result.newVersions);
-    expect(lockfile.toString()).toBe(mockBDedup);
-  });
 });
 
 const mockANew = `${MODERN_HEADER}
@@ -179,51 +80,6 @@ b@^2:
   version: 2.0.0
 `;
 
-const mockANewDedup = `${MODERN_HEADER}
-a@^1:
-  version: 1.0.1
-  dependencies:
-    b: ^2
-  integrity: sha512-xyz
-  resolved: "https://my-registry/a-1.0.01.tgz#abc123"
-
-"b@2.0.x, b@^2.0.1":
-  version: 2.0.1
-
-b@^2:
-  version: 2.0.1
-`;
-
-const mockANewLocal = `${MODERN_HEADER}
-a@^1:
-  version: 1.0.1
-  dependencies:
-    b: ^2
-  integrity: sha512-xyz
-  resolved: "https://my-registry/a-1.0.01.tgz#abc123"
-
-"b@2.0.x, b@^2.0.1":
-  version: 0.0.0-use.local
-
-b@^2:
-  version: 2.0.0
-`;
-
-const mockANewLocalDedup = `${MODERN_HEADER}
-a@^1:
-  version: 1.0.1
-  dependencies:
-    b: ^2
-  integrity: sha512-xyz
-  resolved: "https://my-registry/a-1.0.01.tgz#abc123"
-
-"b@2.0.x, b@^2.0.1":
-  version: 0.0.0-use.local
-
-b@^2:
-  version: 0.0.0-use.local
-`;
-
 describe('New Lockfile', () => {
   const mockDir = createMockDirectory();
 
@@ -243,79 +99,4 @@ describe('New Lockfile', () => {
     ]);
     expect(lockfile.toString()).toBe(mockANew);
   });
-
-  it('should deduplicate and save mockANew', async () => {
-    mockDir.setContent({
-      'yarn.lock': mockANew,
-    });
-
-    const lockfilePath = mockDir.resolve('yarn.lock');
-    const lockfile = await Lockfile.load(lockfilePath);
-    const result = lockfile.analyze({ localPackages: new Map() });
-    expect(result).toEqual({
-      invalidRanges: [],
-      newRanges: [],
-      newVersions: [
-        {
-          name: 'b',
-          range: '^2',
-          oldVersion: '2.0.0',
-          newVersion: '2.0.1',
-        },
-      ],
-    });
-
-    expect(lockfile.toString()).toBe(mockANew);
-    lockfile.replaceVersions(result.newVersions);
-    expect(lockfile.toString()).toBe(mockANewDedup);
-
-    await expect(fs.readFile(lockfilePath, 'utf8')).resolves.toBe(mockANew);
-    await expect(lockfile.save(lockfilePath)).resolves.toBeUndefined();
-    await expect(fs.readFile(lockfilePath, 'utf8')).resolves.toBe(
-      mockANewDedup,
-    );
-  });
-
-  it('should deduplicate and save mockANewLocal', async () => {
-    mockDir.setContent({
-      'yarn.lock': mockANewLocal,
-    });
-
-    const lockfilePath = mockDir.resolve('yarn.lock');
-    const lockfile = await Lockfile.load(lockfilePath);
-    const result = lockfile.analyze({
-      localPackages: new Map([
-        [
-          'b',
-          {
-            packageJson: { version: '2.0.1' },
-          } as BackstagePackage,
-        ],
-      ]),
-    });
-    expect(result).toEqual({
-      invalidRanges: [],
-      newRanges: [],
-      newVersions: [
-        {
-          name: 'b',
-          range: '^2',
-          oldVersion: '2.0.0',
-          newVersion: '0.0.0-use.local',
-        },
-      ],
-    });
-
-    expect(lockfile.toString()).toBe(mockANewLocal);
-    lockfile.replaceVersions(result.newVersions);
-    expect(lockfile.toString()).toBe(mockANewLocalDedup);
-
-    await expect(fs.readFile(lockfilePath, 'utf8')).resolves.toBe(
-      mockANewLocal,
-    );
-    await expect(lockfile.save(lockfilePath)).resolves.toBeUndefined();
-    await expect(fs.readFile(lockfilePath, 'utf8')).resolves.toBe(
-      mockANewLocalDedup,
-    );
-  });
 });
diff --git a/packages/cli/src/lib/versioning/Lockfile.ts b/packages/cli/src/lib/versioning/Lockfile.ts
index 50d0a77cfd..047cf5aefc 100644
--- a/packages/cli/src/lib/versioning/Lockfile.ts
+++ b/packages/cli/src/lib/versioning/Lockfile.ts
@@ -15,10 +15,8 @@
  */
 
 import fs from 'fs-extra';
-import semver from 'semver';
 import { parseSyml, stringifySyml } from '@yarnpkg/parsers';
 import { stringify as legacyStringifyLockfile } from '@yarnpkg/lockfile';
-import { BackstagePackage } from '@backstage/cli-node';
 
 const ENTRY_PATTERN = /^((?:@[^/]+\/)?[^@/]+)@(.+)$/;
 
@@ -39,35 +37,6 @@ type LockfileQueryEntry = {
   dataKey: string;
 };
 
-/** Entries that have an invalid version range, for example an npm tag */
-type AnalyzeResultInvalidRange = {
-  name: string;
-  range: string;
-};
-
-/** Entries that can be deduplicated by bumping to an existing higher version */
-type AnalyzeResultNewVersion = {
-  name: string;
-  range: string;
-  oldVersion: string;
-  newVersion: string;
-};
-
-/** Entries that would need a dependency update in package.json to be deduplicated */
-type AnalyzeResultNewRange = {
-  name: string;
-  oldRange: string;
-  newRange: string;
-  oldVersion: string;
-  newVersion: string;
-};
-
-type AnalyzeResult = {
-  invalidRanges: AnalyzeResultInvalidRange[];
-  newVersions: AnalyzeResultNewVersion[];
-  newRanges: AnalyzeResultNewRange[];
-};
-
 // the new yarn header is handled out of band of the parsing
 // https://github.com/yarnpkg/berry/blob/0c5974f193a9397630e9aee2b3876cca62611149/packages/yarnpkg-core/sources/Project.ts#L1741-L1746
 const NEW_HEADER = `${[
@@ -153,186 +122,6 @@ export class Lockfile {
     return this.packages.keys();
   }
 
-  /** Analyzes the lockfile to identify possible actions and warnings for the entries */
-  analyze(options: {
-    filter?: (name: string) => boolean;
-    localPackages: Map<string, BackstagePackage>;
-  }): AnalyzeResult {
-    const { filter, localPackages } = options;
-    const result: AnalyzeResult = {
-      invalidRanges: [],
-      newVersions: [],
-      newRanges: [],
-    };
-
-    for (const [name, allEntries] of this.packages) {
-      if (filter && !filter(name)) {
-        continue;
-      }
-
-      // Get rid of and signal any invalid ranges upfront
-      const invalid = allEntries.filter(
-        e => !semver.validRange(e.range) && !e.range.startsWith('workspace:'),
-      );
-      result.invalidRanges.push(
-        ...invalid.map(({ range }) => ({ name, range })),
-      );
-
-      // Grab all valid entries, if there aren't at least 2 different valid ones we're done
-      const entries = allEntries.filter(e => semver.validRange(e.range));
-      if (entries.length < 2) {
-        continue;
-      }
-
-      // Find all versions currently in use
-      const versions = Array.from(new Set(entries.map(e => e.version)))
-        .map(v => {
-          // Translate workspace:^ references to the actual version
-          if (v === '0.0.0-use.local') {
-            const local = localPackages.get(name);
-            if (!local) {
-              throw new Error(`No local package found for ${name}`);
-            }
-            if (!local.packageJson.version) {
-              throw new Error(`No version found for local package ${name}`);
-            }
-            return {
-              entryVersion: v,
-              actualVersion: local.packageJson.version,
-            };
-          }
-          return { entryVersion: v, actualVersion: v };
-        })
-        .sort((v1, v2) => semver.rcompare(v1.actualVersion, v2.actualVersion));
-
-      // If we're not using at least 2 different versions we're done
-      if (versions.length < 2) {
-        continue;
-      }
-
-      // TODO(Rugvip): Support bumping into workspace ranges too
-      const acceptedVersions = new Set<string>();
-      for (const { version, range } of entries) {
-        // Finds the highest matching version from the the known versions
-        // TODO(Rugvip): We may want to select the version that satisfies the most ranges rather than the highest one
-        const acceptedVersion = versions.find(v =>
-          semver.satisfies(v.actualVersion, range),
-        );
-        if (!acceptedVersion) {
-          throw new Error(
-            `No existing version was accepted for range ${range}, searching through ${versions}, for package ${name}`,
-          );
-        }
-
-        if (acceptedVersion.entryVersion !== version) {
-          result.newVersions.push({
-            name,
-            range,
-            newVersion: acceptedVersion.entryVersion,
-            oldVersion: version,
-          });
-        }
-
-        acceptedVersions.add(acceptedVersion.actualVersion);
-      }
-
-      // If all ranges were able to accept the same version, we're done
-      if (acceptedVersions.size === 1) {
-        continue;
-      }
-
-      // Find the max version that we may want bump older packages to
-      const maxVersion = Array.from(acceptedVersions).sort(semver.rcompare)[0];
-      // Find all existing ranges that satisfy the new max version, and pick the one that
-      // results in the highest minimum allowed version, usually being the more specific one
-      const maxEntry = entries
-        .filter(e => semver.satisfies(maxVersion, e.range))
-        .map(e => ({ e, min: semver.minVersion(e.range) }))
-        .filter(p => p.min)
-        .sort((a, b) => semver.rcompare(a.min!, b.min!))[0]?.e;
-      if (!maxEntry) {
-        throw new Error(
-          `No entry found that satisfies max version '${maxVersion}'`,
-        );
-      }
-
-      // Find all entries that don't satisfy the max version
-      for (const { version, range } of entries) {
-        if (semver.satisfies(maxVersion, range)) {
-          continue;
-        }
-
-        result.newRanges.push({
-          name,
-          oldRange: range,
-          newRange: maxEntry.range,
-          oldVersion: version,
-          newVersion: maxVersion,
-        });
-      }
-    }
-
-    return result;
-  }
-
-  remove(name: string, range: string): boolean {
-    const query = `${name}@${range}`;
-    const existed = Boolean(this.data[query]);
-    delete this.data[query];
-
-    const newEntries = this.packages.get(name)?.filter(e => e.range !== range);
-    if (newEntries) {
-      this.packages.set(name, newEntries);
-    }
-
-    return existed;
-  }
-
-  /** Modifies the lockfile by bumping packages to the suggested versions */
-  replaceVersions(results: AnalyzeResultNewVersion[]) {
-    for (const { name, range, oldVersion, newVersion } of results) {
-      const query = `${name}@${range}`;
-
-      // Update the backing data
-      const entryData = this.data[query];
-      if (!entryData) {
-        throw new Error(`No entry data for ${query}`);
-      }
-      if (entryData.version !== oldVersion) {
-        throw new Error(
-          `Expected existing version data for ${query} to be ${oldVersion}, was ${entryData.version}`,
-        );
-      }
-
-      // Modifying the data in the entry is not enough, we need to reference an existing version object
-      const matchingEntry = Object.entries(this.data).find(
-        ([q, e]) => q.startsWith(`${name}@`) && e.version === newVersion,
-      );
-      if (!matchingEntry) {
-        throw new Error(
-          `No matching entry found for ${name} at version ${newVersion}`,
-        );
-      }
-      this.data[query] = matchingEntry[1];
-
-      // Update our internal data structure
-      const entry = this.packages.get(name)?.find(e => e.range === range);
-      if (!entry) {
-        throw new Error(`No entry data for ${query}`);
-      }
-      if (entry.version !== oldVersion) {
-        throw new Error(
-          `Expected existing version data for ${query} to be ${oldVersion}, was ${entryData.version}`,
-        );
-      }
-      entry.version = newVersion;
-    }
-  }
-
-  async save(path: string) {
-    await fs.writeFile(path, this.toString(), 'utf8');
-  }
-
   toString() {
     return this.legacy
       ? legacyStringifyLockfile(this.data)
diff --git a/plugins/devtools-backend/src/util/Lockfile.ts b/plugins/devtools-backend/src/util/Lockfile.ts
index 52dbb847bc..7f5497e948 100644
--- a/plugins/devtools-backend/src/util/Lockfile.ts
+++ b/plugins/devtools-backend/src/util/Lockfile.ts
@@ -15,7 +15,6 @@
  */
 
 import fs from 'fs-extra';
-import semver from 'semver';
 import { parseSyml, stringifySyml } from '@yarnpkg/parsers';
 import { stringify as legacyStringifyLockfile } from '@yarnpkg/lockfile';
 
@@ -35,35 +34,6 @@ type LockfileQueryEntry = {
   version: string;
 };
 
-/** Entries that have an invalid version range, for example an npm tag */
-type AnalyzeResultInvalidRange = {
-  name: string;
-  range: string;
-};
-
-/** Entries that can be deduplicated by bumping to an existing higher version */
-type AnalyzeResultNewVersion = {
-  name: string;
-  range: string;
-  oldVersion: string;
-  newVersion: string;
-};
-
-/** Entries that would need a dependency update in package.json to be deduplicated */
-type AnalyzeResultNewRange = {
-  name: string;
-  oldRange: string;
-  newRange: string;
-  oldVersion: string;
-  newVersion: string;
-};
-
-type AnalyzeResult = {
-  invalidRanges: AnalyzeResultInvalidRange[];
-  newVersions: AnalyzeResultNewVersion[];
-  newRanges: AnalyzeResultNewRange[];
-};
-
 function parseLockfile(lockfileContents: string) {
   try {
     return {
@@ -135,11 +105,10 @@ export class Lockfile {
       queries.push({ range, version: value.version });
     }
 
-    return new Lockfile(path, packages, data, legacy);
+    return new Lockfile(packages, data, legacy);
   }
 
   private constructor(
-    private readonly path: string,
     private readonly packages: Map<string, LockfileQueryEntry[]>,
     private readonly data: LockfileData,
     private readonly legacy: boolean = false,
@@ -155,162 +124,6 @@ export class Lockfile {
     return this.packages.keys();
   }
 
-  /** Analyzes the lockfile to identify possible actions and warnings for the entries */
-  analyze(options?: { filter?: (name: string) => boolean }): AnalyzeResult {
-    const { filter } = options ?? {};
-    const result: AnalyzeResult = {
-      invalidRanges: [],
-      newVersions: [],
-      newRanges: [],
-    };
-
-    for (const [name, allEntries] of this.packages) {
-      if (filter && !filter(name)) {
-        continue;
-      }
-
-      // Get rid of and signal any invalid ranges upfront
-      const invalid = allEntries.filter(e => !semver.validRange(e.range));
-      result.invalidRanges.push(
-        ...invalid.map(({ range }) => ({ name, range })),
-      );
-
-      // Grab all valid entries, if there aren't at least 2 different valid ones we're done
-      const entries = allEntries.filter(e => semver.validRange(e.range));
-      if (entries.length < 2) {
-        continue;
-      }
-
-      // Find all versions currently in use
-      const versions = Array.from(new Set(entries.map(e => e.version))).sort(
-        (v1, v2) => semver.rcompare(v1, v2),
-      );
-
-      // If we're not using at least 2 different versions we're done
-      if (versions.length < 2) {
-        continue;
-      }
-
-      const acceptedVersions = new Set<string>();
-      for (const { version, range } of entries) {
-        // Finds the highest matching version from the the known versions
-        // TODO(Rugvip): We may want to select the version that satisfies the most ranges rather than the highest one
-        const acceptedVersion = versions.find(v => semver.satisfies(v, range));
-        if (!acceptedVersion) {
-          throw new Error(
-            `No existing version was accepted for range ${range}, searching through ${versions}, for package ${name}`,
-          );
-        }
-
-        if (acceptedVersion !== version) {
-          result.newVersions.push({
-            name,
-            range,
-            newVersion: acceptedVersion,
-            oldVersion: version,
-          });
-        }
-
-        acceptedVersions.add(acceptedVersion);
-      }
-
-      // If all ranges were able to accept the same version, we're done
-      if (acceptedVersions.size === 1) {
-        continue;
-      }
-
-      // Find the max version that we may want bump older packages to
-      const maxVersion = Array.from(acceptedVersions).sort(semver.rcompare)[0];
-      // Find all existing ranges that satisfy the new max version, and pick the one that
-      // results in the highest minimum allowed version, usually being the more specific one
-      const maxEntry = entries
-        .filter(e => semver.satisfies(maxVersion, e.range))
-        .map(e => ({ e, min: semver.minVersion(e.range) }))
-        .filter(p => p.min)
-        .sort((a, b) => semver.rcompare(a.min!, b.min!))[0]?.e;
-      if (!maxEntry) {
-        throw new Error(
-          `No entry found that satisfies max version '${maxVersion}'`,
-        );
-      }
-
-      // Find all entries that don't satisfy the max version
-      for (const { version, range } of entries) {
-        if (semver.satisfies(maxVersion, range)) {
-          continue;
-        }
-
-        result.newRanges.push({
-          name,
-          oldRange: range,
-          newRange: maxEntry.range,
-          oldVersion: version,
-          newVersion: maxVersion,
-        });
-      }
-    }
-
-    return result;
-  }
-
-  remove(name: string, range: string): boolean {
-    const query = `${name}@${range}`;
-    const existed = Boolean(this.data[query]);
-    delete this.data[query];
-
-    const newEntries = this.packages.get(name)?.filter(e => e.range !== range);
-    if (newEntries) {
-      this.packages.set(name, newEntries);
-    }
-
-    return existed;
-  }
-
-  /** Modifies the lockfile by bumping packages to the suggested versions */
-  replaceVersions(results: AnalyzeResultNewVersion[]) {
-    for (const { name, range, oldVersion, newVersion } of results) {
-      const query = `${name}@${range}`;
-
-      // Update the backing data
-      const entryData = this.data[query];
-      if (!entryData) {
-        throw new Error(`No entry data for ${query}`);
-      }
-      if (entryData.version !== oldVersion) {
-        throw new Error(
-          `Expected existing version data for ${query} to be ${oldVersion}, was ${entryData.version}`,
-        );
-      }
-
-      // Modifying the data in the entry is not enough, we need to reference an existing version object
-      const matchingEntry = Object.entries(this.data).find(
-        ([q, e]) => q.startsWith(`${name}@`) && e.version === newVersion,
-      );
-      if (!matchingEntry) {
-        throw new Error(
-          `No matching entry found for ${name} at version ${newVersion}`,
-        );
-      }
-      this.data[query] = matchingEntry[1];
-
-      // Update our internal data structure
-      const entry = this.packages.get(name)?.find(e => e.range === range);
-      if (!entry) {
-        throw new Error(`No entry data for ${query}`);
-      }
-      if (entry.version !== oldVersion) {
-        throw new Error(
-          `Expected existing version data for ${query} to be ${oldVersion}, was ${entryData.version}`,
-        );
-      }
-      entry.version = newVersion;
-    }
-  }
-
-  async save() {
-    await fs.writeFile(this.path, this.toString(), 'utf8');
-  }
-
   toString() {
     return stringifyLockfile(this.data, this.legacy);
   }

From 81ea85028c0551474f390cb32b08d4096ebdc6cf Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 11:16:05 +0200
Subject: [PATCH 152/225] chore: fix api-reports

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-plugin-api/api-report.md | 64 ++++++++++++----------
 plugins/catalog-react/src/alpha.tsx        | 39 -------------
 2 files changed, 34 insertions(+), 69 deletions(-)

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 3c082a7694..d6a91c0c99 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -931,36 +931,40 @@ export interface ExtensionBlueprint<
 > {
   // (undocumented)
   dataRefs: TDataRefs;
-  // (undocumented)
-  make(args: {
-    namespace?: string;
-    name?: string;
-    attachTo?: {
-      id: string;
-      input: string;
-    };
-    disabled?: boolean;
-    inputs?: TInputs;
-    output?: TOutput;
-    configSchema?: PortableSchema<TConfig>;
-    params: TParams;
-    factory?(
-      params: TParams,
-      context: {
-        node: AppNode;
-        config: TConfig;
-        inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-        orignalFactory(
-          params?: TParams,
-          context?: {
-            node?: AppNode;
-            config?: TConfig;
-            inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
-          },
-        ): Expand<ExtensionDataValues<TOutput>>;
-      },
-    ): Expand<ExtensionDataValues<TOutput>>;
-  }): ExtensionDefinition<TConfig>;
+  make(
+    args: {
+      namespace?: string;
+      name?: string;
+      attachTo?: {
+        id: string;
+        input: string;
+      };
+      disabled?: boolean;
+      inputs?: TInputs;
+      output?: TOutput;
+      configSchema?: PortableSchema<TConfig>;
+    } & (
+      | {
+          factory(
+            originalFactory: (
+              params: TParams,
+              context?: {
+                config?: TConfig;
+                inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
+              },
+            ) => Expand<ExtensionDataValues<TOutput>>,
+            context: {
+              node: AppNode;
+              config: TConfig;
+              inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+            },
+          ): Expand<ExtensionDataValues<TOutput>>;
+        }
+      | {
+          params: TParams;
+        }
+    ),
+  ): ExtensionDefinition<TConfig>;
 }
 
 // @public (undocumented)
diff --git a/plugins/catalog-react/src/alpha.tsx b/plugins/catalog-react/src/alpha.tsx
index 7f276b8ea6..e81b8e5ebf 100644
--- a/plugins/catalog-react/src/alpha.tsx
+++ b/plugins/catalog-react/src/alpha.tsx
@@ -22,7 +22,6 @@ import {
   RouteRef,
   coreExtensionData,
   createExtension,
-  createExtensionBlueprint,
   createExtensionDataRef,
   createSchemaFromZod,
 } from '@backstage/frontend-plugin-api';
@@ -48,44 +47,6 @@ export const catalogExtensionData = {
   }),
 };
 
-/** @alpha */
-export const EntityCardBlueprint = createExtensionBlueprint({
-  kind: 'entity-card',
-  attachTo: { id: 'entity-content:catalog/overview', input: 'cards' },
-  configSchema: createSchemaFromZod(z =>
-    z.object({
-      filter: z.string().optional(),
-    }),
-  ),
-  output: {
-    element: coreExtensionData.reactElement,
-    filterFunction: catalogExtensionData.entityFilterFunction.optional(),
-    filterExpression: catalogExtensionData.entityFilterExpression.optional(),
-  },
-  factory(
-    params: {
-      filter?:
-        | typeof catalogExtensionData.entityFilterFunction.T
-        | typeof catalogExtensionData.entityFilterExpression.T;
-      loader: () => Promise<JSX.Element>;
-    },
-    { node, config },
-  ) {
-    const ExtensionComponent = lazy(() =>
-      params.loader().then(element => ({ default: () => element })),
-    );
-
-    return {
-      element: (
-        <ExtensionBoundary node={node}>
-          <ExtensionComponent />
-        </ExtensionBoundary>
-      ),
-      ...mergeFilters({ config, options: params }),
-    };
-  },
-});
-
 // TODO: Figure out how to merge with provided config schema
 /** @alpha */
 export function createEntityCardExtension<

From 9e8371b9e61c248636e29570aad72c4ed91c1429 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Jul 2024 12:00:24 +0200
Subject: [PATCH 153/225] Update docs/tutorials/enable-public-entry.md

Co-authored-by: Jack Palmer <UsainBloot@users.noreply.github.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 docs/tutorials/enable-public-entry.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/tutorials/enable-public-entry.md b/docs/tutorials/enable-public-entry.md
index d257753413..0174d43e3f 100644
--- a/docs/tutorials/enable-public-entry.md
+++ b/docs/tutorials/enable-public-entry.md
@@ -114,6 +114,7 @@ import {
   coreExtensionData,
   createExtension,
   createExtensionOverrides,
+  createSignInPageExtension
 } from '@backstage/frontend-plugin-api';
 
 const signInPage = createSignInPageExtension({

From e3644bf16eac1b87ca85a633b029291adb2883a7 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 12:38:10 +0200
Subject: [PATCH 154/225] chore: fixing prettier

Signed-off-by: blam <ben@blam.sh>
---
 docs/tutorials/enable-public-entry.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorials/enable-public-entry.md b/docs/tutorials/enable-public-entry.md
index 0174d43e3f..25d7382f13 100644
--- a/docs/tutorials/enable-public-entry.md
+++ b/docs/tutorials/enable-public-entry.md
@@ -114,7 +114,7 @@ import {
   coreExtensionData,
   createExtension,
   createExtensionOverrides,
-  createSignInPageExtension
+  createSignInPageExtension,
 } from '@backstage/frontend-plugin-api';
 
 const signInPage = createSignInPageExtension({

From 9a46a81ece020408ce61f4eccd0aa922b712601d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Jul 2024 12:40:11 +0200
Subject: [PATCH 155/225] core-app-api: fix immediate sign-in on sign-out

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/thirty-paws-hope.md                |  5 ++++
 .../IdentityApi/AppIdentityProxy.ts           |  3 ++-
 .../core-app-api/src/app/AppManager.test.tsx  | 26 ++++++++++++++-----
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/thirty-paws-hope.md

diff --git a/.changeset/thirty-paws-hope.md b/.changeset/thirty-paws-hope.md
new file mode 100644
index 0000000000..0de607f331
--- /dev/null
+++ b/.changeset/thirty-paws-hope.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': patch
+---
+
+The request to delete the session cookie when running the app in protected mode is now done with a plain `fetch` rather than `FetchApi`. This fixes a bug where the app would immediately try to sign-in again when removing the cookie during logout.
diff --git a/packages/core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy.ts b/packages/core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy.ts
index 92e2abffb7..941ec90d66 100644
--- a/packages/core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy.ts
+++ b/packages/core-app-api/src/apis/implementations/IdentityApi/AppIdentityProxy.ts
@@ -153,8 +153,9 @@ export class AppIdentityProxy implements IdentityApi {
       // It is fine if we do NOT worry yet about deleting cookies for OTHER backends like techdocs
       const appBaseUrl = await ctx.discoveryApi.getBaseUrl('app');
       try {
-        await ctx.fetchApi.fetch(`${appBaseUrl}/.backstage/auth/v1/cookie`, {
+        await fetch(`${appBaseUrl}/.backstage/auth/v1/cookie`, {
           method: 'DELETE',
+          credentials: 'include',
         });
       } catch {
         // Ignore the error for those who use static serving of the frontend
diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx
index 85b6bcd684..01277a09c7 100644
--- a/packages/core-app-api/src/app/AppManager.test.tsx
+++ b/packages/core-app-api/src/app/AppManager.test.tsx
@@ -19,9 +19,12 @@ import {
   MockAnalyticsApi,
   renderWithEffects,
   withLogCollector,
+  registerMswTestHooks,
 } from '@backstage/test-utils';
-import { screen, waitFor, act } from '@testing-library/react';
+import { screen, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
 import React, { PropsWithChildren, ReactNode } from 'react';
 import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
 import {
@@ -51,6 +54,9 @@ import {
 } from '@backstage/core-plugin-api/alpha';
 
 describe('Integration Test', () => {
+  const server = setupServer();
+  registerMswTestHooks(server);
+
   const noOpAnalyticsApi = createApiFactory(
     analyticsApiRef,
     new NoOpAnalyticsApi(),
@@ -847,6 +853,17 @@ describe('Integration Test', () => {
   });
 
   it('should clear app cookie when the user logs out', async () => {
+    const logoutSignal = jest.fn();
+    server.use(
+      rest.delete(
+        'http://localhost:7007/app/.backstage/auth/v1/cookie',
+        (_req, res, ctx) => {
+          logoutSignal();
+          return res(ctx.status(200));
+        },
+      ),
+    );
+
     const meta = global.document.createElement('meta');
     meta.name = 'backstage-app-mode';
     meta.content = 'protected';
@@ -901,12 +918,7 @@ describe('Integration Test', () => {
       await userEvent.click(screen.getByText('Sign Out'));
     });
 
-    await waitFor(() =>
-      expect(fetchApiMock.fetch).toHaveBeenCalledWith(
-        'http://localhost:7007/app/.backstage/auth/v1/cookie',
-        { method: 'DELETE' },
-      ),
-    );
+    expect(logoutSignal).toHaveBeenCalled();
 
     global.document.head.removeChild(meta);
   });

From 749b5efd22af01591e4bb8f4e1854dfcc169317c Mon Sep 17 00:00:00 2001
From: Jack Palmer <jackpalmer@spotify.com>
Date: Tue, 23 Jul 2024 12:30:01 +0100
Subject: [PATCH 156/225] feat: Add visibility hidden to CookieAuthRedirect

Signed-off-by: Jack Palmer <jackpalmer@spotify.com>
---
 .../src/components/CookieAuthRedirect/CookieAuthRedirect.tsx     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/auth-react/src/components/CookieAuthRedirect/CookieAuthRedirect.tsx b/plugins/auth-react/src/components/CookieAuthRedirect/CookieAuthRedirect.tsx
index f719aebdae..c89aa6a54d 100644
--- a/plugins/auth-react/src/components/CookieAuthRedirect/CookieAuthRedirect.tsx
+++ b/plugins/auth-react/src/components/CookieAuthRedirect/CookieAuthRedirect.tsx
@@ -45,6 +45,7 @@ export function CookieAuthRedirect() {
         ref={form => form?.submit()}
         action={window.location.href}
         method="POST"
+        style={{ visibility: 'hidden' }}
       >
         <input type="hidden" name="type" value="sign-in" />
         <input type="hidden" name="token" value={state.result} />

From aeac3e9efa0df730facf88617c6bc7882ee6e830 Mon Sep 17 00:00:00 2001
From: Jack Palmer <jackpalmer@spotify.com>
Date: Tue, 23 Jul 2024 12:31:58 +0100
Subject: [PATCH 157/225] chore: changeset

Signed-off-by: Jack Palmer <jackpalmer@spotify.com>
---
 .changeset/wicked-bobcats-teach.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/wicked-bobcats-teach.md

diff --git a/.changeset/wicked-bobcats-teach.md b/.changeset/wicked-bobcats-teach.md
new file mode 100644
index 0000000000..041e336f7d
--- /dev/null
+++ b/.changeset/wicked-bobcats-teach.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-react': patch
+---
+
+feat: Hide visibility of CookieAuthRedirect

From dc4fb4f6ac64bc53d38ff00e92eec000ac1911eb Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Jul 2024 15:08:07 +0200
Subject: [PATCH 158/225] cli: fix forwarding of target dir when resolving
 optional bundling paths

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/violet-jokes-wave.md        | 5 +++++
 packages/cli/src/lib/bundler/bundle.ts | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/violet-jokes-wave.md

diff --git a/.changeset/violet-jokes-wave.md b/.changeset/violet-jokes-wave.md
new file mode 100644
index 0000000000..623cff2583
--- /dev/null
+++ b/.changeset/violet-jokes-wave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Fix for `repo build --all` not properly detecting the experimental public entry point.
diff --git a/packages/cli/src/lib/bundler/bundle.ts b/packages/cli/src/lib/bundler/bundle.ts
index d24d4252f4..0aa91a90a6 100644
--- a/packages/cli/src/lib/bundler/bundle.ts
+++ b/packages/cli/src/lib/bundler/bundle.ts
@@ -42,6 +42,7 @@ export async function buildBundle(options: BuildOptions) {
 
   const paths = resolveBundlingPaths(options);
   const publicPaths = await resolveOptionalBundlingPaths({
+    targetDir: options.targetDir,
     entry: 'src/index-public-experimental',
     dist: 'dist/public',
   });

From bf2984369d30ee9b1b18974b85d8edb9ae373834 Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Tue, 23 Jul 2024 08:34:14 -0500
Subject: [PATCH 159/225] cleanup heroku.md

Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 42 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index faf1c2106e..d285e4b397 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -7,8 +7,6 @@ description: How to deploy Backstage to Heroku
 
 Heroku is a Platform as a Service (PaaS) designed to simplify application deployment.
 
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/chap/backstage-button)
-
 ## Create App
 
 Starting with an existing Backstage app or follow the [getting started guide](https://backstage.io/docs/getting-started/) to create a new one.
@@ -17,8 +15,8 @@ Install the
 [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli) and create a new Heroku app:
 
 ```shell
-$ cd your-app/
-$ heroku apps:create <your-app>
+cd your-app/
+heroku apps:create <your-app>
 ```
 
 ## Domain
@@ -26,7 +24,7 @@ $ heroku apps:create <your-app>
 Get Heroku app URL:
 
 ```shell
-$ heroku domains -a <your-app>
+heroku domains -a <your-app>
 <your-app-123>.herokuapp.com
 ```
 
@@ -59,7 +57,7 @@ Add a build script in `package.json` to compile frontend during deployment:
 Create a [Procfile](https://devcenter.heroku.com/articles/procfile) in the app's root:
 
 ```shell
-$ echo "web: yarn workspace backend start --config ../../app-config.yaml --config ../../app-config.production.yaml" > Procfile
+echo "web: yarn workspace backend start --config ../../app-config.yaml --config ../../app-config.production.yaml" > Procfile
 ```
 
 ## Database
@@ -67,7 +65,7 @@ $ echo "web: yarn workspace backend start --config ../../app-config.yaml --confi
 Provision a [Heroku Postgres](https://elements.heroku.com/addons/heroku-postgresql) database:
 
 ```shell
-$ heroku addons:create heroku-postgresql -a <your-app>
+heroku addons:create heroku-postgresql -a <your-app>
 ```
 
 Update `database` in `app-config.production.yaml`:
@@ -85,7 +83,7 @@ backend:
 Allow postgres self-signed certificates:
 
 ```shell
-$ heroku config:set PGSSLMODE=no-verify -a <your-app>
+heroku config:set PGSSLMODE=no-verify -a <your-app>
 ```
 
 ## Deployment
@@ -93,20 +91,20 @@ $ heroku config:set PGSSLMODE=no-verify -a <your-app>
 Commit changes and push to Heroku to build and deploy:
 
 ```shell
-$ git add Procfile && git commit -am "configure heroku"
-$ git push heroku main
+git add Procfile && git commit -am "configure heroku"
+git push heroku main
 ```
 
 View the app in the browser:
 
 ```shell
-$ heroku open -a <your-app>
+heroku open -a <your-app>
 ```
 
 View logs:
 
 ```shell
-$ heroku heroku -a <your-app>
+heroku heroku -a <your-app>
 ```
 
 ## Docker
@@ -116,27 +114,27 @@ As an alternative to git deploys, Heroku also [supports container images](https:
 Login to Heroku's container registry:
 
 ```shell
-$ heroku container:login
+heroku container:login
 ```
 
 Configure the Heroku app to run a container image:
 
 ```shell
-$ heroku stack:set container -a <your-app>
+heroku stack:set container -a <your-app>
 ```
 
-Locally run the [host build command](https://backstage.io/docs/deployment/docker/#host-build):
+Locally run the [host build commands](https://backstage.io/docs/deployment/docker/#host-build), they must be run whenever you are going to publish a new image:
 
 ```shell
-$ yarn build:backend --config ../../app-config.yaml --config ../../app-config.production.yaml
+yarn install --frozen-lockfile
+yarn tsc
+yarn build:backend --config ../../app-config.yaml --config ../../app-config.production.yaml
 ```
 
-Build, push, and release the container image:
+Build, push, and release the container image to the `web` dyno:
 
 ```shell
-$ docker image build . -f packages/backend/Dockerfile --tag registry.heroku.com/<your-app>/web
-
-$ docker push registry.heroku.com/<your-app>/web
-
-$ heroku container:release web -a <your-app>
+docker image build . -f packages/backend/Dockerfile --tag registry.heroku.com/<your-app>/web
+docker push registry.heroku.com/<your-app>/web
+heroku container:release web -a <your-app>
 ```

From 4a8774820c5fd84262058a1e48361d5656b57601 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:02:37 +0000
Subject: [PATCH 160/225] Version Packages (next)

---
 .changeset/pre.json                           |   52 +-
 docs/releases/v1.30.0-next.0-changelog.md     | 2214 +++++++++++++++++
 package.json                                  |    2 +-
 packages/app-defaults/CHANGELOG.md            |   11 +
 packages/app-defaults/package.json            |    2 +-
 packages/app-next-example-plugin/CHANGELOG.md |    8 +
 packages/app-next-example-plugin/package.json |    2 +-
 packages/app-next/CHANGELOG.md                |   43 +
 packages/app-next/package.json                |    2 +-
 packages/app/CHANGELOG.md                     |   41 +
 packages/app/package.json                     |    2 +-
 packages/backend-app-api/CHANGELOG.md         |   17 +
 packages/backend-app-api/package.json         |    2 +-
 packages/backend-common/CHANGELOG.md          |   28 +
 packages/backend-common/package.json          |    2 +-
 packages/backend-defaults/CHANGELOG.md        |   23 +
 packages/backend-defaults/package.json        |    2 +-
 .../CHANGELOG.md                              |   26 +
 .../package.json                              |    2 +-
 packages/backend-legacy/CHANGELOG.md          |   42 +
 packages/backend-legacy/package.json          |    2 +-
 packages/backend-openapi-utils/CHANGELOG.md   |    8 +
 packages/backend-openapi-utils/package.json   |    2 +-
 packages/backend-plugin-api/CHANGELOG.md      |   12 +
 packages/backend-plugin-api/package.json      |    2 +-
 packages/backend-tasks/CHANGELOG.md           |   11 +
 packages/backend-tasks/package.json           |    2 +-
 packages/backend-test-utils/CHANGELOG.md      |   15 +
 packages/backend-test-utils/package.json      |    2 +-
 packages/backend/CHANGELOG.md                 |   37 +
 packages/backend/package.json                 |    2 +-
 packages/cli/CHANGELOG.md                     |   35 +
 packages/cli/package.json                     |    2 +-
 packages/config-loader/CHANGELOG.md           |   13 +
 packages/config-loader/package.json           |    2 +-
 packages/core-app-api/CHANGELOG.md            |   11 +
 packages/core-app-api/package.json            |    2 +-
 packages/core-compat-api/CHANGELOG.md         |    9 +
 packages/core-compat-api/package.json         |    2 +-
 packages/core-components/CHANGELOG.md         |   12 +
 packages/core-components/package.json         |    2 +-
 packages/create-app/CHANGELOG.md              |    8 +
 packages/create-app/package.json              |    2 +-
 packages/dev-utils/CHANGELOG.md               |   14 +
 packages/dev-utils/package.json               |    2 +-
 packages/e2e-test/CHANGELOG.md                |    9 +
 packages/e2e-test/package.json                |    2 +-
 packages/frontend-app-api/CHANGELOG.md        |   16 +
 packages/frontend-app-api/package.json        |    2 +-
 packages/frontend-plugin-api/CHANGELOG.md     |   71 +
 packages/frontend-plugin-api/package.json     |    2 +-
 packages/frontend-test-utils/CHANGELOG.md     |   10 +
 packages/frontend-test-utils/package.json     |    2 +-
 packages/integration-react/CHANGELOG.md       |    9 +
 packages/integration-react/package.json       |    2 +-
 packages/integration/CHANGELOG.md             |   13 +
 packages/integration/package.json             |    2 +-
 packages/repo-tools/CHANGELOG.md              |   12 +
 packages/repo-tools/package.json              |    2 +-
 .../techdocs-cli-embedded-app/CHANGELOG.md    |   19 +
 .../techdocs-cli-embedded-app/package.json    |    2 +-
 packages/techdocs-cli/CHANGELOG.md            |   11 +
 packages/techdocs-cli/package.json            |    2 +-
 packages/test-utils/CHANGELOG.md              |   13 +
 packages/test-utils/package.json              |    2 +-
 plugins/api-docs/CHANGELOG.md                 |   15 +
 plugins/api-docs/package.json                 |    2 +-
 plugins/app-backend/CHANGELOG.md              |   14 +
 plugins/app-backend/package.json              |    2 +-
 plugins/app-node/CHANGELOG.md                 |    8 +
 plugins/app-node/package.json                 |    2 +-
 plugins/app-visualizer/CHANGELOG.md           |    9 +
 plugins/app-visualizer/package.json           |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   10 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   10 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   10 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    9 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    9 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   10 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    9 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |    9 +
 .../package.json                              |    2 +-
 plugins/auth-backend/CHANGELOG.md             |   30 +
 plugins/auth-backend/package.json             |    2 +-
 plugins/auth-node/CHANGELOG.md                |   13 +
 plugins/auth-node/package.json                |    2 +-
 plugins/auth-react/CHANGELOG.md               |   10 +
 plugins/auth-react/package.json               |    2 +-
 plugins/bitbucket-cloud-common/CHANGELOG.md   |    7 +
 plugins/bitbucket-cloud-common/package.json   |    2 +-
 .../catalog-backend-module-aws/CHANGELOG.md   |   19 +
 .../catalog-backend-module-aws/package.json   |    2 +-
 .../catalog-backend-module-azure/CHANGELOG.md |   13 +
 .../catalog-backend-module-azure/package.json |    2 +-
 .../CHANGELOG.md                              |   13 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   17 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   14 +
 .../package.json                              |    2 +-
 .../catalog-backend-module-gcp/CHANGELOG.md   |   13 +
 .../catalog-backend-module-gcp/package.json   |    2 +-
 .../CHANGELOG.md                              |   13 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   13 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   17 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   15 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   16 +
 .../package.json                              |    2 +-
 .../catalog-backend-module-ldap/CHANGELOG.md  |   14 +
 .../catalog-backend-module-ldap/package.json  |    2 +-
 .../catalog-backend-module-logs/CHANGELOG.md  |    9 +
 .../catalog-backend-module-logs/package.json  |    2 +-
 .../CHANGELOG.md                              |   14 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   15 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   14 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   14 +
 .../package.json                              |    2 +-
 plugins/catalog-backend/CHANGELOG.md          |   23 +
 plugins/catalog-backend/package.json          |    2 +-
 plugins/catalog-graph/CHANGELOG.md            |   15 +
 plugins/catalog-graph/package.json            |    2 +-
 plugins/catalog-import/CHANGELOG.md           |   18 +
 plugins/catalog-import/package.json           |    2 +-
 plugins/catalog-node/CHANGELOG.md             |   15 +
 plugins/catalog-node/package.json             |    2 +-
 plugins/catalog-react/CHANGELOG.md            |   21 +
 plugins/catalog-react/package.json            |    2 +-
 .../catalog-unprocessed-entities/CHANGELOG.md |   10 +
 .../catalog-unprocessed-entities/package.json |    2 +-
 plugins/catalog/CHANGELOG.md                  |   21 +
 plugins/catalog/package.json                  |    2 +-
 plugins/config-schema/CHANGELOG.md            |   10 +
 plugins/config-schema/package.json            |    2 +-
 plugins/devtools-backend/CHANGELOG.md         |   17 +
 plugins/devtools-backend/package.json         |    2 +-
 plugins/devtools/CHANGELOG.md                 |   13 +
 plugins/devtools/package.json                 |    2 +-
 .../CHANGELOG.md                              |   13 +
 .../package.json                              |    2 +-
 .../events-backend-module-azure/CHANGELOG.md  |    8 +
 .../events-backend-module-azure/package.json  |    2 +-
 .../CHANGELOG.md                              |    8 +
 .../package.json                              |    2 +-
 .../events-backend-module-gerrit/CHANGELOG.md |    8 +
 .../events-backend-module-gerrit/package.json |    2 +-
 .../events-backend-module-github/CHANGELOG.md |    9 +
 .../events-backend-module-github/package.json |    2 +-
 .../events-backend-module-gitlab/CHANGELOG.md |    9 +
 .../events-backend-module-gitlab/package.json |    2 +-
 .../events-backend-test-utils/CHANGELOG.md    |    7 +
 .../events-backend-test-utils/package.json    |    2 +-
 plugins/events-backend/CHANGELOG.md           |   10 +
 plugins/events-backend/package.json           |    2 +-
 plugins/events-node/CHANGELOG.md              |    7 +
 plugins/events-node/package.json              |    2 +-
 .../example-todo-list-backend/CHANGELOG.md    |   10 +
 .../example-todo-list-backend/package.json    |    2 +-
 plugins/example-todo-list/CHANGELOG.md        |    8 +
 plugins/example-todo-list/package.json        |    2 +-
 plugins/home-react/CHANGELOG.md               |    8 +
 plugins/home-react/package.json               |    2 +-
 plugins/home/CHANGELOG.md                     |   19 +
 plugins/home/package.json                     |    2 +-
 plugins/kubernetes-backend/CHANGELOG.md       |   20 +
 plugins/kubernetes-backend/package.json       |    2 +-
 plugins/kubernetes-cluster/CHANGELOG.md       |   12 +
 plugins/kubernetes-cluster/package.json       |    2 +-
 plugins/kubernetes-node/CHANGELOG.md          |   10 +
 plugins/kubernetes-node/package.json          |    2 +-
 plugins/kubernetes-react/CHANGELOG.md         |   12 +
 plugins/kubernetes-react/package.json         |    2 +-
 plugins/kubernetes/CHANGELOG.md               |   12 +
 plugins/kubernetes/package.json               |    2 +-
 .../CHANGELOG.md                              |   15 +
 .../package.json                              |    2 +-
 plugins/notifications-backend/CHANGELOG.md    |   17 +
 plugins/notifications-backend/package.json    |    2 +-
 plugins/notifications-node/CHANGELOG.md       |   12 +
 plugins/notifications-node/package.json       |    2 +-
 plugins/notifications/CHANGELOG.md            |   13 +
 plugins/notifications/package.json            |    2 +-
 plugins/org-react/CHANGELOG.md                |   11 +
 plugins/org-react/package.json                |    2 +-
 plugins/org/CHANGELOG.md                      |   13 +
 plugins/org/package.json                      |    2 +-
 .../CHANGELOG.md                              |   10 +
 .../package.json                              |    2 +-
 plugins/permission-backend/CHANGELOG.md       |   13 +
 plugins/permission-backend/package.json       |    2 +-
 plugins/permission-node/CHANGELOG.md          |   12 +
 plugins/permission-node/package.json          |    2 +-
 plugins/proxy-backend/CHANGELOG.md            |   10 +
 plugins/proxy-backend/package.json            |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   12 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   13 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   12 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   14 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   12 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   23 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   12 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   14 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   10 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   10 +
 .../package.json                              |    2 +-
 plugins/scaffolder-backend/CHANGELOG.md       |   31 +
 plugins/scaffolder-backend/package.json       |    2 +-
 .../scaffolder-node-test-utils/CHANGELOG.md   |   10 +
 .../scaffolder-node-test-utils/package.json   |    2 +-
 plugins/scaffolder-node/CHANGELOG.md          |   13 +
 plugins/scaffolder-node/package.json          |    2 +-
 plugins/scaffolder-react/CHANGELOG.md         |   22 +
 plugins/scaffolder-react/package.json         |    2 +-
 plugins/scaffolder/CHANGELOG.md               |   23 +
 plugins/scaffolder/package.json               |    2 +-
 .../CHANGELOG.md                              |   18 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   12 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   12 +
 .../package.json                              |    2 +-
 plugins/search-backend-module-pg/CHANGELOG.md |   12 +
 plugins/search-backend-module-pg/package.json |    2 +-
 .../CHANGELOG.md                              |   12 +
 .../package.json                              |    2 +-
 .../CHANGELOG.md                              |   18 +
 .../package.json                              |    2 +-
 plugins/search-backend-node/CHANGELOG.md      |   13 +
 plugins/search-backend-node/package.json      |    2 +-
 plugins/search-backend/CHANGELOG.md           |   17 +
 plugins/search-backend/package.json           |    2 +-
 plugins/search-react/CHANGELOG.md             |   14 +
 plugins/search-react/package.json             |    2 +-
 plugins/search/CHANGELOG.md                   |   16 +
 plugins/search/package.json                   |    2 +-
 plugins/signals-backend/CHANGELOG.md          |   13 +
 plugins/signals-backend/package.json          |    2 +-
 plugins/signals-node/CHANGELOG.md             |   12 +
 plugins/signals-node/package.json             |    2 +-
 plugins/signals/CHANGELOG.md                  |   11 +
 plugins/signals/package.json                  |    2 +-
 .../techdocs-addons-test-utils/CHANGELOG.md   |   15 +
 .../techdocs-addons-test-utils/package.json   |    2 +-
 plugins/techdocs-backend/CHANGELOG.md         |   17 +
 plugins/techdocs-backend/package.json         |    2 +-
 .../CHANGELOG.md                              |   11 +
 .../package.json                              |    2 +-
 plugins/techdocs-node/CHANGELOG.md            |   14 +
 plugins/techdocs-node/package.json            |    2 +-
 plugins/techdocs-react/CHANGELOG.md           |   11 +
 plugins/techdocs-react/package.json           |    2 +-
 plugins/techdocs/CHANGELOG.md                 |   21 +
 plugins/techdocs/package.json                 |    2 +-
 plugins/user-settings-backend/CHANGELOG.md    |   14 +
 plugins/user-settings-backend/package.json    |    2 +-
 plugins/user-settings/CHANGELOG.md            |   17 +
 plugins/user-settings/package.json            |    2 +-
 yarn.lock                                     |  264 +-
 314 files changed, 4828 insertions(+), 219 deletions(-)
 create mode 100644 docs/releases/v1.30.0-next.0-changelog.md

diff --git a/.changeset/pre.json b/.changeset/pre.json
index be1b694c9e..7da5b582e1 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -188,5 +188,55 @@
     "@backstage/plugin-user-settings-backend": "0.2.21",
     "@backstage/plugin-user-settings-common": "0.0.1"
   },
-  "changesets": []
+  "changesets": [
+    "blue-pumas-cheer",
+    "bright-trainers-brake",
+    "chilly-trains-sleep",
+    "cool-insects-remember",
+    "cuddly-zebras-crash",
+    "dry-squids-tap",
+    "dull-ghosts-double",
+    "early-trees-dance",
+    "eighty-mirrors-flow",
+    "flat-plums-grow",
+    "forty-ties-agree",
+    "forty-ties-disagree",
+    "friendly-feet-refuse",
+    "gentle-dryers-smile",
+    "grumpy-owls-suffer",
+    "heavy-numbers-love",
+    "hip-hairs-exist",
+    "late-games-protect",
+    "light-pianos-exercise",
+    "little-bulldogs-guess",
+    "little-suns-fly",
+    "mighty-dolls-retire",
+    "modern-parrots-protect",
+    "neat-gifts-join",
+    "new-scissors-try",
+    "nice-peas-retire",
+    "nine-cherries-decide",
+    "nine-glasses-nail",
+    "ninety-icons-smile",
+    "pink-gorillas-brake",
+    "plenty-tools-exist",
+    "rich-mugs-dress",
+    "selfish-bees-think",
+    "six-rats-kick",
+    "slow-toes-jog",
+    "small-spoons-shout",
+    "soft-gorillas-refuse",
+    "spotty-planets-accept",
+    "strange-papayas-beg",
+    "strong-otters-compete",
+    "stupid-dots-relate",
+    "swift-kings-sparkle",
+    "thirty-paws-hope",
+    "tiny-oranges-pretend",
+    "tough-lies-repair",
+    "violet-jokes-wave",
+    "wicked-bobcats-teach",
+    "wild-eggs-exist",
+    "witty-bears-behave"
+  ]
 }
diff --git a/docs/releases/v1.30.0-next.0-changelog.md b/docs/releases/v1.30.0-next.0-changelog.md
new file mode 100644
index 0000000000..f3b7f2ef45
--- /dev/null
+++ b/docs/releases/v1.30.0-next.0-changelog.md
@@ -0,0 +1,2214 @@
+# Release v1.30.0-next.0
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.30.0-next.0](https://backstage.github.io/upgrade-helper/?to=1.30.0-next.0)
+
+## @backstage/cli@0.27.0-next.0
+
+### Minor Changes
+
+- 32a38e1: **BREAKING**: The lockfile (`yarn.lock`) dependency analysis and mutations have been removed from several commands.
+
+  The `versions:bump` command will no longer attempt to bump and deduplicate dependencies by modifying the lockfile, it will only update `package.json` files.
+
+  The `versions:check` command has been removed, since its only purpose was verification and mutation of the lockfile. We recommend using the `yarn dedupe` command instead, or the `yarn-deduplicate` package if you're using Yarn classic.
+
+  The check that was built into the `package start` command has been removed, it will no longer warn about lockfile mismatches.
+
+  The packages in the Backstage ecosystem handle package duplications much better now than when these CLI features were first introduced, so the need for these features has diminished. By removing them, we drastically reduce the integration between the Backstage CLI and Yarn, making it much easier to add support for other package managers in the future.
+
+### Patch Changes
+
+- 7eb08a6: Add frontend-dynamic-container role to eslint config factory
+- fbc7819: Use ES2022 in CLI bundler
+- e53074f: Updated default backend plugin to use `RootConfigService` instead of `Config`. This also removes the dependency on `@backstage/config` as it's no longer used.
+- ee2b0e5: The experimental module federation build now has the ability to force the use of development versions of `react` and `react-dom` by setting the `FORCE_REACT_DEVELOPMENT` flag.
+- 239dffc: Remove usage of deprecated functionality from @backstage/config-loader
+- 0eedec3: Add support for dynamic plugins via the EXPERIMENTAL_MODULE_FEDERATION environment variable when running `yarn start`.
+- dc4fb4f: Fix for `repo build --all` not properly detecting the experimental public entry point.
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.7
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.8
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## @backstage/integration@1.14.0-next.0
+
+### Minor Changes
+
+- 78c1329: Updated `GitlabUrlReader.readUrl` and `GitlabUrlReader.readTree` to accept a user-provided token, supporting both bearer and private tokens.
+
+### Patch Changes
+
+- c591670: Updated functions for `getHarnessEditContentsUrl`, `getHarnessFileContentsUrl`, `getHarnessArchiveUrl`, `getHarnessLatestCommitUrl` and `parseHarnessUrl` to handle account and org level urls
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-react@1.11.0-next.0
+
+### Minor Changes
+
+- 8839381: Add scaffolder option to display object items in separate rows on review page
+
+### Patch Changes
+
+- d0e95a7: Add ability to customise form fields in the UI by exposing `uiSchema` and `formContext` in `FormProps`
+- 4670f06: support `ajv-errors` for scaffolder validation to allow for customizing the error messages
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-scaffolder-common@1.5.4
+
+## @backstage/app-defaults@1.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-permission-react@0.4.24
+
+## @backstage/backend-app-api@0.8.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.7
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
+## @backstage/backend-common@0.23.4-next.0
+
+### Patch Changes
+
+- ba8571e: Setup user agent header for AWS sdk clients, this enables users to better track API calls made from Backstage to AWS APIs through things like CloudTrail.
+
+- 7e13b7a: The remaining exports in the package have now been deprecated:
+
+  - `cacheToPluginCacheManager`
+  - `createLegacyAuthAdapters`
+  - `LegacyCreateRouter`
+  - `legacyPlugin`
+  - `loggerToWinstonLogger`
+  - `makeLegacyPlugin`
+
+  Users of these export should fully [migrate to the new backend system](https://backstage.io/docs/backend-system/building-backends/migrating).
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-dev-utils@0.1.4
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/backend-defaults@0.4.2-next.0
+
+### Patch Changes
+
+- 4e79d19: The `createHealthRouter` utility that allows you to create a health check router is now exported via `@backstage/backend-defaults/rootHttpRouter`.
+- 78c1329: Updated `GitlabUrlReader.readUrl` and `GitlabUrlReader.readTree` to accept a user-provided token, supporting both bearer and private tokens.
+- 8e967da: Fixed the routing of the new health check service, the health endpoints should now properly be available at `/.backstage/health/v1/readiness` and `/.backstage/health/v1/liveness`.
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-app-api@0.8.1-next.0
+  - @backstage/backend-dev-utils@0.1.4
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
+## @backstage/backend-dynamic-feature-service@0.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-app-api@0.8.1-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.7
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.23-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-backend@0.3.10-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/backend-openapi-utils@0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+
+## @backstage/backend-plugin-api@0.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-common@0.8.0
+
+## @backstage/backend-tasks@0.5.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/backend-test-utils@0.4.5-next.0
+
+### Patch Changes
+
+- 4e79d19: The default services for `startTestBackend` and `ServiceFactoryTester` now includes the Root Health Service.
+- Updated dependencies
+  - @backstage/backend-defaults@0.4.2-next.0
+  - @backstage/backend-app-api@0.8.1-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/config-loader@1.8.2-next.0
+
+### Patch Changes
+
+- 493feac: Add boolean `allowMissingDefaultConfig` option to `ConfigSources.default` and
+  `ConfigSources.defaultForTargets`, which results in omission of a ConfigSource
+  for the default app-config.yaml configuration file if it's not present.
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/core-app-api@1.14.1-next.0
+
+### Patch Changes
+
+- 9a46a81: The request to delete the session cookie when running the app in protected mode is now done with a plain `fetch` rather than `FetchApi`. This fixes a bug where the app would immediately try to sign-in again when removing the cookie during logout.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+
+## @backstage/core-compat-api@0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/version-bridge@1.0.8
+
+## @backstage/core-components@0.14.10-next.0
+
+### Patch Changes
+
+- 678971a: Move the `Link` component to the `RoutedTabs` instead of the `HeaderTabs` component
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.5.6
+  - @backstage/version-bridge@1.0.8
+
+## @backstage/create-app@0.5.18-next.0
+
+### Patch Changes
+
+- c0a705d: Added the Kubernetes plugin to `create-app`
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+
+## @backstage/dev-utils@1.0.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+
+## @backstage/frontend-app-api@0.7.4-next.0
+
+### Patch Changes
+
+- 7777b5f: Support icon overriding with the new `IconBundleBlueprint` API.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+
+## @backstage/frontend-plugin-api@0.6.8-next.0
+
+### Patch Changes
+
+- 4e53ad6: Introduce a new way to encapsulate extension kinds that replaces the extension creator pattern with `createExtensionBlueprint`
+
+  This allows the creation of extension instances with the following pattern:
+
+  ```tsx
+  // create the extension blueprint which is used to create instances
+  const EntityCardBlueprint = createExtensionBlueprint({
+    kind: 'entity-card',
+    attachTo: { id: 'test', input: 'default' },
+    output: {
+      element: coreExtensionData.reactElement,
+    },
+    factory(params: { text: string }) {
+      return {
+        element: <h1>{params.text}</h1>,
+      };
+    },
+  });
+
+  // create an instance of the extension blueprint with params
+  const testExtension = EntityCardBlueprint.make({
+    name: 'foo',
+    params: {
+      text: 'Hello World',
+    },
+  });
+  ```
+
+- 9b89b82: The `ExtensionBoundary` now by default infers whether it's routable from whether it outputs a route path.
+
+- 7777b5f: Added a new `IconBundleBlueprint` that lets you create icon bundle extensions that can be installed in an App in order to override or add new app icons.
+
+  ```tsx
+  import { IconBundleBlueprint } from '@backstage/frontend-plugin-api';
+
+  const exampleIconBundle = IconBundleBlueprint.make({
+    name: 'example-bundle',
+    params: {
+      icons: {
+        user: MyOwnUserIcon,
+      },
+    },
+  });
+  ```
+
+- 31bfc44: Extension data references can now be defined in a way that encapsulates the ID string in the type, in addition to the data type itself. The old way of creating extension data references is deprecated and will be removed in a future release.
+
+  For example, the following code:
+
+  ```ts
+  export const myExtension =
+    createExtensionDataRef<MyType>('my-plugin.my-data');
+  ```
+
+  Should be updated to the following:
+
+  ```ts
+  export const myExtension = createExtensionDataRef<MyType>().with({
+    id: 'my-plugin.my-data',
+  });
+  ```
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+
+## @backstage/frontend-test-utils@0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/frontend-app-api@0.7.4-next.0
+  - @backstage/test-utils@1.5.9-next.0
+  - @backstage/types@1.1.1
+
+## @backstage/integration-react@1.1.30-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+
+## @backstage/repo-tools@0.9.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.7
+  - @backstage/errors@1.2.4
+
+## @techdocs/cli@1.8.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.4.2-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.9-next.0
+
+## @backstage/test-utils@1.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-react@0.4.24
+
+## @backstage/plugin-api-docs@0.11.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-react@0.4.24
+
+## @backstage/plugin-app-backend@0.3.72-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.23-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-app-node@0.1.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+
+## @backstage/plugin-app-visualizer@0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+
+## @backstage/plugin-auth-backend@0.22.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.1.18-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.2.4-next.0
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.1.15-next.0
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.1.6-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.1.6-next.0
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.1.6-next.0
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.2.18-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.20-next.0
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.1.20-next.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.1.20-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.2.4-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.1.16-next.0
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.2.4-next.0
+  - @backstage/plugin-auth-backend-module-okta-provider@0.0.16-next.0
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.1.4-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-backend@0.22.10-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.2.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-github-provider@0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-google-provider@0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.1.18-next.0
+
+### Patch Changes
+
+- 39f36a9: Updated the Microsoft authenticator to accurately define required scopes, but to also omit the required and additional scopes when requesting resource scopes.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-backend@0.22.10-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.0.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
+## @backstage/plugin-auth-node@0.4.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-auth-react@0.1.5-next.0
+
+### Patch Changes
+
+- aeac3e9: feat: Hide visibility of CookieAuthRedirect
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+
+## @backstage/plugin-catalog@1.21.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-scaffolder-common@1.5.4
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-catalog-backend@1.24.1-next.0
+
+### Patch Changes
+
+- a629fb2: Added setAllowedLocationTypes while introducing a new extension point called CatalogLocationsExtensionPoint
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-openapi-utils@0.1.16-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.29-next.0
+
+## @backstage/plugin-catalog-backend-module-aws@0.3.18-next.0
+
+### Patch Changes
+
+- ba8571e: Setup user agent header for AWS sdk clients, this enables users to better track API calls made from Backstage to AWS APIs through things like CloudTrail.
+- 90a7340: `AwsOrganizationCloudAccountProcessor` configuration field `roleArn` is deprecated in favor of new field `accountId`
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-kubernetes-common@0.8.1
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.43-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-openapi-utils@0.1.16-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.2.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.22-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.37-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend-module-gcp@0.1.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-kubernetes-common@0.8.1
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.40-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend-module-github@0.6.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-catalog-backend-module-github-org@0.1.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-backend-module-github@0.6.6-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.3.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.0.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-catalog-backend-module-gitlab@0.3.22-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.4.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-permission-common@0.8.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+
+## @backstage/plugin-catalog-backend-module-logs@0.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.5.31-next.0
+
+### Patch Changes
+
+- 58dff4d: Added option to ingest groups based on their group membership in Azure Entra ID
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.41-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.1.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.1.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-scaffolder-common@1.5.4
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.4.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.3
+  - @backstage/plugin-permission-common@0.8.0
+
+## @backstage/plugin-catalog-graph@0.4.8-next.0
+
+### Patch Changes
+
+- fba7537: Memoize entity graph nodes when applying an `entityFilter` to prevent repeated redraws
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-import@0.12.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+
+## @backstage/plugin-catalog-node@1.12.5-next.0
+
+### Patch Changes
+
+- a629fb2: Added setAllowedLocationTypes while introducing a new extension point called CatalogLocationsExtensionPoint
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
+## @backstage/plugin-catalog-react@1.12.3-next.0
+
+### Patch Changes
+
+- 31bfc44: Updated alpha definitions of extension data references.
+- 9b89b82: Internal refactor to remove unnecessary `routable` prop in the implementation of the `createEntityContentExtension` alpha export.
+- bebd569: Fix extra divider displayed on user list picker component
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-react@0.4.24
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-config-schema@0.1.58-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-devtools@0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-devtools-common@0.1.11
+  - @backstage/plugin-permission-react@0.4.24
+
+## @backstage/plugin-devtools-backend@0.3.9-next.0
+
+### Patch Changes
+
+- 32a38e1: Removed unused code for lockfile analysis.
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.11
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
+## @backstage/plugin-events-backend@0.3.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.3.9-next.0
+
+### Patch Changes
+
+- ba8571e: Setup user agent header for AWS sdk clients, this enables users to better track API calls made from Backstage to AWS APIs through things like CloudTrail.
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-events-backend-module-azure@0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-events-backend-module-github@0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-events-node@0.3.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+
+## @backstage/plugin-home@0.7.8-next.0
+
+### Patch Changes
+
+- 31bfc44: Updated alpha definitions of extension data references.
+- fdcc059: Fixed a bug on the WelcomeTitle component where the welcome message wasn't correct when the language was set to Spanish
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-home-react@0.1.16-next.0
+
+## @backstage/plugin-home-react@0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+
+## @backstage/plugin-kubernetes@0.11.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/plugin-kubernetes-common@0.8.1
+  - @backstage/plugin-kubernetes-react@0.4.2-next.0
+
+## @backstage/plugin-kubernetes-backend@0.18.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-kubernetes-common@0.8.1
+  - @backstage/plugin-kubernetes-node@0.1.17-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
+## @backstage/plugin-kubernetes-cluster@0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/plugin-kubernetes-common@0.8.1
+  - @backstage/plugin-kubernetes-react@0.4.2-next.0
+
+## @backstage/plugin-kubernetes-node@0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.1
+
+## @backstage/plugin-kubernetes-react@0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.1
+
+## @backstage/plugin-notifications@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-signals-react@0.0.4
+
+## @backstage/plugin-notifications-backend@0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.4-next.0
+  - @backstage/plugin-signals-node@0.1.9-next.0
+
+## @backstage/plugin-notifications-backend-module-email@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.4-next.0
+
+## @backstage/plugin-notifications-node@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-signals-node@0.1.9-next.0
+
+## @backstage/plugin-org@0.6.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/plugin-catalog-common@1.0.25
+
+## @backstage/plugin-org-react@0.1.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+
+## @backstage/plugin-permission-backend@0.5.47-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
+## @backstage/plugin-permission-node@0.8.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-common@0.8.0
+
+## @backstage/plugin-proxy-backend@0.5.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder@1.23.1-next.0
+
+### Patch Changes
+
+- bbd9f56: Cleaned up codebase of RepoUrlPicker
+- b8600fe: Fix issue with `RepoUrlPicker` not refreshing the credentials for a different host
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/plugin-scaffolder-react@1.11.0-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-scaffolder-common@1.5.4
+
+## @backstage/plugin-scaffolder-backend@1.23.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.4.5-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.22-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.1.21-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-scaffolder-backend-module-azure@0.1.15-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.2.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.1.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.1.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.1.15-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.1.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.4.1-next.0
+  - @backstage/plugin-scaffolder-common@1.5.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.2.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.1.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.1.13-next.0
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-bitbucket-cloud-common@0.2.22-next.0
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.47-next.0
+
+### Patch Changes
+
+- dae85df: Add examples for `fetch:cookiecutter` scaffolder action & improve related tests
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.1.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-github@0.4.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.4.5-next.0
+
+### Patch Changes
+
+- fad1b90: Allow the `createGitlabProjectVariableAction` to use oauth tokens
+
+- aab708e: Added test cases for gitlab:issue:edit examples
+
+- ef742dc: Added test cases for gitlab:projectAccessToken:create example
+
+- 1ba4c2f: Added test cases for gitlab:pipeline:trigger examples
+
+- a6603e4: Add custom action for merge request: **auto**
+
+  The **Auto** action selects the committed action between _create_ and _update_.
+
+  The **Auto** action fetches files using the **/projects/repository/tree endpoint**.
+  After fetching, it checks if the file exists locally and in the repository. If it does, it chooses **update**; otherwise, it chooses **create**.
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.0.6-next.0
+
+### Patch Changes
+
+- 6fc03c7: Add examples for notification:send scaffolder action & improve related tests
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.4-next.0
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.40-next.0
+
+### Patch Changes
+
+- 449def7: Add examples for fetch:rails scaffolder action & improve related tests
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.3.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.10-next.0
+
+## @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.4
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-test-utils@0.4.5-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
+## @backstage/plugin-search@1.4.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-search-backend@1.5.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-defaults@0.4.2-next.0
+  - @backstage/backend-openapi-utils@0.1.16-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-search-backend-module-catalog@0.1.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.5.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-search-backend-module-explore@0.1.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-search-backend-module-pg@0.5.33-next.0
+
+### Patch Changes
+
+- 7251567: Removing `@backstage/backend-app-api` dependency
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-search-backend-module-techdocs@0.1.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-techdocs-node@1.12.9-next.0
+
+## @backstage/plugin-search-backend-node@1.2.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-search-react@1.7.14-next.0
+
+### Patch Changes
+
+- 31bfc44: Updated alpha definitions of extension data references.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-signals@0.0.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.4
+
+## @backstage/plugin-signals-backend@0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-signals-node@0.1.9-next.0
+
+## @backstage/plugin-signals-node@0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
+## @backstage/plugin-techdocs@1.10.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/plugin-auth-react@0.1.5-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/test-utils@1.5.9-next.0
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+
+## @backstage/plugin-techdocs-backend@1.10.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.28-next.0
+  - @backstage/plugin-techdocs-node@1.12.9-next.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+
+## @backstage/plugin-techdocs-node@1.12.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.13
+
+## @backstage/plugin-techdocs-react@1.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/version-bridge@1.0.8
+
+## @backstage/plugin-user-settings@0.8.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.4
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-signals-node@0.1.9-next.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.100-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.27.0-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/plugin-home@0.7.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/plugin-scaffolder-react@1.11.0-next.0
+  - @backstage/frontend-app-api@0.7.4-next.0
+  - @backstage/plugin-catalog-graph@0.4.8-next.0
+  - @backstage/plugin-scaffolder@1.23.1-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/plugin-auth-react@0.1.5-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-api-docs@0.11.8-next.0
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-catalog-import@0.12.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.7-next.0
+  - @backstage/plugin-devtools@0.1.17-next.0
+  - @backstage/plugin-kubernetes@0.11.13-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.14-next.0
+  - @backstage/plugin-notifications@0.2.4-next.0
+  - @backstage/plugin-org@0.6.28-next.0
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-search@1.4.15-next.0
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-signals@0.0.9-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.13-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+  - @backstage/plugin-user-settings@0.8.10-next.0
+
+## example-app-next@0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.27.0-next.0
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/plugin-home@0.7.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/plugin-scaffolder-react@1.11.0-next.0
+  - @backstage/frontend-app-api@0.7.4-next.0
+  - @backstage/plugin-catalog-graph@0.4.8-next.0
+  - @backstage/plugin-scaffolder@1.23.1-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/plugin-auth-react@0.1.5-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-api-docs@0.11.8-next.0
+  - @backstage/plugin-app-visualizer@0.1.9-next.0
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-catalog-import@0.12.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.7-next.0
+  - @backstage/plugin-kubernetes@0.11.13-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.14-next.0
+  - @backstage/plugin-notifications@0.2.4-next.0
+  - @backstage/plugin-org@0.6.28-next.0
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-search@1.4.15-next.0
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-signals@0.0.9-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.13-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+  - @backstage/plugin-user-settings@0.8.10-next.0
+
+## app-next-example-plugin@0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+
+## example-backend@0.0.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.4.2-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-devtools-backend@0.3.9-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/plugin-app-backend@0.3.72-next.0
+  - @backstage/plugin-auth-backend@0.22.10-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.20-next.0
+  - @backstage/plugin-auth-backend-module-guest-provider@0.1.9-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.2.6-next.0
+  - @backstage/plugin-catalog-backend-module-openapi@0.1.41-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.1.21-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.4.10-next.0
+  - @backstage/plugin-kubernetes-backend@0.18.4-next.0
+  - @backstage/plugin-notifications-backend@0.3.4-next.0
+  - @backstage/plugin-permission-backend@0.5.47-next.0
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.1.20-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-proxy-backend@0.5.4-next.0
+  - @backstage/plugin-scaffolder-backend@1.23.1-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.4.1-next.0
+  - @backstage/plugin-search-backend@1.5.15-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.29-next.0
+  - @backstage/plugin-search-backend-module-explore@0.1.29-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.28-next.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-signals-backend@0.1.9-next.0
+  - @backstage/plugin-techdocs-backend@1.10.10-next.0
+
+## example-backend-legacy@0.2.101-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.40-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.4.5-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/plugin-devtools-backend@0.3.9-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.33-next.0
+  - example-app@0.2.100-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-app-backend@0.3.72-next.0
+  - @backstage/plugin-auth-backend@0.22.10-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.1.21-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.4.10-next.0
+  - @backstage/plugin-events-backend@0.3.10-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-kubernetes-backend@0.18.4-next.0
+  - @backstage/plugin-permission-backend@0.5.47-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-proxy-backend@0.5.4-next.0
+  - @backstage/plugin-scaffolder-backend@1.23.1-next.0
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.24-next.0
+  - @backstage/plugin-search-backend@1.5.15-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.29-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.5.4-next.0
+  - @backstage/plugin-search-backend-module-explore@0.1.29-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.28-next.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-signals-backend@0.1.9-next.0
+  - @backstage/plugin-signals-node@0.1.9-next.0
+  - @backstage/plugin-techdocs-backend@1.10.10-next.0
+
+## e2e-test@0.2.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.18-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/errors@1.2.4
+
+## techdocs-cli-embedded-app@0.2.99-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.27.0-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/test-utils@1.5.9-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+
+## @internal/plugin-todo-list@1.0.30-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+
+## @internal/plugin-todo-list-backend@1.0.30-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
diff --git a/package.json b/package.json
index 07c9b2917b..73d0ca5b19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "1.29.0",
+  "version": "1.30.0-next.0",
   "private": true,
   "repository": {
     "type": "git",
diff --git a/packages/app-defaults/CHANGELOG.md b/packages/app-defaults/CHANGELOG.md
index a03034112c..a045f9a4f9 100644
--- a/packages/app-defaults/CHANGELOG.md
+++ b/packages/app-defaults/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/app-defaults
 
+## 1.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-permission-react@0.4.24
+
 ## 1.5.8
 
 ### Patch Changes
diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json
index 8997ba860f..2389c2cddc 100644
--- a/packages/app-defaults/package.json
+++ b/packages/app-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/app-defaults",
-  "version": "1.5.8",
+  "version": "1.5.9-next.0",
   "description": "Provides the default wiring of a Backstage App",
   "backstage": {
     "role": "web-library"
diff --git a/packages/app-next-example-plugin/CHANGELOG.md b/packages/app-next-example-plugin/CHANGELOG.md
index fb61388f22..f05b81642f 100644
--- a/packages/app-next-example-plugin/CHANGELOG.md
+++ b/packages/app-next-example-plugin/CHANGELOG.md
@@ -1,5 +1,13 @@
 # app-next-example-plugin
 
+## 0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+
 ## 0.0.13
 
 ### Patch Changes
diff --git a/packages/app-next-example-plugin/package.json b/packages/app-next-example-plugin/package.json
index c48d5a92be..d397883063 100644
--- a/packages/app-next-example-plugin/package.json
+++ b/packages/app-next-example-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app-next-example-plugin",
-  "version": "0.0.13",
+  "version": "0.0.14-next.0",
   "description": "Backstage internal example plugin",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/packages/app-next/CHANGELOG.md b/packages/app-next/CHANGELOG.md
index 3bbf698ebd..794484d2ce 100644
--- a/packages/app-next/CHANGELOG.md
+++ b/packages/app-next/CHANGELOG.md
@@ -1,5 +1,48 @@
 # example-app-next
 
+## 0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.27.0-next.0
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/plugin-home@0.7.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/plugin-scaffolder-react@1.11.0-next.0
+  - @backstage/frontend-app-api@0.7.4-next.0
+  - @backstage/plugin-catalog-graph@0.4.8-next.0
+  - @backstage/plugin-scaffolder@1.23.1-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/plugin-auth-react@0.1.5-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-api-docs@0.11.8-next.0
+  - @backstage/plugin-app-visualizer@0.1.9-next.0
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-catalog-import@0.12.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.7-next.0
+  - @backstage/plugin-kubernetes@0.11.13-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.14-next.0
+  - @backstage/plugin-notifications@0.2.4-next.0
+  - @backstage/plugin-org@0.6.28-next.0
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-search@1.4.15-next.0
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-signals@0.0.9-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.13-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+  - @backstage/plugin-user-settings@0.8.10-next.0
+
 ## 0.0.13
 
 ### Patch Changes
diff --git a/packages/app-next/package.json b/packages/app-next/package.json
index c0c19bc40c..b4b9f69c51 100644
--- a/packages/app-next/package.json
+++ b/packages/app-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app-next",
-  "version": "0.0.13",
+  "version": "0.0.14-next.0",
   "private": true,
   "repository": {
     "type": "git",
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index a75cf24a07..4ba5430905 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,46 @@
 # example-app
 
+## 0.2.100-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.27.0-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/plugin-home@0.7.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/plugin-scaffolder-react@1.11.0-next.0
+  - @backstage/frontend-app-api@0.7.4-next.0
+  - @backstage/plugin-catalog-graph@0.4.8-next.0
+  - @backstage/plugin-scaffolder@1.23.1-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/plugin-auth-react@0.1.5-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-api-docs@0.11.8-next.0
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-catalog-import@0.12.2-next.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.7-next.0
+  - @backstage/plugin-devtools@0.1.17-next.0
+  - @backstage/plugin-kubernetes@0.11.13-next.0
+  - @backstage/plugin-kubernetes-cluster@0.0.14-next.0
+  - @backstage/plugin-notifications@0.2.4-next.0
+  - @backstage/plugin-org@0.6.28-next.0
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-search@1.4.15-next.0
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-signals@0.0.9-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.13-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+  - @backstage/plugin-user-settings@0.8.10-next.0
+
 ## 0.2.99
 
 ### Patch Changes
diff --git a/packages/app/package.json b/packages/app/package.json
index 29cfbf0357..0468a2f7a8 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app",
-  "version": "0.2.99",
+  "version": "0.2.100-next.0",
   "backstage": {
     "role": "frontend"
   },
diff --git a/packages/backend-app-api/CHANGELOG.md b/packages/backend-app-api/CHANGELOG.md
index 70a163ee34..94ab9afb6f 100644
--- a/packages/backend-app-api/CHANGELOG.md
+++ b/packages/backend-app-api/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/backend-app-api
 
+## 0.8.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.7
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
 ## 0.8.0
 
 ### Minor Changes
diff --git a/packages/backend-app-api/package.json b/packages/backend-app-api/package.json
index 8bd156c3a4..9372b837e0 100644
--- a/packages/backend-app-api/package.json
+++ b/packages/backend-app-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-app-api",
-  "version": "0.8.0",
+  "version": "0.8.1-next.0",
   "description": "Core API used by Backstage backend apps",
   "backstage": {
     "role": "node-library"
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index 6d3218e0ed..01499c5d92 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/backend-common
 
+## 0.23.4-next.0
+
+### Patch Changes
+
+- ba8571e: Setup user agent header for AWS sdk clients, this enables users to better track API calls made from Backstage to AWS APIs through things like CloudTrail.
+- 7e13b7a: The remaining exports in the package have now been deprecated:
+
+  - `cacheToPluginCacheManager`
+  - `createLegacyAuthAdapters`
+  - `LegacyCreateRouter`
+  - `legacyPlugin`
+  - `loggerToWinstonLogger`
+  - `makeLegacyPlugin`
+
+  Users of these export should fully [migrate to the new backend system](https://backstage.io/docs/backend-system/building-backends/migrating).
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-dev-utils@0.1.4
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.23.3
 
 ### Patch Changes
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 553c800ea5..4ace5e950a 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-common",
-  "version": "0.23.3",
+  "version": "0.23.4-next.0",
   "description": "Common functionality library for Backstage backends",
   "backstage": {
     "role": "node-library"
diff --git a/packages/backend-defaults/CHANGELOG.md b/packages/backend-defaults/CHANGELOG.md
index 7d2ad7d6b7..a8cc588f1e 100644
--- a/packages/backend-defaults/CHANGELOG.md
+++ b/packages/backend-defaults/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/backend-defaults
 
+## 0.4.2-next.0
+
+### Patch Changes
+
+- 4e79d19: The `createHealthRouter` utility that allows you to create a health check router is now exported via `@backstage/backend-defaults/rootHttpRouter`.
+- 78c1329: Updated `GitlabUrlReader.readUrl` and `GitlabUrlReader.readTree` to accept a user-provided token, supporting both bearer and private tokens.
+- 8e967da: Fixed the routing of the new health check service, the health endpoints should now properly be available at `/.backstage/health/v1/readiness` and `/.backstage/health/v1/liveness`.
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-app-api@0.8.1-next.0
+  - @backstage/backend-dev-utils@0.1.4
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/packages/backend-defaults/package.json b/packages/backend-defaults/package.json
index 87da6e0017..9c04507003 100644
--- a/packages/backend-defaults/package.json
+++ b/packages/backend-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-defaults",
-  "version": "0.4.0",
+  "version": "0.4.2-next.0",
   "description": "Backend defaults used by Backstage backend apps",
   "backstage": {
     "role": "node-library"
diff --git a/packages/backend-dynamic-feature-service/CHANGELOG.md b/packages/backend-dynamic-feature-service/CHANGELOG.md
index 3003a8e177..ade7a7c0ec 100644
--- a/packages/backend-dynamic-feature-service/CHANGELOG.md
+++ b/packages/backend-dynamic-feature-service/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/backend-dynamic-feature-service
 
+## 0.2.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-app-api@0.8.1-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.7
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.23-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-backend@0.3.10-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
 ## 0.2.15
 
 ### Patch Changes
diff --git a/packages/backend-dynamic-feature-service/package.json b/packages/backend-dynamic-feature-service/package.json
index 0d05b97bd9..cc7a8b390b 100644
--- a/packages/backend-dynamic-feature-service/package.json
+++ b/packages/backend-dynamic-feature-service/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-dynamic-feature-service",
   "description": "Backstage dynamic feature service",
-  "version": "0.2.15",
+  "version": "0.2.16-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-legacy/CHANGELOG.md b/packages/backend-legacy/CHANGELOG.md
index 04538ca02e..5acae66b6a 100644
--- a/packages/backend-legacy/CHANGELOG.md
+++ b/packages/backend-legacy/CHANGELOG.md
@@ -1,5 +1,47 @@
 # example-backend-legacy
 
+## 0.2.101-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.40-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.4.5-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/plugin-devtools-backend@0.3.9-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.33-next.0
+  - example-app@0.2.100-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-app-backend@0.3.72-next.0
+  - @backstage/plugin-auth-backend@0.22.10-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.1.21-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.4.10-next.0
+  - @backstage/plugin-events-backend@0.3.10-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-kubernetes-backend@0.18.4-next.0
+  - @backstage/plugin-permission-backend@0.5.47-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-proxy-backend@0.5.4-next.0
+  - @backstage/plugin-scaffolder-backend@1.23.1-next.0
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.2.24-next.0
+  - @backstage/plugin-search-backend@1.5.15-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.29-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.5.4-next.0
+  - @backstage/plugin-search-backend-module-explore@0.1.29-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.28-next.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-signals-backend@0.1.9-next.0
+  - @backstage/plugin-signals-node@0.1.9-next.0
+  - @backstage/plugin-techdocs-backend@1.10.10-next.0
+
 ## 0.2.100
 
 ### Patch Changes
diff --git a/packages/backend-legacy/package.json b/packages/backend-legacy/package.json
index 5861719455..8b07afca38 100644
--- a/packages/backend-legacy/package.json
+++ b/packages/backend-legacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend-legacy",
-  "version": "0.2.100",
+  "version": "0.2.101-next.0",
   "backstage": {
     "role": "backend"
   },
diff --git a/packages/backend-openapi-utils/CHANGELOG.md b/packages/backend-openapi-utils/CHANGELOG.md
index 540a239ad6..1056cc4cc1 100644
--- a/packages/backend-openapi-utils/CHANGELOG.md
+++ b/packages/backend-openapi-utils/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/backend-openapi-utils
 
+## 0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+
 ## 0.1.15
 
 ### Patch Changes
diff --git a/packages/backend-openapi-utils/package.json b/packages/backend-openapi-utils/package.json
index 3059af5ffe..7b7778f9fe 100644
--- a/packages/backend-openapi-utils/package.json
+++ b/packages/backend-openapi-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-openapi-utils",
   "description": "OpenAPI typescript support.",
-  "version": "0.1.15",
+  "version": "0.1.16-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/backend-plugin-api/CHANGELOG.md b/packages/backend-plugin-api/CHANGELOG.md
index 3f47354561..9dd2e2587c 100644
--- a/packages/backend-plugin-api/CHANGELOG.md
+++ b/packages/backend-plugin-api/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/backend-plugin-api
 
+## 0.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-common@0.8.0
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/backend-plugin-api/package.json b/packages/backend-plugin-api/package.json
index 52fbfb5806..4bad9325f1 100644
--- a/packages/backend-plugin-api/package.json
+++ b/packages/backend-plugin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-plugin-api",
-  "version": "0.7.0",
+  "version": "0.7.1-next.0",
   "description": "Core API used by Backstage backend plugins",
   "backstage": {
     "role": "node-library"
diff --git a/packages/backend-tasks/CHANGELOG.md b/packages/backend-tasks/CHANGELOG.md
index fef4fd56a9..929a38084c 100644
--- a/packages/backend-tasks/CHANGELOG.md
+++ b/packages/backend-tasks/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/backend-tasks
 
+## 0.5.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.5.27
 
 ### Patch Changes
diff --git a/packages/backend-tasks/package.json b/packages/backend-tasks/package.json
index 998e1d0650..51e8c4611e 100644
--- a/packages/backend-tasks/package.json
+++ b/packages/backend-tasks/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-tasks",
   "description": "Common distributed task management library for Backstage backends",
-  "version": "0.5.27",
+  "version": "0.5.28-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md
index 9bee6fae55..72672bba7f 100644
--- a/packages/backend-test-utils/CHANGELOG.md
+++ b/packages/backend-test-utils/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/backend-test-utils
 
+## 0.4.5-next.0
+
+### Patch Changes
+
+- 4e79d19: The default services for `startTestBackend` and `ServiceFactoryTester` now includes the Root Health Service.
+- Updated dependencies
+  - @backstage/backend-defaults@0.4.2-next.0
+  - @backstage/backend-app-api@0.8.1-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index 875949c0a0..e562b89c84 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-test-utils",
-  "version": "0.4.4",
+  "version": "0.4.5-next.0",
   "description": "Test helpers library for Backstage backends",
   "backstage": {
     "role": "node-library"
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 854993119c..6110ab5f99 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,42 @@
 # example-backend
 
+## 0.0.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.4.2-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-devtools-backend@0.3.9-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/plugin-app-backend@0.3.72-next.0
+  - @backstage/plugin-auth-backend@0.22.10-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.20-next.0
+  - @backstage/plugin-auth-backend-module-guest-provider@0.1.9-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.2.6-next.0
+  - @backstage/plugin-catalog-backend-module-openapi@0.1.41-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.1.21-next.0
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.4.10-next.0
+  - @backstage/plugin-kubernetes-backend@0.18.4-next.0
+  - @backstage/plugin-notifications-backend@0.3.4-next.0
+  - @backstage/plugin-permission-backend@0.5.47-next.0
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.1.20-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-proxy-backend@0.5.4-next.0
+  - @backstage/plugin-scaffolder-backend@1.23.1-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.4.1-next.0
+  - @backstage/plugin-search-backend@1.5.15-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.29-next.0
+  - @backstage/plugin-search-backend-module-explore@0.1.29-next.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.28-next.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-signals-backend@0.1.9-next.0
+  - @backstage/plugin-techdocs-backend@1.10.10-next.0
+
 ## 0.0.28
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index ae47716326..27c378e339 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.0.28",
+  "version": "0.0.29-next.0",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index c062324abb..cbeb8493eb 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/cli
 
+## 0.27.0-next.0
+
+### Minor Changes
+
+- 32a38e1: **BREAKING**: The lockfile (`yarn.lock`) dependency analysis and mutations have been removed from several commands.
+
+  The `versions:bump` command will no longer attempt to bump and deduplicate dependencies by modifying the lockfile, it will only update `package.json` files.
+
+  The `versions:check` command has been removed, since its only purpose was verification and mutation of the lockfile. We recommend using the `yarn dedupe` command instead, or the `yarn-deduplicate` package if you're using Yarn classic.
+
+  The check that was built into the `package start` command has been removed, it will no longer warn about lockfile mismatches.
+
+  The packages in the Backstage ecosystem handle package duplications much better now than when these CLI features were first introduced, so the need for these features has diminished. By removing them, we drastically reduce the integration between the Backstage CLI and Yarn, making it much easier to add support for other package managers in the future.
+
+### Patch Changes
+
+- 7eb08a6: Add frontend-dynamic-container role to eslint config factory
+- fbc7819: Use ES2022 in CLI bundler
+- e53074f: Updated default backend plugin to use `RootConfigService` instead of `Config`. This also removes the dependency on `@backstage/config` as it's no longer used.
+- ee2b0e5: The experimental module federation build now has the ability to force the use of development versions of `react` and `react-dom` by setting the `FORCE_REACT_DEVELOPMENT` flag.
+- 239dffc: Remove usage of deprecated functionality from @backstage/config-loader
+- 0eedec3: Add support for dynamic plugins via the EXPERIMENTAL_MODULE_FEDERATION environment variable when running `yarn start`.
+- dc4fb4f: Fix for `repo build --all` not properly detecting the experimental public entry point.
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.7
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/eslint-plugin@0.1.8
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
 ## 0.26.11
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ccc4818331..0c999b8b9c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli",
-  "version": "0.26.11",
+  "version": "0.27.0-next.0",
   "description": "CLI for developing Backstage plugins and apps",
   "backstage": {
     "role": "cli"
diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md
index fb048e7237..f19fa29e29 100644
--- a/packages/config-loader/CHANGELOG.md
+++ b/packages/config-loader/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/config-loader
 
+## 1.8.2-next.0
+
+### Patch Changes
+
+- 493feac: Add boolean `allowMissingDefaultConfig` option to `ConfigSources.default` and
+  `ConfigSources.defaultForTargets`, which results in omission of a ConfigSource
+  for the default app-config.yaml configuration file if it's not present.
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 1.8.1
 
 ### Patch Changes
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index 28718b8290..16ff3e4f0b 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/config-loader",
-  "version": "1.8.1",
+  "version": "1.8.2-next.0",
   "description": "Config loading functionality used by Backstage backend, and CLI",
   "backstage": {
     "role": "node-library"
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index ff09befd63..26b9eb20fe 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/core-app-api
 
+## 1.14.1-next.0
+
+### Patch Changes
+
+- 9a46a81: The request to delete the session cookie when running the app in protected mode is now done with a plain `fetch` rather than `FetchApi`. This fixes a bug where the app would immediately try to sign-in again when removing the cookie during logout.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+
 ## 1.14.0
 
 ### Minor Changes
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 5f297b16d5..0f78b11f98 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-app-api",
   "description": "Core app API used by Backstage apps",
-  "version": "1.14.0",
+  "version": "1.14.1-next.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/core-compat-api/CHANGELOG.md b/packages/core-compat-api/CHANGELOG.md
index 829c6f41ff..43acba43f0 100644
--- a/packages/core-compat-api/CHANGELOG.md
+++ b/packages/core-compat-api/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/core-compat-api
 
+## 0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/version-bridge@1.0.8
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json
index bbf131c761..dd954f3318 100644
--- a/packages/core-compat-api/package.json
+++ b/packages/core-compat-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/core-compat-api",
-  "version": "0.2.7",
+  "version": "0.2.8-next.0",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index 3d46390597..a2463f594e 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/core-components
 
+## 0.14.10-next.0
+
+### Patch Changes
+
+- 678971a: Move the `Link` component to the `RoutedTabs` instead of the `HeaderTabs` component
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.5.6
+  - @backstage/version-bridge@1.0.8
+
 ## 0.14.9
 
 ### Patch Changes
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index 55faac9dba..a2688a0037 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-components",
   "description": "Core components used by Backstage plugins and apps",
-  "version": "0.14.9",
+  "version": "0.14.10-next.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index d7ad8037e6..dea7ecb237 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/create-app
 
+## 0.5.18-next.0
+
+### Patch Changes
+
+- c0a705d: Added the Kubernetes plugin to `create-app`
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+
 ## 0.5.17
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 7d33d03a4b..b566cb53b1 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "A CLI that helps you create your own Backstage app",
-  "version": "0.5.17",
+  "version": "0.5.18-next.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index f46a65827a..e6d6bf3ae4 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/dev-utils
 
+## 1.0.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+
 ## 1.0.35
 
 ### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 0902d7c322..72d35cd29c 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/dev-utils",
-  "version": "1.0.35",
+  "version": "1.0.36-next.0",
   "description": "Utilities for developing Backstage plugins.",
   "backstage": {
     "role": "web-library"
diff --git a/packages/e2e-test/CHANGELOG.md b/packages/e2e-test/CHANGELOG.md
index ad76bf8b75..3e346fdac8 100644
--- a/packages/e2e-test/CHANGELOG.md
+++ b/packages/e2e-test/CHANGELOG.md
@@ -1,5 +1,14 @@
 # e2e-test
 
+## 0.2.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.18-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/errors@1.2.4
+
 ## 0.2.18
 
 ### Patch Changes
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index 7fa0349a46..47fbd2ef1e 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -1,7 +1,7 @@
 {
   "name": "e2e-test",
   "description": "E2E test for verifying Backstage packages",
-  "version": "0.2.18",
+  "version": "0.2.19-next.0",
   "private": true,
   "backstage": {
     "role": "cli"
diff --git a/packages/frontend-app-api/CHANGELOG.md b/packages/frontend-app-api/CHANGELOG.md
index 7203efb8d8..0c7526d65e 100644
--- a/packages/frontend-app-api/CHANGELOG.md
+++ b/packages/frontend-app-api/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/frontend-app-api
 
+## 0.7.4-next.0
+
+### Patch Changes
+
+- 7777b5f: Support icon overriding with the new `IconBundleBlueprint` API.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+
 ## 0.7.3
 
 ### Patch Changes
diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json
index a55284ff68..83127290f4 100644
--- a/packages/frontend-app-api/package.json
+++ b/packages/frontend-app-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-app-api",
-  "version": "0.7.3",
+  "version": "0.7.4-next.0",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/frontend-plugin-api/CHANGELOG.md b/packages/frontend-plugin-api/CHANGELOG.md
index 4c0e6fe9f8..607883d5e0 100644
--- a/packages/frontend-plugin-api/CHANGELOG.md
+++ b/packages/frontend-plugin-api/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/frontend-plugin-api
 
+## 0.6.8-next.0
+
+### Patch Changes
+
+- 4e53ad6: Introduce a new way to encapsulate extension kinds that replaces the extension creator pattern with `createExtensionBlueprint`
+
+  This allows the creation of extension instances with the following pattern:
+
+  ```tsx
+  // create the extension blueprint which is used to create instances
+  const EntityCardBlueprint = createExtensionBlueprint({
+    kind: 'entity-card',
+    attachTo: { id: 'test', input: 'default' },
+    output: {
+      element: coreExtensionData.reactElement,
+    },
+    factory(params: { text: string }) {
+      return {
+        element: <h1>{params.text}</h1>,
+      };
+    },
+  });
+
+  // create an instance of the extension blueprint with params
+  const testExtension = EntityCardBlueprint.make({
+    name: 'foo',
+    params: {
+      text: 'Hello World',
+    },
+  });
+  ```
+
+- 9b89b82: The `ExtensionBoundary` now by default infers whether it's routable from whether it outputs a route path.
+- 7777b5f: Added a new `IconBundleBlueprint` that lets you create icon bundle extensions that can be installed in an App in order to override or add new app icons.
+
+  ```tsx
+  import { IconBundleBlueprint } from '@backstage/frontend-plugin-api';
+
+  const exampleIconBundle = IconBundleBlueprint.make({
+    name: 'example-bundle',
+    params: {
+      icons: {
+        user: MyOwnUserIcon,
+      },
+    },
+  });
+  ```
+
+- 31bfc44: Extension data references can now be defined in a way that encapsulates the ID string in the type, in addition to the data type itself. The old way of creating extension data references is deprecated and will be removed in a future release.
+
+  For example, the following code:
+
+  ```ts
+  export const myExtension =
+    createExtensionDataRef<MyType>('my-plugin.my-data');
+  ```
+
+  Should be updated to the following:
+
+  ```ts
+  export const myExtension = createExtensionDataRef<MyType>().with({
+    id: 'my-plugin.my-data',
+  });
+  ```
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+
 ## 0.6.7
 
 ### Patch Changes
diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json
index f02f3fdedf..0206fece7e 100644
--- a/packages/frontend-plugin-api/package.json
+++ b/packages/frontend-plugin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-plugin-api",
-  "version": "0.6.7",
+  "version": "0.6.8-next.0",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/frontend-test-utils/CHANGELOG.md b/packages/frontend-test-utils/CHANGELOG.md
index de21194f4e..89deed057e 100644
--- a/packages/frontend-test-utils/CHANGELOG.md
+++ b/packages/frontend-test-utils/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/frontend-test-utils
 
+## 0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/frontend-app-api@0.7.4-next.0
+  - @backstage/test-utils@1.5.9-next.0
+  - @backstage/types@1.1.1
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json
index 0816a25443..1d0b00132b 100644
--- a/packages/frontend-test-utils/package.json
+++ b/packages/frontend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-test-utils",
-  "version": "0.1.10",
+  "version": "0.1.11-next.0",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index ed54a92f5c..36ecf6f718 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/integration-react
 
+## 1.1.30-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+
 ## 1.1.29
 
 ### Patch Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index b04b603327..de42eb2798 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration-react",
-  "version": "1.1.29",
+  "version": "1.1.30-next.0",
   "description": "Frontend package for managing integrations towards external systems",
   "backstage": {
     "role": "web-library"
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index 3fb630ccfc..b49c3410ec 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/integration
 
+## 1.14.0-next.0
+
+### Minor Changes
+
+- 78c1329: Updated `GitlabUrlReader.readUrl` and `GitlabUrlReader.readTree` to accept a user-provided token, supporting both bearer and private tokens.
+
+### Patch Changes
+
+- c591670: Updated functions for `getHarnessEditContentsUrl`, `getHarnessFileContentsUrl`, `getHarnessArchiveUrl`, `getHarnessLatestCommitUrl` and `parseHarnessUrl` to handle account and org level urls
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 1.13.0
 
 ### Minor Changes
diff --git a/packages/integration/package.json b/packages/integration/package.json
index 810150cf2d..0d1b733bbf 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration",
-  "version": "1.13.0",
+  "version": "1.14.0-next.0",
   "description": "Helpers for managing integrations towards external systems",
   "backstage": {
     "role": "common-library"
diff --git a/packages/repo-tools/CHANGELOG.md b/packages/repo-tools/CHANGELOG.md
index 18c696a51c..7f90cb37e9 100644
--- a/packages/repo-tools/CHANGELOG.md
+++ b/packages/repo-tools/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/repo-tools
 
+## 0.9.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/cli-node@0.2.7
+  - @backstage/errors@1.2.4
+
 ## 0.9.4
 
 ### Patch Changes
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index 9f3a177b4f..f314dcc580 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/repo-tools",
   "description": "CLI for Backstage repo tooling ",
-  "version": "0.9.4",
+  "version": "0.9.5-next.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/techdocs-cli-embedded-app/CHANGELOG.md b/packages/techdocs-cli-embedded-app/CHANGELOG.md
index 6c8cc3f4ac..727cd20533 100644
--- a/packages/techdocs-cli-embedded-app/CHANGELOG.md
+++ b/packages/techdocs-cli-embedded-app/CHANGELOG.md
@@ -1,5 +1,24 @@
 # techdocs-cli-embedded-app
 
+## 0.2.99-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.27.0-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/app-defaults@1.5.9-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/test-utils@1.5.9-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+
 ## 0.2.98
 
 ### Patch Changes
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index 6c395636b1..13aa5a1855 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "techdocs-cli-embedded-app",
-  "version": "0.2.98",
+  "version": "0.2.99-next.0",
   "private": true,
   "backstage": {
     "role": "frontend"
diff --git a/packages/techdocs-cli/CHANGELOG.md b/packages/techdocs-cli/CHANGELOG.md
index 34f612932c..74fe37f0b1 100644
--- a/packages/techdocs-cli/CHANGELOG.md
+++ b/packages/techdocs-cli/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @techdocs/cli
 
+## 1.8.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.4.2-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/plugin-techdocs-node@1.12.9-next.0
+
 ## 1.8.16
 
 ### Patch Changes
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index a44213abb7..98eea44657 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@techdocs/cli",
   "description": "Utility CLI for managing TechDocs sites in Backstage.",
-  "version": "1.8.16",
+  "version": "1.8.17-next.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index 3f40af6299..951efa799d 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/test-utils
 
+## 1.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-react@0.4.24
+
 ## 1.5.8
 
 ### Patch Changes
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 9d36217b46..dac4827938 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/test-utils",
-  "version": "1.5.8",
+  "version": "1.5.9-next.0",
   "description": "Utilities to test Backstage plugins and apps.",
   "backstage": {
     "role": "web-library"
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index b6d585c0f0..80b23769a0 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-api-docs
 
+## 0.11.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-react@0.4.24
+
 ## 0.11.7
 
 ### Patch Changes
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 7cda749423..c448b1dd9b 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-api-docs",
-  "version": "0.11.7",
+  "version": "0.11.8-next.0",
   "description": "A Backstage plugin that helps represent API entities in the frontend",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
index 63265e33d9..bb73548da8 100644
--- a/plugins/app-backend/CHANGELOG.md
+++ b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-app-backend
 
+## 0.3.72-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.23-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.3.71
 
 ### Patch Changes
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index e6661f9d73..fcd9cd34b9 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-backend",
-  "version": "0.3.71",
+  "version": "0.3.72-next.0",
   "description": "A Backstage backend plugin that serves the Backstage frontend app",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/app-node/CHANGELOG.md b/plugins/app-node/CHANGELOG.md
index 4dce17870a..af94c02d84 100644
--- a/plugins/app-node/CHANGELOG.md
+++ b/plugins/app-node/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-app-node
 
+## 0.1.23-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+
 ## 0.1.22
 
 ### Patch Changes
diff --git a/plugins/app-node/package.json b/plugins/app-node/package.json
index a846190f31..c8e4074899 100644
--- a/plugins/app-node/package.json
+++ b/plugins/app-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-node",
-  "version": "0.1.22",
+  "version": "0.1.23-next.0",
   "description": "Node.js library for the app plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/app-visualizer/CHANGELOG.md b/plugins/app-visualizer/CHANGELOG.md
index ec24e1cc8b..4db02d9234 100644
--- a/plugins/app-visualizer/CHANGELOG.md
+++ b/plugins/app-visualizer/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-app-visualizer
 
+## 0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json
index 6b10ffc220..a156ceef2e 100644
--- a/plugins/app-visualizer/package.json
+++ b/plugins/app-visualizer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-visualizer",
-  "version": "0.1.8",
+  "version": "0.1.9-next.0",
   "description": "Visualizes the Backstage app structure",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md b/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
index 55287ebd46..a683d8199b 100644
--- a/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-atlassian-provider
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-atlassian-provider/package.json b/plugins/auth-backend-module-atlassian-provider/package.json
index 309dff7f50..dc638ba86f 100644
--- a/plugins/auth-backend-module-atlassian-provider/package.json
+++ b/plugins/auth-backend-module-atlassian-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-atlassian-provider",
-  "version": "0.2.3",
+  "version": "0.2.4-next.0",
   "description": "The atlassian-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md b/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
index cc2db5e210..45e5d75611 100644
--- a/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-auth-backend-module-aws-alb-provider
 
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-backend@0.22.10-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-aws-alb-provider/package.json b/plugins/auth-backend-module-aws-alb-provider/package.json
index 9d15f0ea09..25e43952e4 100644
--- a/plugins/auth-backend-module-aws-alb-provider/package.json
+++ b/plugins/auth-backend-module-aws-alb-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-aws-alb-provider",
-  "version": "0.1.14",
+  "version": "0.1.15-next.0",
   "description": "The aws-alb provider module for the Backstage auth backend.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md b/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
index 26eb0d17b4..88898de862 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-backend-module-azure-easyauth-provider
 
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/package.json b/plugins/auth-backend-module-azure-easyauth-provider/package.json
index 52293f2480..5a94dd320a 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/package.json
+++ b/plugins/auth-backend-module-azure-easyauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-azure-easyauth-provider",
-  "version": "0.1.5",
+  "version": "0.1.6-next.0",
   "description": "The azure-easyauth-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md b/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
index 86ec768727..60a7ecc458 100644
--- a/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-bitbucket-provider
 
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-bitbucket-provider/package.json b/plugins/auth-backend-module-bitbucket-provider/package.json
index 8ddb0f8acd..159069ad4f 100644
--- a/plugins/auth-backend-module-bitbucket-provider/package.json
+++ b/plugins/auth-backend-module-bitbucket-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-bitbucket-provider",
-  "version": "0.1.5",
+  "version": "0.1.6-next.0",
   "description": "The bitbucket-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md b/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
index 2910ffccce..8000a1da90 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-backend-module-cloudflare-access-provider
 
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/package.json b/plugins/auth-backend-module-cloudflare-access-provider/package.json
index 30c60ed6a4..bed6fc8094 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/package.json
+++ b/plugins/auth-backend-module-cloudflare-access-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-cloudflare-access-provider",
-  "version": "0.1.5",
+  "version": "0.1.6-next.0",
   "description": "The cloudflare-access-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
index 19549dc23a..0e3949cfdc 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-backend-module-gcp-iap-provider
 
+## 0.2.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.2.17
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-gcp-iap-provider/package.json b/plugins/auth-backend-module-gcp-iap-provider/package.json
index d0059e7a69..b106675e14 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/package.json
+++ b/plugins/auth-backend-module-gcp-iap-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-gcp-iap-provider",
-  "version": "0.2.17",
+  "version": "0.2.18-next.0",
   "description": "A GCP IAP auth provider module for the Backstage auth backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-github-provider/CHANGELOG.md b/plugins/auth-backend-module-github-provider/CHANGELOG.md
index 5d9704a86b..8f2d91ce6f 100644
--- a/plugins/auth-backend-module-github-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-github-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-github-provider
 
+## 0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.19
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-github-provider/package.json b/plugins/auth-backend-module-github-provider/package.json
index 42ef2ccd4e..a986d04852 100644
--- a/plugins/auth-backend-module-github-provider/package.json
+++ b/plugins/auth-backend-module-github-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-github-provider",
-  "version": "0.1.19",
+  "version": "0.1.20-next.0",
   "description": "The github-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
index 57a6aa189b..15265dcca3 100644
--- a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-gitlab-provider
 
+## 0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.19
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-gitlab-provider/package.json b/plugins/auth-backend-module-gitlab-provider/package.json
index b0e0d2e647..be77920597 100644
--- a/plugins/auth-backend-module-gitlab-provider/package.json
+++ b/plugins/auth-backend-module-gitlab-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-gitlab-provider",
-  "version": "0.1.19",
+  "version": "0.1.20-next.0",
   "description": "The gitlab-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-google-provider/CHANGELOG.md b/plugins/auth-backend-module-google-provider/CHANGELOG.md
index 17efe0d1a5..eaeed7dbca 100644
--- a/plugins/auth-backend-module-google-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-google-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-google-provider
 
+## 0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.19
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-google-provider/package.json b/plugins/auth-backend-module-google-provider/package.json
index 1153cbb37a..524d1f3d90 100644
--- a/plugins/auth-backend-module-google-provider/package.json
+++ b/plugins/auth-backend-module-google-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-google-provider",
-  "version": "0.1.19",
+  "version": "0.1.20-next.0",
   "description": "A Google auth provider module for the Backstage auth backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-guest-provider/CHANGELOG.md b/plugins/auth-backend-module-guest-provider/CHANGELOG.md
index 7c9e48041d..7382ea2c19 100644
--- a/plugins/auth-backend-module-guest-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-guest-provider/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-auth-backend-module-guest-provider
 
+## 0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-guest-provider/package.json b/plugins/auth-backend-module-guest-provider/package.json
index 1648ebea6a..db19f2e37b 100644
--- a/plugins/auth-backend-module-guest-provider/package.json
+++ b/plugins/auth-backend-module-guest-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-guest-provider",
-  "version": "0.1.8",
+  "version": "0.1.9-next.0",
   "description": "The guest-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md b/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
index c4df7007f3..b2d8d704d5 100644
--- a/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-microsoft-provider
 
+## 0.1.18-next.0
+
+### Patch Changes
+
+- 39f36a9: Updated the Microsoft authenticator to accurately define required scopes, but to also omit the required and additional scopes when requesting resource scopes.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.17
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-microsoft-provider/package.json b/plugins/auth-backend-module-microsoft-provider/package.json
index b67fb8c447..bb2f82dc68 100644
--- a/plugins/auth-backend-module-microsoft-provider/package.json
+++ b/plugins/auth-backend-module-microsoft-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-microsoft-provider",
-  "version": "0.1.17",
+  "version": "0.1.18-next.0",
   "description": "The microsoft-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md b/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
index edfcfa0bcb..4090d62d57 100644
--- a/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-oauth2-provider
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oauth2-provider/package.json b/plugins/auth-backend-module-oauth2-provider/package.json
index c98a36d104..962362ce87 100644
--- a/plugins/auth-backend-module-oauth2-provider/package.json
+++ b/plugins/auth-backend-module-oauth2-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oauth2-provider",
-  "version": "0.2.3",
+  "version": "0.2.4-next.0",
   "description": "The oauth2-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md b/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
index 554468bcfe..33fd2b18d4 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-oauth2-proxy-provider
 
+## 0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.15
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/package.json b/plugins/auth-backend-module-oauth2-proxy-provider/package.json
index 16b4126781..e07da7f6d4 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/package.json
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oauth2-proxy-provider",
-  "version": "0.1.15",
+  "version": "0.1.16-next.0",
   "description": "The oauth2-proxy-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oidc-provider/CHANGELOG.md b/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
index 5e0d6aeb5c..b8702dd3e4 100644
--- a/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-backend-module-oidc-provider
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-backend@0.22.10-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oidc-provider/package.json b/plugins/auth-backend-module-oidc-provider/package.json
index d825bd2986..89ef91181c 100644
--- a/plugins/auth-backend-module-oidc-provider/package.json
+++ b/plugins/auth-backend-module-oidc-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oidc-provider",
-  "version": "0.2.3",
+  "version": "0.2.4-next.0",
   "description": "The oidc-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-okta-provider/CHANGELOG.md b/plugins/auth-backend-module-okta-provider/CHANGELOG.md
index 029892a34a..3f3ecdbffa 100644
--- a/plugins/auth-backend-module-okta-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-okta-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-okta-provider
 
+## 0.0.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.0.15
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-okta-provider/package.json b/plugins/auth-backend-module-okta-provider/package.json
index 4070ffd31f..18cb4ce208 100644
--- a/plugins/auth-backend-module-okta-provider/package.json
+++ b/plugins/auth-backend-module-okta-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-okta-provider",
-  "version": "0.0.15",
+  "version": "0.0.16-next.0",
   "description": "The okta-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md b/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
index 896f6b7e0c..cbaa2f2ad6 100644
--- a/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-onelogin-provider
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-onelogin-provider/package.json b/plugins/auth-backend-module-onelogin-provider/package.json
index 045dce0392..750fe96aab 100644
--- a/plugins/auth-backend-module-onelogin-provider/package.json
+++ b/plugins/auth-backend-module-onelogin-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-onelogin-provider",
-  "version": "0.1.3",
+  "version": "0.1.4-next.0",
   "description": "The onelogin-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md b/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
index c3ea4665e8..f0c914c43a 100644
--- a/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-pinniped-provider
 
+## 0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.1.16
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-pinniped-provider/package.json b/plugins/auth-backend-module-pinniped-provider/package.json
index e6f50e4008..73496380af 100644
--- a/plugins/auth-backend-module-pinniped-provider/package.json
+++ b/plugins/auth-backend-module-pinniped-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-pinniped-provider",
-  "version": "0.1.16",
+  "version": "0.1.17-next.0",
   "description": "The pinniped-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md b/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
index f652d6135c..aa61e780c5 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-vmware-cloud-provider
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/package.json b/plugins/auth-backend-module-vmware-cloud-provider/package.json
index 77dafe38e1..f75891634b 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/package.json
+++ b/plugins/auth-backend-module-vmware-cloud-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-vmware-cloud-provider",
-  "version": "0.2.3",
+  "version": "0.2.4-next.0",
   "description": "The vmware-cloud-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index 393820ec27..2b74787a53 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-auth-backend
 
+## 0.22.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.1.18-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.2.4-next.0
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.1.15-next.0
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.1.6-next.0
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.1.6-next.0
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.1.6-next.0
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.2.18-next.0
+  - @backstage/plugin-auth-backend-module-github-provider@0.1.20-next.0
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.1.20-next.0
+  - @backstage/plugin-auth-backend-module-google-provider@0.1.20-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.2.4-next.0
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.1.16-next.0
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.2.4-next.0
+  - @backstage/plugin-auth-backend-module-okta-provider@0.0.16-next.0
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.1.4-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 0.22.9
 
 ### Patch Changes
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index c9d437ceba..57591313f4 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.22.9",
+  "version": "0.22.10-next.0",
   "description": "A Backstage backend plugin that handles authentication",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/auth-node/CHANGELOG.md b/plugins/auth-node/CHANGELOG.md
index 298f0e4472..021d89b518 100644
--- a/plugins/auth-node/CHANGELOG.md
+++ b/plugins/auth-node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-auth-node
 
+## 0.4.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.4.17
 
 ### Patch Changes
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index 0f4b0f5a77..114491c06e 100644
--- a/plugins/auth-node/package.json
+++ b/plugins/auth-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-node",
-  "version": "0.4.17",
+  "version": "0.4.18-next.0",
   "backstage": {
     "role": "node-library",
     "pluginId": "auth",
diff --git a/plugins/auth-react/CHANGELOG.md b/plugins/auth-react/CHANGELOG.md
index 4651cf7eae..f7d621164c 100644
--- a/plugins/auth-react/CHANGELOG.md
+++ b/plugins/auth-react/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-react
 
+## 0.1.5-next.0
+
+### Patch Changes
+
+- aeac3e9: feat: Hide visibility of CookieAuthRedirect
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json
index 44a4ce9fd0..b68e581c74 100644
--- a/plugins/auth-react/package.json
+++ b/plugins/auth-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-react",
-  "version": "0.1.4",
+  "version": "0.1.5-next.0",
   "description": "Web library for the auth plugin",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/bitbucket-cloud-common/CHANGELOG.md b/plugins/bitbucket-cloud-common/CHANGELOG.md
index 7b2b8a936b..c4ce7148f4 100644
--- a/plugins/bitbucket-cloud-common/CHANGELOG.md
+++ b/plugins/bitbucket-cloud-common/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-bitbucket-cloud-common
 
+## 0.2.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+
 ## 0.2.21
 
 ### Patch Changes
diff --git a/plugins/bitbucket-cloud-common/package.json b/plugins/bitbucket-cloud-common/package.json
index d52122f995..06fd4e6f3a 100644
--- a/plugins/bitbucket-cloud-common/package.json
+++ b/plugins/bitbucket-cloud-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bitbucket-cloud-common",
-  "version": "0.2.21",
+  "version": "0.2.22-next.0",
   "description": "Common functionalities for bitbucket-cloud plugins",
   "backstage": {
     "role": "common-library",
diff --git a/plugins/catalog-backend-module-aws/CHANGELOG.md b/plugins/catalog-backend-module-aws/CHANGELOG.md
index f2dd32b7f2..22a372051e 100644
--- a/plugins/catalog-backend-module-aws/CHANGELOG.md
+++ b/plugins/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-catalog-backend-module-aws
 
+## 0.3.18-next.0
+
+### Patch Changes
+
+- ba8571e: Setup user agent header for AWS sdk clients, this enables users to better track API calls made from Backstage to AWS APIs through things like CloudTrail.
+- 90a7340: `AwsOrganizationCloudAccountProcessor` configuration field `roleArn` is deprecated in favor of new field `accountId`
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-kubernetes-common@0.8.1
+
 ## 0.3.17
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index 91ac7c4eae..eeb26b2e1c 100644
--- a/plugins/catalog-backend-module-aws/package.json
+++ b/plugins/catalog-backend-module-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-aws",
-  "version": "0.3.17",
+  "version": "0.3.18-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards AWS",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-azure/CHANGELOG.md b/plugins/catalog-backend-module-azure/CHANGELOG.md
index e96ca2d650..1706dc02bf 100644
--- a/plugins/catalog-backend-module-azure/CHANGELOG.md
+++ b/plugins/catalog-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend-module-azure
 
+## 0.1.43-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+
 ## 0.1.42
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index 05b920bcb0..5fdd95140d 100644
--- a/plugins/catalog-backend-module-azure/package.json
+++ b/plugins/catalog-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-azure",
-  "version": "0.1.42",
+  "version": "0.1.43-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards Azure",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
index 620ab36c40..afdd92803f 100644
--- a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend-module-backstage-openapi
 
+## 0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-openapi-utils@0.1.16-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.5
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-backstage-openapi/package.json b/plugins/catalog-backend-module-backstage-openapi/package.json
index de6c2a8410..6da2d92d5f 100644
--- a/plugins/catalog-backend-module-backstage-openapi/package.json
+++ b/plugins/catalog-backend-module-backstage-openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-backstage-openapi",
-  "version": "0.2.5",
+  "version": "0.2.6-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
index 920d2bc111..2c01eb8857 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-cloud
 
+## 0.2.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.22-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.2.9
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index 9faa941fd6..234bfea5c5 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/package.json
+++ b/plugins/catalog-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-bitbucket-cloud",
-  "version": "0.2.9",
+  "version": "0.2.10-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards Bitbucket Cloud",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
index 857d9a33d9..7f47be269c 100644
--- a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-server
 
+## 0.1.37-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.1.36
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index 793a4213f2..45d8c5cd33 100644
--- a/plugins/catalog-backend-module-bitbucket-server/package.json
+++ b/plugins/catalog-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-bitbucket-server",
-  "version": "0.1.36",
+  "version": "0.1.37-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-gcp/CHANGELOG.md b/plugins/catalog-backend-module-gcp/CHANGELOG.md
index 779039f858..ca2d4412b2 100644
--- a/plugins/catalog-backend-module-gcp/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend-module-gcp
 
+## 0.1.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-kubernetes-common@0.8.1
+
 ## 0.1.23
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gcp/package.json b/plugins/catalog-backend-module-gcp/package.json
index 7ebe7cbefc..442c7540e3 100644
--- a/plugins/catalog-backend-module-gcp/package.json
+++ b/plugins/catalog-backend-module-gcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gcp",
-  "version": "0.1.23",
+  "version": "0.1.24-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards GCP",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gerrit/CHANGELOG.md b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
index 159c9bb550..63dcfa9562 100644
--- a/plugins/catalog-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend-module-gerrit
 
+## 0.1.40-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.1.39
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index 0732db4465..61f2ac8dfd 100644
--- a/plugins/catalog-backend-module-gerrit/package.json
+++ b/plugins/catalog-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gerrit",
-  "version": "0.1.39",
+  "version": "0.1.40-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-github-org/CHANGELOG.md b/plugins/catalog-backend-module-github-org/CHANGELOG.md
index 424465d813..72c80a97cd 100644
--- a/plugins/catalog-backend-module-github-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github-org/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend-module-github-org
 
+## 0.1.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-backend-module-github@0.6.6-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.1.17
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github-org/package.json b/plugins/catalog-backend-module-github-org/package.json
index 3fdcc2fedf..9a363613de 100644
--- a/plugins/catalog-backend-module-github-org/package.json
+++ b/plugins/catalog-backend-module-github-org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github-org",
-  "version": "0.1.17",
+  "version": "0.1.18-next.0",
   "description": "The github-org backend module for the catalog plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-github/CHANGELOG.md b/plugins/catalog-backend-module-github/CHANGELOG.md
index 661712456b..12e2d70eb1 100644
--- a/plugins/catalog-backend-module-github/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-catalog-backend-module-github
 
+## 0.6.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.6.5
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index 50b838be1d..aa1f750aef 100644
--- a/plugins/catalog-backend-module-github/package.json
+++ b/plugins/catalog-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github",
-  "version": "0.6.5",
+  "version": "0.6.6-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards GitHub",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
index b36bcb4d71..8d1c8871ae 100644
--- a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-gitlab-org
 
+## 0.0.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-catalog-backend-module-gitlab@0.3.22-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.0.5
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab-org/package.json b/plugins/catalog-backend-module-gitlab-org/package.json
index 9c4c1f725f..16c492d849 100644
--- a/plugins/catalog-backend-module-gitlab-org/package.json
+++ b/plugins/catalog-backend-module-gitlab-org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gitlab-org",
-  "version": "0.0.5",
+  "version": "0.0.6-next.0",
   "description": "The gitlab-org backend module for the catalog plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gitlab/CHANGELOG.md b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
index 97ed683942..c4e8f25903 100644
--- a/plugins/catalog-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-catalog-backend-module-gitlab
 
+## 0.3.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.3.21
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index fa21798a62..ad5b8e88bd 100644
--- a/plugins/catalog-backend-module-gitlab/package.json
+++ b/plugins/catalog-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gitlab",
-  "version": "0.3.21",
+  "version": "0.3.22-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards GitLab",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
index 0d04145063..c2b3835940 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-catalog-backend-module-incremental-ingestion
 
+## 0.4.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-permission-common@0.8.0
+
 ## 0.4.27
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index 0180f36d03..cabacc7bd6 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/package.json
+++ b/plugins/catalog-backend-module-incremental-ingestion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-incremental-ingestion",
-  "version": "0.4.27",
+  "version": "0.4.28-next.0",
   "description": "An entity provider for streaming large asset sources into the catalog",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index 9168ce0991..1253404d2d 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend-module-ldap
 
+## 0.7.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index 62b3328de7..e5f67d59c6 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-ldap",
-  "version": "0.7.0",
+  "version": "0.7.1-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards LDAP",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-logs/CHANGELOG.md b/plugins/catalog-backend-module-logs/CHANGELOG.md
index 2712f4a134..83053dcf6b 100644
--- a/plugins/catalog-backend-module-logs/CHANGELOG.md
+++ b/plugins/catalog-backend-module-logs/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-catalog-backend-module-logs
 
+## 0.0.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.0.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-logs/package.json b/plugins/catalog-backend-module-logs/package.json
index 560b93737e..0c4a78dfa4 100644
--- a/plugins/catalog-backend-module-logs/package.json
+++ b/plugins/catalog-backend-module-logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-logs",
-  "version": "0.0.1",
+  "version": "0.0.2-next.0",
   "description": "A module that subscribes to catalog releated events and logs them.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-msgraph/CHANGELOG.md b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
index a33bea94b8..d9b8da87d2 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.5.31-next.0
+
+### Patch Changes
+
+- 58dff4d: Added option to ingest groups based on their group membership in Azure Entra ID
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+
 ## 0.5.30
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 3f5fa722a8..087d4c4a82 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-msgraph",
-  "version": "0.5.30",
+  "version": "0.5.31-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards Microsoft Graph",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-openapi/CHANGELOG.md b/plugins/catalog-backend-module-openapi/CHANGELOG.md
index 6cc947ee17..46d8c1319b 100644
--- a/plugins/catalog-backend-module-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-openapi/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-catalog-backend-module-openapi
 
+## 0.1.41-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-backend@1.24.1-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+
 ## 0.1.40
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-openapi/package.json b/plugins/catalog-backend-module-openapi/package.json
index 2dbe6612ac..1cd250d884 100644
--- a/plugins/catalog-backend-module-openapi/package.json
+++ b/plugins/catalog-backend-module-openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-openapi",
-  "version": "0.1.40",
+  "version": "0.1.41-next.0",
   "description": "A Backstage catalog backend module that helps with OpenAPI specifications",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
index cb4cd9664b..d85ad0ecf2 100644
--- a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
+++ b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend-module-puppetdb
 
+## 0.1.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.1.28
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-puppetdb/package.json b/plugins/catalog-backend-module-puppetdb/package.json
index cf2a739380..dadba558a5 100644
--- a/plugins/catalog-backend-module-puppetdb/package.json
+++ b/plugins/catalog-backend-module-puppetdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-puppetdb",
-  "version": "0.1.28",
+  "version": "0.1.29-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards PuppetDB",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
index 87299358b7..1ec7c01c6a 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-scaffolder-entity-model
 
+## 0.1.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-scaffolder-common@1.5.4
+
 ## 0.1.20
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/package.json b/plugins/catalog-backend-module-scaffolder-entity-model/package.json
index 3aaa768f76..09dfa63a91 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/package.json
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-scaffolder-entity-model",
-  "version": "0.1.20",
+  "version": "0.1.21-next.0",
   "description": "Adds support for the scaffolder specific entity model (e.g. the Template kind) to the catalog backend plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
index a7d74143a1..2abd4e32a3 100644
--- a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
+++ b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend-module-unprocessed
 
+## 0.4.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.3
+  - @backstage/plugin-permission-common@0.8.0
+
 ## 0.4.9
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-unprocessed/package.json b/plugins/catalog-backend-module-unprocessed/package.json
index 6f1f4bb6bc..b01fddef04 100644
--- a/plugins/catalog-backend-module-unprocessed/package.json
+++ b/plugins/catalog-backend-module-unprocessed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-unprocessed",
-  "version": "0.4.9",
+  "version": "0.4.10-next.0",
   "description": "Backstage Catalog module to view unprocessed entities",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index 8f99ab1f4c..796611fa90 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-catalog-backend
 
+## 1.24.1-next.0
+
+### Patch Changes
+
+- a629fb2: Added setAllowedLocationTypes while introducing a new extension point called CatalogLocationsExtensionPoint
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-openapi-utils@0.1.16-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.1.29-next.0
+
 ## 1.24.0
 
 ### Minor Changes
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 19d40bd34c..0c1983d1e2 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.24.0",
+  "version": "1.24.1-next.0",
   "description": "The Backstage backend plugin that provides the Backstage catalog",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md
index 332ea17dd0..5995074b53 100644
--- a/plugins/catalog-graph/CHANGELOG.md
+++ b/plugins/catalog-graph/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-catalog-graph
 
+## 0.4.8-next.0
+
+### Patch Changes
+
+- fba7537: Memoize entity graph nodes when applying an `entityFilter` to prevent repeated redraws
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/types@1.1.1
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 1e7c376436..51ed923a01 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-graph",
-  "version": "0.4.7",
+  "version": "0.4.8-next.0",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "catalog-graph",
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index 29ec3631b4..484676f245 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-catalog-import
 
+## 0.12.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/plugin-catalog-common@1.0.25
+
 ## 0.12.1
 
 ### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index c3babc09a3..dfc07ddb43 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-import",
-  "version": "0.12.1",
+  "version": "0.12.2-next.0",
   "description": "A Backstage plugin the helps you import entities into your catalog",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/catalog-node/CHANGELOG.md b/plugins/catalog-node/CHANGELOG.md
index 74982e481f..3d1dbe07ba 100644
--- a/plugins/catalog-node/CHANGELOG.md
+++ b/plugins/catalog-node/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-catalog-node
 
+## 1.12.5-next.0
+
+### Patch Changes
+
+- a629fb2: Added setAllowedLocationTypes while introducing a new extension point called CatalogLocationsExtensionPoint
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
 ## 1.12.4
 
 ### Patch Changes
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index ccd83cd129..04a942f7b3 100644
--- a/plugins/catalog-node/package.json
+++ b/plugins/catalog-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-node",
-  "version": "1.12.4",
+  "version": "1.12.5-next.0",
   "description": "The plugin-catalog-node module for @backstage/plugin-catalog-backend",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index 38402e8824..982d3db031 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-catalog-react
 
+## 1.12.3-next.0
+
+### Patch Changes
+
+- 31bfc44: Updated alpha definitions of extension data references.
+- 9b89b82: Internal refactor to remove unnecessary `routable` prop in the implementation of the `createEntityContentExtension` alpha export.
+- bebd569: Fix extra divider displayed on user list picker component
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-react@0.4.24
+
 ## 1.12.2
 
 ### Patch Changes
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index c6a725ecb6..dc5a80d4b7 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "1.12.2",
+  "version": "1.12.3-next.0",
   "description": "A frontend library that helps other Backstage plugins interact with the catalog",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/catalog-unprocessed-entities/CHANGELOG.md b/plugins/catalog-unprocessed-entities/CHANGELOG.md
index e3fd1b6b76..2c2eb03f5e 100644
--- a/plugins/catalog-unprocessed-entities/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-catalog-unprocessed-entities
 
+## 0.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json
index 872ce7b11b..8ce8c8b0d3 100644
--- a/plugins/catalog-unprocessed-entities/package.json
+++ b/plugins/catalog-unprocessed-entities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-unprocessed-entities",
-  "version": "0.2.6",
+  "version": "0.2.7-next.0",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "catalog-unprocessed-entities",
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index 2667fdf638..e0b947b965 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-catalog
 
+## 1.21.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-scaffolder-common@1.5.4
+  - @backstage/plugin-search-common@1.2.13
+
 ## 1.21.1
 
 ### Patch Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index fc49a8c36b..64f6b0d201 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "1.21.1",
+  "version": "1.21.2-next.0",
   "description": "The Backstage plugin for browsing the Backstage catalog",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index 2344473925..c11499f589 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-config-schema
 
+## 0.1.58-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.1.57
 
 ### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 6f91094e5f..ad98b78b98 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-config-schema",
-  "version": "0.1.57",
+  "version": "0.1.58-next.0",
   "description": "A Backstage plugin that lets you browse the configuration schema of your app",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/devtools-backend/CHANGELOG.md b/plugins/devtools-backend/CHANGELOG.md
index f027384637..d415b1bf65 100644
--- a/plugins/devtools-backend/CHANGELOG.md
+++ b/plugins/devtools-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-devtools-backend
 
+## 0.3.9-next.0
+
+### Patch Changes
+
+- 32a38e1: Removed unused code for lockfile analysis.
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/config-loader@1.8.2-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.11
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json
index ce5e143f24..1fe3330698 100644
--- a/plugins/devtools-backend/package.json
+++ b/plugins/devtools-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools-backend",
-  "version": "0.3.8",
+  "version": "0.3.9-next.0",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "devtools",
diff --git a/plugins/devtools/CHANGELOG.md b/plugins/devtools/CHANGELOG.md
index 3403b7f2fa..b7db4a95bc 100644
--- a/plugins/devtools/CHANGELOG.md
+++ b/plugins/devtools/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-devtools
 
+## 0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-devtools-common@0.1.11
+  - @backstage/plugin-permission-react@0.4.24
+
 ## 0.1.16
 
 ### Patch Changes
diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json
index 83d2a6b352..2827110d4a 100644
--- a/plugins/devtools/package.json
+++ b/plugins/devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools",
-  "version": "0.1.16",
+  "version": "0.1.17-next.0",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "devtools",
diff --git a/plugins/events-backend-module-aws-sqs/CHANGELOG.md b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
index e27fcefa6e..5e954c38ca 100644
--- a/plugins/events-backend-module-aws-sqs/CHANGELOG.md
+++ b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-events-backend-module-aws-sqs
 
+## 0.3.9-next.0
+
+### Patch Changes
+
+- ba8571e: Setup user agent header for AWS sdk clients, this enables users to better track API calls made from Backstage to AWS APIs through things like CloudTrail.
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index 983e15567b..0135594bd6 100644
--- a/plugins/events-backend-module-aws-sqs/package.json
+++ b/plugins/events-backend-module-aws-sqs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-aws-sqs",
-  "version": "0.3.8",
+  "version": "0.3.9-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-azure/CHANGELOG.md b/plugins/events-backend-module-azure/CHANGELOG.md
index 225ee30beb..27060d63e4 100644
--- a/plugins/events-backend-module-azure/CHANGELOG.md
+++ b/plugins/events-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-azure
 
+## 0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index 49c9b9439f..eacae60bc2 100644
--- a/plugins/events-backend-module-azure/package.json
+++ b/plugins/events-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-azure",
-  "version": "0.2.8",
+  "version": "0.2.9-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
index 4676feabbd..a411dcecaa 100644
--- a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-bitbucket-cloud
 
+## 0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index 6fd443a3b1..084b3cb512 100644
--- a/plugins/events-backend-module-bitbucket-cloud/package.json
+++ b/plugins/events-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-bitbucket-cloud",
-  "version": "0.2.8",
+  "version": "0.2.9-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-gerrit/CHANGELOG.md b/plugins/events-backend-module-gerrit/CHANGELOG.md
index eddce5d6c5..3cc3f4f3bf 100644
--- a/plugins/events-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/events-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-gerrit
 
+## 0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 7d870063df..99a1cba796 100644
--- a/plugins/events-backend-module-gerrit/package.json
+++ b/plugins/events-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-gerrit",
-  "version": "0.2.8",
+  "version": "0.2.9-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-github/CHANGELOG.md b/plugins/events-backend-module-github/CHANGELOG.md
index 4597583ea8..3ba0e5de31 100644
--- a/plugins/events-backend-module-github/CHANGELOG.md
+++ b/plugins/events-backend-module-github/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-events-backend-module-github
 
+## 0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index 955793ee6d..bad39f8080 100644
--- a/plugins/events-backend-module-github/package.json
+++ b/plugins/events-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-github",
-  "version": "0.2.8",
+  "version": "0.2.9-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-gitlab/CHANGELOG.md b/plugins/events-backend-module-gitlab/CHANGELOG.md
index f22f90405e..39fd274342 100644
--- a/plugins/events-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/events-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-events-backend-module-gitlab
 
+## 0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index c97a9e2f02..f2d76a5193 100644
--- a/plugins/events-backend-module-gitlab/package.json
+++ b/plugins/events-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-gitlab",
-  "version": "0.2.8",
+  "version": "0.2.9-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-test-utils/CHANGELOG.md b/plugins/events-backend-test-utils/CHANGELOG.md
index 4fcbcfc172..be1e0f023c 100644
--- a/plugins/events-backend-test-utils/CHANGELOG.md
+++ b/plugins/events-backend-test-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-events-backend-test-utils
 
+## 0.1.33-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.1.32
 
 ### Patch Changes
diff --git a/plugins/events-backend-test-utils/package.json b/plugins/events-backend-test-utils/package.json
index 09a36a7a1f..f6914c81c5 100644
--- a/plugins/events-backend-test-utils/package.json
+++ b/plugins/events-backend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-test-utils",
-  "version": "0.1.32",
+  "version": "0.1.33-next.0",
   "description": "The plugin-events-backend-test-utils for @backstage/plugin-events-node",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/events-backend/CHANGELOG.md b/plugins/events-backend/CHANGELOG.md
index 4840d9a623..6a6a17c13f 100644
--- a/plugins/events-backend/CHANGELOG.md
+++ b/plugins/events-backend/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-events-backend
 
+## 0.3.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.3.9
 
 ### Patch Changes
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index f9f2a4b781..accb240c22 100644
--- a/plugins/events-backend/package.json
+++ b/plugins/events-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend",
-  "version": "0.3.9",
+  "version": "0.3.10-next.0",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "events",
diff --git a/plugins/events-node/CHANGELOG.md b/plugins/events-node/CHANGELOG.md
index d5b1c98372..a3dfd8682d 100644
--- a/plugins/events-node/CHANGELOG.md
+++ b/plugins/events-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-events-node
 
+## 0.3.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index 965f317357..7387294d24 100644
--- a/plugins/events-node/package.json
+++ b/plugins/events-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-node",
-  "version": "0.3.8",
+  "version": "0.3.9-next.0",
   "description": "The plugin-events-node module for @backstage/plugin-events-backend",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/example-todo-list-backend/CHANGELOG.md b/plugins/example-todo-list-backend/CHANGELOG.md
index dd1a2087dc..3d3c9fd1bb 100644
--- a/plugins/example-todo-list-backend/CHANGELOG.md
+++ b/plugins/example-todo-list-backend/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @internal/plugin-todo-list-backend
 
+## 1.0.30-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+
 ## 1.0.29
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-backend/package.json b/plugins/example-todo-list-backend/package.json
index 0ca987d30b..1ea02728de 100644
--- a/plugins/example-todo-list-backend/package.json
+++ b/plugins/example-todo-list-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/plugin-todo-list-backend",
-  "version": "1.0.29",
+  "version": "1.0.30-next.0",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "todo-list",
diff --git a/plugins/example-todo-list/CHANGELOG.md b/plugins/example-todo-list/CHANGELOG.md
index e55f882b0a..51e2b93ef9 100644
--- a/plugins/example-todo-list/CHANGELOG.md
+++ b/plugins/example-todo-list/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @internal/plugin-todo-list
 
+## 1.0.30-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+
 ## 1.0.29
 
 ### Patch Changes
diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json
index c8c0a90312..d950d8c406 100644
--- a/plugins/example-todo-list/package.json
+++ b/plugins/example-todo-list/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/plugin-todo-list",
-  "version": "1.0.29",
+  "version": "1.0.30-next.0",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "todo-list",
diff --git a/plugins/home-react/CHANGELOG.md b/plugins/home-react/CHANGELOG.md
index c4db30307f..d810195e7f 100644
--- a/plugins/home-react/CHANGELOG.md
+++ b/plugins/home-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-home-react
 
+## 0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+
 ## 0.1.15
 
 ### Patch Changes
diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json
index 433a91b475..00b0f29fca 100644
--- a/plugins/home-react/package.json
+++ b/plugins/home-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home-react",
-  "version": "0.1.15",
+  "version": "0.1.16-next.0",
   "description": "A Backstage plugin that contains react components helps you build a home page",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index eb49e3217b..75c786c4de 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-home
 
+## 0.7.8-next.0
+
+### Patch Changes
+
+- 31bfc44: Updated alpha definitions of extension data references.
+- fdcc059: Fixed a bug on the WelcomeTitle component where the welcome message wasn't correct when the language was set to Spanish
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-home-react@0.1.16-next.0
+
 ## 0.7.7
 
 ### Patch Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 189aeec2ac..d2f0c43a11 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home",
-  "version": "0.7.7",
+  "version": "0.7.8-next.0",
   "description": "A Backstage plugin that helps you build a home page",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index 6a41d014f5..d749d8579e 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/plugin-kubernetes-backend
 
+## 0.18.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-kubernetes-common@0.8.1
+  - @backstage/plugin-kubernetes-node@0.1.17-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
 ## 0.18.3
 
 ### Patch Changes
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 0e439ecd91..eb135d4f0f 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
-  "version": "0.18.3",
+  "version": "0.18.4-next.0",
   "description": "A Backstage backend plugin that integrates towards Kubernetes",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/kubernetes-cluster/CHANGELOG.md b/plugins/kubernetes-cluster/CHANGELOG.md
index a4b12a0556..cd5b6772de 100644
--- a/plugins/kubernetes-cluster/CHANGELOG.md
+++ b/plugins/kubernetes-cluster/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-kubernetes-cluster
 
+## 0.0.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/plugin-kubernetes-common@0.8.1
+  - @backstage/plugin-kubernetes-react@0.4.2-next.0
+
 ## 0.0.13
 
 ### Patch Changes
diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json
index af63bf4102..5549c8dcc5 100644
--- a/plugins/kubernetes-cluster/package.json
+++ b/plugins/kubernetes-cluster/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-cluster",
-  "version": "0.0.13",
+  "version": "0.0.14-next.0",
   "description": "A Backstage plugin that shows details of Kubernetes clusters",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/kubernetes-node/CHANGELOG.md b/plugins/kubernetes-node/CHANGELOG.md
index 608fe97cd2..58c458da9c 100644
--- a/plugins/kubernetes-node/CHANGELOG.md
+++ b/plugins/kubernetes-node/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-kubernetes-node
 
+## 0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.1
+
 ## 0.1.16
 
 ### Patch Changes
diff --git a/plugins/kubernetes-node/package.json b/plugins/kubernetes-node/package.json
index 798978b5d2..6d1d6d73f8 100644
--- a/plugins/kubernetes-node/package.json
+++ b/plugins/kubernetes-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-node",
-  "version": "0.1.16",
+  "version": "0.1.17-next.0",
   "description": "Node.js library for the kubernetes plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/kubernetes-react/CHANGELOG.md b/plugins/kubernetes-react/CHANGELOG.md
index 0fd0cfd07e..c84b5c01e3 100644
--- a/plugins/kubernetes-react/CHANGELOG.md
+++ b/plugins/kubernetes-react/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-kubernetes-react
 
+## 0.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.1
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json
index 42ef4f7913..2f4ddd7415 100644
--- a/plugins/kubernetes-react/package.json
+++ b/plugins/kubernetes-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-react",
-  "version": "0.4.1",
+  "version": "0.4.2-next.0",
   "description": "Web library for the kubernetes-react plugin",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index fcb80b7b26..26fbfffbdb 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-kubernetes
 
+## 0.11.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/plugin-kubernetes-common@0.8.1
+  - @backstage/plugin-kubernetes-react@0.4.2-next.0
+
 ## 0.11.12
 
 ### Patch Changes
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 1ab92f5b3c..5469ff5724 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes",
-  "version": "0.11.12",
+  "version": "0.11.13-next.0",
   "description": "A Backstage plugin that integrates towards Kubernetes",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/notifications-backend-module-email/CHANGELOG.md b/plugins/notifications-backend-module-email/CHANGELOG.md
index 4bfbfbd05d..f13ba48616 100644
--- a/plugins/notifications-backend-module-email/CHANGELOG.md
+++ b/plugins/notifications-backend-module-email/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-notifications-backend-module-email
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.4-next.0
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/plugins/notifications-backend-module-email/package.json b/plugins/notifications-backend-module-email/package.json
index b7107a4c6b..c024e6ad50 100644
--- a/plugins/notifications-backend-module-email/package.json
+++ b/plugins/notifications-backend-module-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-backend-module-email",
-  "version": "0.1.3",
+  "version": "0.1.4-next.0",
   "description": "The email backend module for the notifications plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/notifications-backend/CHANGELOG.md b/plugins/notifications-backend/CHANGELOG.md
index b4fe307f15..ef654d213c 100644
--- a/plugins/notifications-backend/CHANGELOG.md
+++ b/plugins/notifications-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-notifications-backend
 
+## 0.3.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.4-next.0
+  - @backstage/plugin-signals-node@0.1.9-next.0
+
 ## 0.3.3
 
 ### Patch Changes
diff --git a/plugins/notifications-backend/package.json b/plugins/notifications-backend/package.json
index abd0a1bbfe..b59ae301f2 100644
--- a/plugins/notifications-backend/package.json
+++ b/plugins/notifications-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-backend",
-  "version": "0.3.3",
+  "version": "0.3.4-next.0",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "notifications",
diff --git a/plugins/notifications-node/CHANGELOG.md b/plugins/notifications-node/CHANGELOG.md
index 764ee3affb..4344467104 100644
--- a/plugins/notifications-node/CHANGELOG.md
+++ b/plugins/notifications-node/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-notifications-node
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-signals-node@0.1.9-next.0
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/notifications-node/package.json b/plugins/notifications-node/package.json
index 04564da21e..b71e5d954f 100644
--- a/plugins/notifications-node/package.json
+++ b/plugins/notifications-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-node",
-  "version": "0.2.3",
+  "version": "0.2.4-next.0",
   "description": "Node.js library for the notifications plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/notifications/CHANGELOG.md b/plugins/notifications/CHANGELOG.md
index 263bd9ba70..42c55615b2 100644
--- a/plugins/notifications/CHANGELOG.md
+++ b/plugins/notifications/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-notifications
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-signals-react@0.0.4
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json
index 1575c48c5e..5dbfd83255 100644
--- a/plugins/notifications/package.json
+++ b/plugins/notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications",
-  "version": "0.2.3",
+  "version": "0.2.4-next.0",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "notifications",
diff --git a/plugins/org-react/CHANGELOG.md b/plugins/org-react/CHANGELOG.md
index d6e117d579..9d0c722d80 100644
--- a/plugins/org-react/CHANGELOG.md
+++ b/plugins/org-react/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-org-react
 
+## 0.1.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+
 ## 0.1.26
 
 ### Patch Changes
diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json
index 9405b38b59..65d600b96f 100644
--- a/plugins/org-react/package.json
+++ b/plugins/org-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org-react",
-  "version": "0.1.26",
+  "version": "0.1.27-next.0",
   "backstage": {
     "role": "web-library",
     "pluginId": "org",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 6d1fb352f8..130a62d56d 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-org
 
+## 0.6.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/plugin-catalog-common@1.0.25
+
 ## 0.6.27
 
 ### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 2530ca2ea1..a3ed608aeb 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.6.27",
+  "version": "0.6.28-next.0",
   "description": "A Backstage plugin that helps you create entity pages for your organization",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
index e06db25a91..c2e00cf839 100644
--- a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
+++ b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-permission-backend-module-allow-all-policy
 
+## 0.1.20-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
 ## 0.1.19
 
 ### Patch Changes
diff --git a/plugins/permission-backend-module-policy-allow-all/package.json b/plugins/permission-backend-module-policy-allow-all/package.json
index 27303483f7..85becb2b60 100644
--- a/plugins/permission-backend-module-policy-allow-all/package.json
+++ b/plugins/permission-backend-module-policy-allow-all/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-backend-module-allow-all-policy",
-  "version": "0.1.19",
+  "version": "0.1.20-next.0",
   "description": "Allow all policy backend module for the permission plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/permission-backend/CHANGELOG.md b/plugins/permission-backend/CHANGELOG.md
index e5a826f67a..c5e9b7675f 100644
--- a/plugins/permission-backend/CHANGELOG.md
+++ b/plugins/permission-backend/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-permission-backend
 
+## 0.5.47-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+
 ## 0.5.46
 
 ### Patch Changes
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index 95647ba82b..11ad9538be 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-backend",
-  "version": "0.5.46",
+  "version": "0.5.47-next.0",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "permission",
diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md
index 326dfb99d3..31d2f9145e 100644
--- a/plugins/permission-node/CHANGELOG.md
+++ b/plugins/permission-node/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-permission-node
 
+## 0.8.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-permission-common@0.8.0
+
 ## 0.8.0
 
 ### Minor Changes
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index 4bbf4d5faf..630391f373 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-node",
-  "version": "0.8.0",
+  "version": "0.8.1-next.0",
   "description": "Common permission and authorization utilities for backend plugins",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index 30cacb1d02..d906b17327 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-proxy-backend
 
+## 0.5.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
 ## 0.5.3
 
 ### Patch Changes
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index 2e7bd08550..ec3594f985 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-proxy-backend",
-  "version": "0.5.3",
+  "version": "0.5.4-next.0",
   "description": "A Backstage backend plugin that helps you set up proxy endpoints in the backend",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/scaffolder-backend-module-azure/CHANGELOG.md b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
index e386b5d9b8..bb5b2644ae 100644
--- a/plugins/scaffolder-backend-module-azure/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-scaffolder-backend-module-azure
 
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-azure/package.json b/plugins/scaffolder-backend-module-azure/package.json
index 205beae578..c2b7a39e0c 100644
--- a/plugins/scaffolder-backend-module-azure/package.json
+++ b/plugins/scaffolder-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-azure",
-  "version": "0.1.14",
+  "version": "0.1.15-next.0",
   "description": "The azure module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
index c8c79a302b..04236c2a4b 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket-cloud
 
+## 0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-bitbucket-cloud-common@0.2.22-next.0
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
index 67f275462b..39080241a0 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud",
-  "version": "0.1.12",
+  "version": "0.1.13-next.0",
   "description": "The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
index 5d2a0754cd..93801a3012 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket-server
 
+## 0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/package.json b/plugins/scaffolder-backend-module-bitbucket-server/package.json
index a33bf90040..b995ef57da 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-server",
-  "version": "0.1.12",
+  "version": "0.1.13-next.0",
   "description": "The Bitbucket Server module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
index 414f8b7bd8..b905cc33e1 100644
--- a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket
 
+## 0.2.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.1.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.1.13-next.0
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket/package.json b/plugins/scaffolder-backend-module-bitbucket/package.json
index 95d92c39b8..a853f795af 100644
--- a/plugins/scaffolder-backend-module-bitbucket/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket",
-  "version": "0.2.12",
+  "version": "0.2.13-next.0",
   "description": "The bitbucket module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
index 1613f1881c..29677250a5 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-confluence-to-markdown
 
+## 0.2.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.2.23
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
index 9fe6781eff..39fb5f49b9 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown",
-  "version": "0.2.23",
+  "version": "0.2.24-next.0",
   "description": "The confluence-to-markdown module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
index f2dc2a822d..865478ea2b 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-scaffolder-backend-module-cookiecutter
 
+## 0.2.47-next.0
+
+### Patch Changes
+
+- dae85df: Add examples for `fetch:cookiecutter` scaffolder action & improve related tests
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.2.46
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index b8ab34dbc9..2f21b89244 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-cookiecutter",
-  "version": "0.2.46",
+  "version": "0.2.47-next.0",
   "description": "A module for the scaffolder backend that lets you template projects using cookiecutter",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
index 51dd92b2cf..05843ee288 100644
--- a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-scaffolder-backend-module-gcp
 
+## 0.1.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.1.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend-module-gcp/package.json b/plugins/scaffolder-backend-module-gcp/package.json
index ae64d1de61..f6355e93f4 100644
--- a/plugins/scaffolder-backend-module-gcp/package.json
+++ b/plugins/scaffolder-backend-module-gcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gcp",
-  "version": "0.1.0",
+  "version": "0.1.1-next.0",
   "description": "The GCP Bucket module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
index 7b95a80811..d95047ba64 100644
--- a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-scaffolder-backend-module-gerrit
 
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gerrit/package.json b/plugins/scaffolder-backend-module-gerrit/package.json
index 96c069ea97..4be6e4c56c 100644
--- a/plugins/scaffolder-backend-module-gerrit/package.json
+++ b/plugins/scaffolder-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gerrit",
-  "version": "0.1.14",
+  "version": "0.1.15-next.0",
   "description": "The gerrit module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
index 4c03220562..6bc250f801 100644
--- a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-scaffolder-backend-module-gitea
 
+## 0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitea/package.json b/plugins/scaffolder-backend-module-gitea/package.json
index 69a84f43e7..22b6ab700f 100644
--- a/plugins/scaffolder-backend-module-gitea/package.json
+++ b/plugins/scaffolder-backend-module-gitea/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gitea",
-  "version": "0.1.12",
+  "version": "0.1.13-next.0",
   "description": "The gitea module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-github/CHANGELOG.md b/plugins/scaffolder-backend-module-github/CHANGELOG.md
index 680cb0469d..0399be8de3 100644
--- a/plugins/scaffolder-backend-module-github/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-github/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-github
 
+## 0.4.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend-module-github/package.json b/plugins/scaffolder-backend-module-github/package.json
index 7732c7c11a..a43469d7e5 100644
--- a/plugins/scaffolder-backend-module-github/package.json
+++ b/plugins/scaffolder-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-github",
-  "version": "0.4.0",
+  "version": "0.4.1-next.0",
   "description": "The github module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
index 60e7f1bccf..41df7c2a60 100644
--- a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-scaffolder-backend-module-gitlab
 
+## 0.4.5-next.0
+
+### Patch Changes
+
+- fad1b90: Allow the `createGitlabProjectVariableAction` to use oauth tokens
+- aab708e: Added test cases for gitlab:issue:edit examples
+- ef742dc: Added test cases for gitlab:projectAccessToken:create example
+- 1ba4c2f: Added test cases for gitlab:pipeline:trigger examples
+- a6603e4: Add custom action for merge request: **auto**
+
+  The **Auto** action selects the committed action between _create_ and _update_.
+
+  The **Auto** action fetches files using the **/projects/repository/tree endpoint**.
+  After fetching, it checks if the file exists locally and in the repository. If it does, it chooses **update**; otherwise, it chooses **create**.
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitlab/package.json b/plugins/scaffolder-backend-module-gitlab/package.json
index 8228a3ec0f..e4705e6206 100644
--- a/plugins/scaffolder-backend-module-gitlab/package.json
+++ b/plugins/scaffolder-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gitlab",
-  "version": "0.4.4",
+  "version": "0.4.5-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
index db52ded0c8..f51473dd0c 100644
--- a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-notifications
 
+## 0.0.6-next.0
+
+### Patch Changes
+
+- 6fc03c7: Add examples for notification:send scaffolder action & improve related tests
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.4-next.0
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.0.5
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-notifications/package.json b/plugins/scaffolder-backend-module-notifications/package.json
index 4754cca488..15fe158651 100644
--- a/plugins/scaffolder-backend-module-notifications/package.json
+++ b/plugins/scaffolder-backend-module-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-notifications",
-  "version": "0.0.5",
+  "version": "0.0.6-next.0",
   "description": "The notifications backend module for the scaffolder plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-rails/CHANGELOG.md b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
index cd34152910..f9ce2e1e6b 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-scaffolder-backend-module-rails
 
+## 0.4.40-next.0
+
+### Patch Changes
+
+- 449def7: Add examples for fetch:rails scaffolder action & improve related tests
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.4.39
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index 910fb04636..a2e2a215dd 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-rails",
-  "version": "0.4.39",
+  "version": "0.4.40-next.0",
   "description": "A module for the scaffolder backend that lets you template projects using Rails",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
index 113a63222f..0dd4fb6c5b 100644
--- a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-scaffolder-backend-module-sentry
 
+## 0.1.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.1.30
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-sentry/package.json b/plugins/scaffolder-backend-module-sentry/package.json
index 264736692a..3eb11dc3e9 100644
--- a/plugins/scaffolder-backend-module-sentry/package.json
+++ b/plugins/scaffolder-backend-module-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-sentry",
-  "version": "0.1.30",
+  "version": "0.1.31-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
index 53d2369d85..3c9fe7db6b 100644
--- a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-scaffolder-backend-module-yeoman
 
+## 0.3.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.10-next.0
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index 5c65315e22..29f4d7c1aa 100644
--- a/plugins/scaffolder-backend-module-yeoman/package.json
+++ b/plugins/scaffolder-backend-module-yeoman/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-yeoman",
-  "version": "0.3.6",
+  "version": "0.3.7-next.0",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index 27e4b4465e..8496dbf17b 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.23.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.4.5-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.22-next.0
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.1.21-next.0
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-scaffolder-backend-module-azure@0.1.15-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.2.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.1.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.1.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.1.15-next.0
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.1.13-next.0
+  - @backstage/plugin-scaffolder-backend-module-github@0.4.1-next.0
+  - @backstage/plugin-scaffolder-common@1.5.4
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 1.23.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index c86a048d46..af67447fed 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "1.23.0",
+  "version": "1.23.1-next.0",
   "description": "The Backstage backend plugin that helps you create new things",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/scaffolder-node-test-utils/CHANGELOG.md b/plugins/scaffolder-node-test-utils/CHANGELOG.md
index 7d578a2b14..9eb166062e 100644
--- a/plugins/scaffolder-node-test-utils/CHANGELOG.md
+++ b/plugins/scaffolder-node-test-utils/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-scaffolder-node-test-utils
 
+## 0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-test-utils@0.4.5-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node@0.4.9-next.0
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/plugins/scaffolder-node-test-utils/package.json b/plugins/scaffolder-node-test-utils/package.json
index 827b654b4e..ef31d541f4 100644
--- a/plugins/scaffolder-node-test-utils/package.json
+++ b/plugins/scaffolder-node-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-node-test-utils",
-  "version": "0.1.9",
+  "version": "0.1.10-next.0",
   "backstage": {
     "role": "node-library",
     "pluginId": "scaffolder",
diff --git a/plugins/scaffolder-node/CHANGELOG.md b/plugins/scaffolder-node/CHANGELOG.md
index 59658dcb11..db361e0120 100644
--- a/plugins/scaffolder-node/CHANGELOG.md
+++ b/plugins/scaffolder-node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder-node
 
+## 0.4.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.4
+
 ## 0.4.8
 
 ### Patch Changes
diff --git a/plugins/scaffolder-node/package.json b/plugins/scaffolder-node/package.json
index 07e468620b..2cb7198631 100644
--- a/plugins/scaffolder-node/package.json
+++ b/plugins/scaffolder-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-node",
-  "version": "0.4.8",
+  "version": "0.4.9-next.0",
   "description": "The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/scaffolder-react/CHANGELOG.md b/plugins/scaffolder-react/CHANGELOG.md
index 68f94ac3fd..f23a0e2425 100644
--- a/plugins/scaffolder-react/CHANGELOG.md
+++ b/plugins/scaffolder-react/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-scaffolder-react
 
+## 1.11.0-next.0
+
+### Minor Changes
+
+- 8839381: Add scaffolder option to display object items in separate rows on review page
+
+### Patch Changes
+
+- d0e95a7: Add ability to customise form fields in the UI by exposing `uiSchema` and `formContext` in `FormProps`
+- 4670f06: support `ajv-errors` for scaffolder validation to allow for customizing the error messages
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-scaffolder-common@1.5.4
+
 ## 1.10.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index 9c50900c05..7c16c11c1a 100644
--- a/plugins/scaffolder-react/package.json
+++ b/plugins/scaffolder-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-react",
-  "version": "1.10.0",
+  "version": "1.11.0-next.0",
   "description": "A frontend library that helps other Backstage plugins interact with the Scaffolder",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index 2da2802808..e012f99928 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-scaffolder
 
+## 1.23.1-next.0
+
+### Patch Changes
+
+- bbd9f56: Cleaned up codebase of RepoUrlPicker
+- b8600fe: Fix issue with `RepoUrlPicker` not refreshing the credentials for a different host
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/plugin-scaffolder-react@1.11.0-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-react@0.4.24
+  - @backstage/plugin-scaffolder-common@1.5.4
+
 ## 1.23.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 5cc587fe4d..ed1bb10e7a 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "1.23.0",
+  "version": "1.23.1-next.0",
   "description": "The Backstage plugin that helps you create new things",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/search-backend-module-catalog/CHANGELOG.md b/plugins/search-backend-module-catalog/CHANGELOG.md
index 29304c6cfd..1c6f7205f3 100644
--- a/plugins/search-backend-module-catalog/CHANGELOG.md
+++ b/plugins/search-backend-module-catalog/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-search-backend-module-catalog
 
+## 0.1.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
 ## 0.1.28
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-catalog/package.json b/plugins/search-backend-module-catalog/package.json
index 6ec054f10d..972a8b66d2 100644
--- a/plugins/search-backend-module-catalog/package.json
+++ b/plugins/search-backend-module-catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-catalog",
-  "version": "0.1.28",
+  "version": "0.1.29-next.0",
   "description": "A module for the search backend that exports catalog modules",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index d561b1127a..a78362a926 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-module-elasticsearch
 
+## 1.5.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
 ## 1.5.3
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index d96b4c924d..4107811cfd 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-elasticsearch",
-  "version": "1.5.3",
+  "version": "1.5.4-next.0",
   "description": "A module for the search backend that implements search using ElasticSearch",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-explore/CHANGELOG.md b/plugins/search-backend-module-explore/CHANGELOG.md
index f5b60fa87e..e14dd6c6c0 100644
--- a/plugins/search-backend-module-explore/CHANGELOG.md
+++ b/plugins/search-backend-module-explore/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-module-explore
 
+## 0.1.29-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
 ## 0.1.28
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-explore/package.json b/plugins/search-backend-module-explore/package.json
index 9fd252df66..8d531a6a37 100644
--- a/plugins/search-backend-module-explore/package.json
+++ b/plugins/search-backend-module-explore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-explore",
-  "version": "0.1.28",
+  "version": "0.1.29-next.0",
   "description": "A module for the search backend that exports explore modules",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index c19c797bde..b2fa9b818e 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-module-pg
 
+## 0.5.33-next.0
+
+### Patch Changes
+
+- 7251567: Removing `@backstage/backend-app-api` dependency
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
 ## 0.5.32
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index 1693c14c8a..9679c5ddec 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-pg",
-  "version": "0.5.32",
+  "version": "0.5.33-next.0",
   "description": "A module for the search backend that implements search using PostgreSQL",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md b/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
index 6c86337062..ba1143e663 100644
--- a/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
+++ b/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-module-stack-overflow-collator
 
+## 0.1.16-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
 ## 0.1.15
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-stack-overflow-collator/package.json b/plugins/search-backend-module-stack-overflow-collator/package.json
index 4d06f928a0..0fd6425e45 100644
--- a/plugins/search-backend-module-stack-overflow-collator/package.json
+++ b/plugins/search-backend-module-stack-overflow-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-stack-overflow-collator",
-  "version": "0.1.15",
+  "version": "0.1.16-next.0",
   "description": "A module for the search backend that exports stack overflow modules",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-techdocs/CHANGELOG.md b/plugins/search-backend-module-techdocs/CHANGELOG.md
index 2c41ecda1f..26137e8eef 100644
--- a/plugins/search-backend-module-techdocs/CHANGELOG.md
+++ b/plugins/search-backend-module-techdocs/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-search-backend-module-techdocs
 
+## 0.1.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/plugin-catalog-node@1.12.5-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-techdocs-node@1.12.9-next.0
+
 ## 0.1.27
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-techdocs/package.json b/plugins/search-backend-module-techdocs/package.json
index a04f64756b..52f5d7252b 100644
--- a/plugins/search-backend-module-techdocs/package.json
+++ b/plugins/search-backend-module-techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-techdocs",
-  "version": "0.1.27",
+  "version": "0.1.28-next.0",
   "description": "A module for the search backend that exports techdocs modules",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index f43f3c4009..05d6d3dba2 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-search-backend-node
 
+## 1.2.28-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/backend-tasks@0.5.28-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-search-common@1.2.13
+
 ## 1.2.27
 
 ### Patch Changes
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index a236eff6c0..f00a58b584 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-node",
-  "version": "1.2.27",
+  "version": "1.2.28-next.0",
   "description": "A library for Backstage backend plugins that want to interact with the search backend plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/search-backend/CHANGELOG.md b/plugins/search-backend/CHANGELOG.md
index eb391c6bba..018e049523 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-search-backend
 
+## 1.5.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-defaults@0.4.2-next.0
+  - @backstage/backend-openapi-utils@0.1.16-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-permission-node@0.8.1-next.0
+  - @backstage/plugin-search-backend-node@1.2.28-next.0
+  - @backstage/plugin-search-common@1.2.13
+
 ## 1.5.14
 
 ### Patch Changes
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index a0e7b48f5b..502bfd674e 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend",
-  "version": "1.5.14",
+  "version": "1.5.15-next.0",
   "description": "The Backstage backend plugin that provides your backstage app with search",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/search-react/CHANGELOG.md b/plugins/search-react/CHANGELOG.md
index 04d8bf312a..f90428a139 100644
--- a/plugins/search-react/CHANGELOG.md
+++ b/plugins/search-react/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-search-react
 
+## 1.7.14-next.0
+
+### Patch Changes
+
+- 31bfc44: Updated alpha definitions of extension data references.
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+  - @backstage/plugin-search-common@1.2.13
+
 ## 1.7.13
 
 ### Patch Changes
diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json
index b5c17c369a..4cf1e476e8 100644
--- a/plugins/search-react/package.json
+++ b/plugins/search-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-react",
-  "version": "1.7.13",
+  "version": "1.7.14-next.0",
   "backstage": {
     "role": "web-library",
     "pluginId": "search",
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index bce322e95a..2c85c5bcf0 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search
 
+## 1.4.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.8
+  - @backstage/plugin-search-common@1.2.13
+
 ## 1.4.14
 
 ### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index 56271eca58..d1aa27716a 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search",
-  "version": "1.4.14",
+  "version": "1.4.15-next.0",
   "description": "The Backstage plugin that provides your backstage app with search",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/signals-backend/CHANGELOG.md b/plugins/signals-backend/CHANGELOG.md
index e0525a0e78..844d2cc185 100644
--- a/plugins/signals-backend/CHANGELOG.md
+++ b/plugins/signals-backend/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-signals-backend
 
+## 0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+  - @backstage/plugin-signals-node@0.1.9-next.0
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/signals-backend/package.json b/plugins/signals-backend/package.json
index 1e0ac41fcb..f88e8825cd 100644
--- a/plugins/signals-backend/package.json
+++ b/plugins/signals-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals-backend",
-  "version": "0.1.8",
+  "version": "0.1.9-next.0",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "signals",
diff --git a/plugins/signals-node/CHANGELOG.md b/plugins/signals-node/CHANGELOG.md
index 0353548fe5..769800350a 100644
--- a/plugins/signals-node/CHANGELOG.md
+++ b/plugins/signals-node/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-signals-node
 
+## 0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-events-node@0.3.9-next.0
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/plugins/signals-node/package.json b/plugins/signals-node/package.json
index 1cea62c21b..e4a4000120 100644
--- a/plugins/signals-node/package.json
+++ b/plugins/signals-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals-node",
-  "version": "0.1.8",
+  "version": "0.1.9-next.0",
   "description": "Node.js library for the signals plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/signals/CHANGELOG.md b/plugins/signals/CHANGELOG.md
index a4a7daec35..1f6c9fccf7 100644
--- a/plugins/signals/CHANGELOG.md
+++ b/plugins/signals/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-signals
 
+## 0.0.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.4
+
 ## 0.0.8
 
 ### Patch Changes
diff --git a/plugins/signals/package.json b/plugins/signals/package.json
index 88ca252c1f..54af5cb9f6 100644
--- a/plugins/signals/package.json
+++ b/plugins/signals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals",
-  "version": "0.0.8",
+  "version": "0.0.9-next.0",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "signals",
diff --git a/plugins/techdocs-addons-test-utils/CHANGELOG.md b/plugins/techdocs-addons-test-utils/CHANGELOG.md
index 3135cc5ffd..844ee41d30 100644
--- a/plugins/techdocs-addons-test-utils/CHANGELOG.md
+++ b/plugins/techdocs-addons-test-utils/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-techdocs-addons-test-utils
 
+## 1.0.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/test-utils@1.5.9-next.0
+  - @backstage/plugin-catalog@1.21.2-next.0
+  - @backstage/plugin-techdocs@1.10.8-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+
 ## 1.0.35
 
 ### Patch Changes
diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json
index 57cd4d06a6..6310ad03b8 100644
--- a/plugins/techdocs-addons-test-utils/package.json
+++ b/plugins/techdocs-addons-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-addons-test-utils",
-  "version": "1.0.35",
+  "version": "1.0.36-next.0",
   "backstage": {
     "role": "web-library",
     "pluginId": "techdocs-addons",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index 571b0d68fc..44ab26cb79 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-techdocs-backend
 
+## 1.10.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.0.25
+  - @backstage/plugin-permission-common@0.8.0
+  - @backstage/plugin-search-backend-module-techdocs@0.1.28-next.0
+  - @backstage/plugin-techdocs-node@1.12.9-next.0
+
 ## 1.10.9
 
 ### Patch Changes
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index ce0df2ca78..0bf2381a8c 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "1.10.9",
+  "version": "1.10.10-next.0",
   "description": "The Backstage backend plugin that renders technical documentation for your components",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/techdocs-module-addons-contrib/CHANGELOG.md b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
index 4072d96d9f..8bfa4e9c49 100644
--- a/plugins/techdocs-module-addons-contrib/CHANGELOG.md
+++ b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-techdocs-module-addons-contrib
 
+## 1.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+
 ## 1.1.12
 
 ### Patch Changes
diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
index 3c226f6a50..8254dceaf5 100644
--- a/plugins/techdocs-module-addons-contrib/package.json
+++ b/plugins/techdocs-module-addons-contrib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-module-addons-contrib",
-  "version": "1.1.12",
+  "version": "1.1.13-next.0",
   "description": "Plugin module for contributed TechDocs Addons",
   "backstage": {
     "role": "frontend-plugin-module",
diff --git a/plugins/techdocs-node/CHANGELOG.md b/plugins/techdocs-node/CHANGELOG.md
index d392e3e662..6fb8d7bd8d 100644
--- a/plugins/techdocs-node/CHANGELOG.md
+++ b/plugins/techdocs-node/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-techdocs-node
 
+## 1.12.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.13
+
 ## 1.12.8
 
 ### Patch Changes
diff --git a/plugins/techdocs-node/package.json b/plugins/techdocs-node/package.json
index 572b76e052..615a0b7235 100644
--- a/plugins/techdocs-node/package.json
+++ b/plugins/techdocs-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-node",
-  "version": "1.12.8",
+  "version": "1.12.9-next.0",
   "description": "Common node.js functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/techdocs-react/CHANGELOG.md b/plugins/techdocs-react/CHANGELOG.md
index 5c9bd0004f..20301266cc 100644
--- a/plugins/techdocs-react/CHANGELOG.md
+++ b/plugins/techdocs-react/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-techdocs-react
 
+## 1.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/version-bridge@1.0.8
+
 ## 1.2.6
 
 ### Patch Changes
diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json
index e65079b212..2db27e2c60 100644
--- a/plugins/techdocs-react/package.json
+++ b/plugins/techdocs-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-react",
-  "version": "1.2.6",
+  "version": "1.2.7-next.0",
   "description": "Shared frontend utilities for TechDocs and Addons",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index 08a841f25c..f2e16e331c 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-techdocs
 
+## 1.10.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/plugin-search-react@1.7.14-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/plugin-auth-react@0.1.5-next.0
+  - @backstage/catalog-model@1.5.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/theme@0.5.6
+  - @backstage/plugin-search-common@1.2.13
+  - @backstage/plugin-techdocs-react@1.2.7-next.0
+
 ## 1.10.7
 
 ### Patch Changes
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 3a90078c72..b1717ce92e 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "1.10.7",
+  "version": "1.10.8-next.0",
   "description": "The Backstage plugin that renders technical documentation for your components",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/user-settings-backend/CHANGELOG.md b/plugins/user-settings-backend/CHANGELOG.md
index 6a945081e8..05f426e57f 100644
--- a/plugins/user-settings-backend/CHANGELOG.md
+++ b/plugins/user-settings-backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-user-settings-backend
 
+## 0.2.22-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.23.4-next.0
+  - @backstage/backend-plugin-api@0.7.1-next.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-node@0.4.18-next.0
+  - @backstage/plugin-signals-node@0.1.9-next.0
+  - @backstage/plugin-user-settings-common@0.0.1
+
 ## 0.2.21
 
 ### Patch Changes
diff --git a/plugins/user-settings-backend/package.json b/plugins/user-settings-backend/package.json
index e33bf0bd4b..1c28f1e90c 100644
--- a/plugins/user-settings-backend/package.json
+++ b/plugins/user-settings-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings-backend",
-  "version": "0.2.21",
+  "version": "0.2.22-next.0",
   "description": "The Backstage backend plugin to manage user settings",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index f10a4c0ea3..84598558ee 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-user-settings
 
+## 0.8.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.6.8-next.0
+  - @backstage/plugin-catalog-react@1.12.3-next.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-app-api@1.14.1-next.0
+  - @backstage/core-compat-api@0.2.8-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/theme@0.5.6
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.4
+  - @backstage/plugin-user-settings-common@0.0.1
+
 ## 0.8.9
 
 ### Patch Changes
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 5ae95e0e45..7534c275d1 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings",
-  "version": "0.8.9",
+  "version": "0.8.10-next.0",
   "description": "A Backstage plugin that provides a settings page",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/yarn.lock b/yarn.lock
index 8755e05c25..2b3baa5b33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3839,7 +3839,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-client@workspace:^, @backstage/catalog-client@workspace:packages/catalog-client":
+"@backstage/catalog-client@^1.6.5, @backstage/catalog-client@workspace:^, @backstage/catalog-client@workspace:packages/catalog-client":
   version: 0.0.0-use.local
   resolution: "@backstage/catalog-client@workspace:packages/catalog-client"
   dependencies:
@@ -3852,7 +3852,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-model@^1.4.3, @backstage/catalog-model@^1.4.5, @backstage/catalog-model@workspace:^, @backstage/catalog-model@workspace:packages/catalog-model":
+"@backstage/catalog-model@^1.4.3, @backstage/catalog-model@^1.4.5, @backstage/catalog-model@^1.5.0, @backstage/catalog-model@workspace:^, @backstage/catalog-model@workspace:packages/catalog-model":
   version: 0.0.0-use.local
   resolution: "@backstage/catalog-model@workspace:packages/catalog-model"
   dependencies:
@@ -4105,7 +4105,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/config@^1.1.1, @backstage/config@workspace:^, @backstage/config@workspace:packages/config":
+"@backstage/config@^1.1.1, @backstage/config@^1.2.0, @backstage/config@workspace:^, @backstage/config@workspace:packages/config":
   version: 0.0.0-use.local
   resolution: "@backstage/config@workspace:packages/config"
   dependencies:
@@ -4177,7 +4177,107 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/core-components@^0.14.4, @backstage/core-components@workspace:^, @backstage/core-components@workspace:packages/core-components":
+"@backstage/core-components@npm:^0.13.10":
+  version: 0.13.10
+  resolution: "@backstage/core-components@npm:0.13.10"
+  dependencies:
+    "@backstage/config": ^1.1.1
+    "@backstage/core-plugin-api": ^1.8.2
+    "@backstage/errors": ^1.2.3
+    "@backstage/theme": ^0.5.0
+    "@backstage/version-bridge": ^1.0.7
+    "@date-io/core": ^1.3.13
+    "@material-table/core": ^3.1.0
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.61
+    "@react-hookz/web": ^23.0.0
+    "@types/react": ^16.13.1 || ^17.0.0
+    "@types/react-sparklines": ^1.7.0
+    "@types/react-text-truncate": ^0.14.0
+    ansi-regex: ^6.0.1
+    classnames: ^2.2.6
+    d3-selection: ^3.0.0
+    d3-shape: ^3.0.0
+    d3-zoom: ^3.0.0
+    dagre: ^0.8.5
+    linkify-react: 4.1.3
+    linkifyjs: 4.1.3
+    lodash: ^4.17.21
+    pluralize: ^8.0.0
+    qs: ^6.9.4
+    rc-progress: 3.5.1
+    react-helmet: 6.1.0
+    react-hook-form: ^7.12.2
+    react-idle-timer: 5.6.2
+    react-markdown: ^8.0.0
+    react-sparklines: ^1.7.0
+    react-syntax-highlighter: ^15.4.5
+    react-text-truncate: ^0.19.0
+    react-use: ^17.3.2
+    react-virtualized-auto-sizer: ^1.0.11
+    react-window: ^1.8.6
+    remark-gfm: ^3.0.1
+    zen-observable: ^0.10.0
+    zod: ^3.22.4
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  checksum: ec2a0d0a27bc4d6b9d4da97f0b4df600148529ee51bf2c8e7d3adc45c3950adac662535d3beabc451db346f2c7e3c412ceaa756fc774012b43dff5e2695f2271
+  languageName: node
+  linkType: hard
+
+"@backstage/core-components@npm:^0.14.4, @backstage/core-components@npm:^0.14.9":
+  version: 0.14.9
+  resolution: "@backstage/core-components@npm:0.14.9"
+  dependencies:
+    "@backstage/config": ^1.2.0
+    "@backstage/core-plugin-api": ^1.9.3
+    "@backstage/errors": ^1.2.4
+    "@backstage/theme": ^0.5.6
+    "@backstage/version-bridge": ^1.0.8
+    "@date-io/core": ^1.3.13
+    "@material-table/core": ^3.1.0
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.61
+    "@react-hookz/web": ^24.0.0
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    "@types/react-sparklines": ^1.7.0
+    ansi-regex: ^6.0.1
+    classnames: ^2.2.6
+    d3-selection: ^3.0.0
+    d3-shape: ^3.0.0
+    d3-zoom: ^3.0.0
+    dagre: ^0.8.5
+    linkify-react: 4.1.3
+    linkifyjs: 4.1.3
+    lodash: ^4.17.21
+    pluralize: ^8.0.0
+    qs: ^6.9.4
+    rc-progress: 3.5.1
+    react-helmet: 6.1.0
+    react-hook-form: ^7.12.2
+    react-idle-timer: 5.7.2
+    react-markdown: ^8.0.0
+    react-sparklines: ^1.7.0
+    react-syntax-highlighter: ^15.4.5
+    react-use: ^17.3.2
+    react-virtualized-auto-sizer: ^1.0.11
+    react-window: ^1.8.6
+    remark-gfm: ^3.0.1
+    zen-observable: ^0.10.0
+    zod: ^3.22.4
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  checksum: cf89c9e19dd33270bdc2bb9e7d89487c71b78e6645dcef9a6ac0d1df67b52e4eee61f2873abe093ed921d756a75f97e870c294aa5c2a730598e520b06e38b41f
+  languageName: node
+  linkType: hard
+
+"@backstage/core-components@workspace:^, @backstage/core-components@workspace:packages/core-components":
   version: 0.0.0-use.local
   resolution: "@backstage/core-components@workspace:packages/core-components"
   dependencies:
@@ -4248,58 +4348,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/core-components@npm:^0.13.10":
-  version: 0.13.10
-  resolution: "@backstage/core-components@npm:0.13.10"
-  dependencies:
-    "@backstage/config": ^1.1.1
-    "@backstage/core-plugin-api": ^1.8.2
-    "@backstage/errors": ^1.2.3
-    "@backstage/theme": ^0.5.0
-    "@backstage/version-bridge": ^1.0.7
-    "@date-io/core": ^1.3.13
-    "@material-table/core": ^3.1.0
-    "@material-ui/core": ^4.12.2
-    "@material-ui/icons": ^4.9.1
-    "@material-ui/lab": 4.0.0-alpha.61
-    "@react-hookz/web": ^23.0.0
-    "@types/react": ^16.13.1 || ^17.0.0
-    "@types/react-sparklines": ^1.7.0
-    "@types/react-text-truncate": ^0.14.0
-    ansi-regex: ^6.0.1
-    classnames: ^2.2.6
-    d3-selection: ^3.0.0
-    d3-shape: ^3.0.0
-    d3-zoom: ^3.0.0
-    dagre: ^0.8.5
-    linkify-react: 4.1.3
-    linkifyjs: 4.1.3
-    lodash: ^4.17.21
-    pluralize: ^8.0.0
-    qs: ^6.9.4
-    rc-progress: 3.5.1
-    react-helmet: 6.1.0
-    react-hook-form: ^7.12.2
-    react-idle-timer: 5.6.2
-    react-markdown: ^8.0.0
-    react-sparklines: ^1.7.0
-    react-syntax-highlighter: ^15.4.5
-    react-text-truncate: ^0.19.0
-    react-use: ^17.3.2
-    react-virtualized-auto-sizer: ^1.0.11
-    react-window: ^1.8.6
-    remark-gfm: ^3.0.1
-    zen-observable: ^0.10.0
-    zod: ^3.22.4
-  peerDependencies:
-    react: ^16.13.1 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
-    react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: ec2a0d0a27bc4d6b9d4da97f0b4df600148529ee51bf2c8e7d3adc45c3950adac662535d3beabc451db346f2c7e3c412ceaa756fc774012b43dff5e2695f2271
-  languageName: node
-  linkType: hard
-
-"@backstage/core-plugin-api@^1.8.2, @backstage/core-plugin-api@^1.9.2, @backstage/core-plugin-api@workspace:^, @backstage/core-plugin-api@workspace:packages/core-plugin-api":
+"@backstage/core-plugin-api@^1.8.2, @backstage/core-plugin-api@^1.9.2, @backstage/core-plugin-api@^1.9.3, @backstage/core-plugin-api@workspace:^, @backstage/core-plugin-api@workspace:packages/core-plugin-api":
   version: 0.0.0-use.local
   resolution: "@backstage/core-plugin-api@workspace:packages/core-plugin-api"
   dependencies:
@@ -4446,6 +4495,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/frontend-plugin-api@npm:^0.6.7":
+  version: 0.6.7
+  resolution: "@backstage/frontend-plugin-api@npm:0.6.7"
+  dependencies:
+    "@backstage/core-components": ^0.14.9
+    "@backstage/core-plugin-api": ^1.9.3
+    "@backstage/types": ^1.1.1
+    "@backstage/version-bridge": ^1.0.8
+    "@material-ui/core": ^4.12.4
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    lodash: ^4.17.21
+    zod: ^3.22.4
+    zod-to-json-schema: ^3.21.4
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  checksum: cf7485aedcae02c5855a62adea6fffcfad256d614731ade38d2bebd5f98e91aa5d1020cd9ac25b74d67d2681c010addff4a89d5be1e2deb2e688bf1915134c32
+  languageName: node
+  linkType: hard
+
 "@backstage/frontend-plugin-api@workspace:^, @backstage/frontend-plugin-api@workspace:packages/frontend-plugin-api":
   version: 0.0.0-use.local
   resolution: "@backstage/frontend-plugin-api@workspace:packages/frontend-plugin-api"
@@ -4509,6 +4578,24 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/integration-react@npm:^1.1.29":
+  version: 1.1.29
+  resolution: "@backstage/integration-react@npm:1.1.29"
+  dependencies:
+    "@backstage/config": ^1.2.0
+    "@backstage/core-plugin-api": ^1.9.3
+    "@backstage/integration": ^1.13.0
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@types/react": ^16.13.1 || ^17.0.0
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  checksum: add10ad8c108933354037f9d74ec554174d2af53d74a031e12ed01e98bd51481413b93c694460cf045b3bae818dd18b5efa061fc60c210e145e4629e0cb227b7
+  languageName: node
+  linkType: hard
+
 "@backstage/integration-react@workspace:^, @backstage/integration-react@workspace:packages/integration-react":
   version: 0.0.0-use.local
   resolution: "@backstage/integration-react@workspace:packages/integration-react"
@@ -4533,6 +4620,23 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/integration@npm:^1.13.0":
+  version: 1.13.0
+  resolution: "@backstage/integration@npm:1.13.0"
+  dependencies:
+    "@azure/identity": ^4.0.0
+    "@backstage/config": ^1.2.0
+    "@backstage/errors": ^1.2.4
+    "@octokit/auth-app": ^4.0.0
+    "@octokit/rest": ^19.0.3
+    cross-fetch: ^4.0.0
+    git-url-parse: ^14.0.0
+    lodash: ^4.17.21
+    luxon: ^3.0.0
+  checksum: 2b824261b0d30771e54515f8571c2af0b4c64f5cd3d1f990c234152b19e81d1e4ddbbbfae2a0b74f44abbfb67f52609c7eee9dc9fbb61d5f0076acaa80b3e670
+  languageName: node
+  linkType: hard
+
 "@backstage/integration@workspace:^, @backstage/integration@workspace:packages/integration":
   version: 0.0.0-use.local
   resolution: "@backstage/integration@workspace:packages/integration"
@@ -5616,7 +5720,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-common@^1.0.20, @backstage/plugin-catalog-common@workspace:^, @backstage/plugin-catalog-common@workspace:plugins/catalog-common":
+"@backstage/plugin-catalog-common@^1.0.20, @backstage/plugin-catalog-common@^1.0.25, @backstage/plugin-catalog-common@workspace:^, @backstage/plugin-catalog-common@workspace:plugins/catalog-common":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-common@workspace:plugins/catalog-common"
   dependencies:
@@ -5725,7 +5829,43 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-react@^1.11.3, @backstage/plugin-catalog-react@^1.9.3, @backstage/plugin-catalog-react@workspace:^, @backstage/plugin-catalog-react@workspace:plugins/catalog-react":
+"@backstage/plugin-catalog-react@npm:^1.11.3, @backstage/plugin-catalog-react@npm:^1.9.3":
+  version: 1.12.2
+  resolution: "@backstage/plugin-catalog-react@npm:1.12.2"
+  dependencies:
+    "@backstage/catalog-client": ^1.6.5
+    "@backstage/catalog-model": ^1.5.0
+    "@backstage/core-components": ^0.14.9
+    "@backstage/core-plugin-api": ^1.9.3
+    "@backstage/errors": ^1.2.4
+    "@backstage/frontend-plugin-api": ^0.6.7
+    "@backstage/integration-react": ^1.1.29
+    "@backstage/plugin-catalog-common": ^1.0.25
+    "@backstage/plugin-permission-common": ^0.8.0
+    "@backstage/plugin-permission-react": ^0.4.24
+    "@backstage/types": ^1.1.1
+    "@backstage/version-bridge": ^1.0.8
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.61
+    "@react-hookz/web": ^24.0.0
+    "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
+    classnames: ^2.2.6
+    lodash: ^4.17.21
+    material-ui-popup-state: ^1.9.3
+    qs: ^6.9.4
+    react-use: ^17.2.4
+    yaml: ^2.0.0
+    zen-observable: ^0.10.0
+  peerDependencies:
+    react: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  checksum: 8570e71e56e89cc8ba890ad9cd1f2ce22147635e9a326703291ee8a75d704086c4a31cd11b2b2c3eb54f3e1dc82822b1bc7b9317e8c6d81f6ab9758c2c01ec5a
+  languageName: node
+  linkType: hard
+
+"@backstage/plugin-catalog-react@workspace:^, @backstage/plugin-catalog-react@workspace:plugins/catalog-react":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-react@workspace:plugins/catalog-react"
   dependencies:
@@ -6569,7 +6709,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-permission-common@workspace:^, @backstage/plugin-permission-common@workspace:plugins/permission-common":
+"@backstage/plugin-permission-common@^0.8.0, @backstage/plugin-permission-common@workspace:^, @backstage/plugin-permission-common@workspace:plugins/permission-common":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-permission-common@workspace:plugins/permission-common"
   dependencies:
@@ -6607,7 +6747,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-permission-react@workspace:^, @backstage/plugin-permission-react@workspace:plugins/permission-react":
+"@backstage/plugin-permission-react@^0.4.24, @backstage/plugin-permission-react@workspace:^, @backstage/plugin-permission-react@workspace:plugins/permission-react":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-permission-react@workspace:plugins/permission-react"
   dependencies:
@@ -7933,7 +8073,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/theme@^0.5.0, @backstage/theme@workspace:^, @backstage/theme@workspace:packages/theme":
+"@backstage/theme@^0.5.0, @backstage/theme@^0.5.6, @backstage/theme@workspace:^, @backstage/theme@workspace:packages/theme":
   version: 0.0.0-use.local
   resolution: "@backstage/theme@workspace:packages/theme"
   dependencies:
@@ -7964,7 +8104,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/version-bridge@^1.0.7, @backstage/version-bridge@workspace:^, @backstage/version-bridge@workspace:packages/version-bridge":
+"@backstage/version-bridge@^1.0.7, @backstage/version-bridge@^1.0.8, @backstage/version-bridge@workspace:^, @backstage/version-bridge@workspace:packages/version-bridge":
   version: 0.0.0-use.local
   resolution: "@backstage/version-bridge@workspace:packages/version-bridge"
   dependencies:

From fc45f68ecc2d7d3bc912a80fc39d64479722b858 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:54:20 +0000
Subject: [PATCH 161/225] fix(deps): update dependency octokit to v3.2.1

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 53 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8755e05c25..80cea4fceb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12110,6 +12110,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/openapi-types@npm:^22.2.0":
+  version: 22.2.0
+  resolution: "@octokit/openapi-types@npm:22.2.0"
+  checksum: eca41feac2b83298e0d95e253ac1c5b6d65155ac57f65c5fd8d4a485d9728922d85ff4bee0e815a1f3a5421311db092bdb6da9d6104a1b1843d8b274bcad9630
+  languageName: node
+  linkType: hard
+
 "@octokit/plugin-paginate-graphql@npm:^4.0.0":
   version: 4.0.0
   resolution: "@octokit/plugin-paginate-graphql@npm:4.0.0"
@@ -12119,6 +12126,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/plugin-paginate-rest@npm:11.3.1":
+  version: 11.3.1
+  resolution: "@octokit/plugin-paginate-rest@npm:11.3.1"
+  dependencies:
+    "@octokit/types": ^13.5.0
+  peerDependencies:
+    "@octokit/core": 5
+  checksum: 42c7c08e7287b4b85d2ae47852d2ffeb238c134ad6bcff18bddc154b15f6bec31778816c0763181401c370198390db7f6b0c3c44750fdfeec459594f7f4b5933
+  languageName: node
+  linkType: hard
+
 "@octokit/plugin-paginate-rest@npm:^6.1.2":
   version: 6.1.2
   resolution: "@octokit/plugin-paginate-rest@npm:6.1.2"
@@ -12151,14 +12169,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/plugin-rest-endpoint-methods@npm:^10.0.0":
-  version: 10.2.0
-  resolution: "@octokit/plugin-rest-endpoint-methods@npm:10.2.0"
+"@octokit/plugin-rest-endpoint-methods@npm:13.2.2":
+  version: 13.2.2
+  resolution: "@octokit/plugin-rest-endpoint-methods@npm:13.2.2"
   dependencies:
-    "@octokit/types": ^12.3.0
+    "@octokit/types": ^13.5.0
   peerDependencies:
-    "@octokit/core": ">=5"
-  checksum: 3209688bf508d22a525fe32d632ff928b048688c1859c7e4bbb08bd181aa07f580b375a502e34368628103e5d5cccf7f9fb0ff0c8fd4262470ac8eeffb80ac6b
+    "@octokit/core": ^5
+  checksum: 347b3a891a561ed1dcc307a2dce42ca48c318c465ad91a26225d3d6493aef1b7ff868e6c56a0d7aa4170d028c7429ca1ec52aed6be34615a6ed701c3bcafdb17
   languageName: node
   linkType: hard
 
@@ -12291,7 +12309,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/types@npm:^12.0.0, @octokit/types@npm:^12.2.0, @octokit/types@npm:^12.3.0, @octokit/types@npm:^12.4.0":
+"@octokit/types@npm:^12.0.0, @octokit/types@npm:^12.2.0, @octokit/types@npm:^12.4.0":
   version: 12.4.0
   resolution: "@octokit/types@npm:12.4.0"
   dependencies:
@@ -12300,6 +12318,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.5.0":
+  version: 13.5.0
+  resolution: "@octokit/types@npm:13.5.0"
+  dependencies:
+    "@octokit/openapi-types": ^22.2.0
+  checksum: 8e92f2b145b3c28a35312f93714245824a7b6b7353caa88edfdc85fc2ed4108321ed0c3988001ea53449fbb212febe0e8e9582744e85c3574dabe9d0441af5a0
+  languageName: node
+  linkType: hard
+
 "@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.10.0, @octokit/types@npm:^6.12.2, @octokit/types@npm:^6.16.1":
   version: 6.41.0
   resolution: "@octokit/types@npm:6.41.0"
@@ -35642,20 +35669,20 @@ __metadata:
   linkType: hard
 
 "octokit@npm:^3.0.0":
-  version: 3.2.0
-  resolution: "octokit@npm:3.2.0"
+  version: 3.2.1
+  resolution: "octokit@npm:3.2.1"
   dependencies:
     "@octokit/app": ^14.0.2
     "@octokit/core": ^5.0.0
     "@octokit/oauth-app": ^6.0.0
     "@octokit/plugin-paginate-graphql": ^4.0.0
-    "@octokit/plugin-paginate-rest": ^9.0.0
-    "@octokit/plugin-rest-endpoint-methods": ^10.0.0
+    "@octokit/plugin-paginate-rest": 11.3.1
+    "@octokit/plugin-rest-endpoint-methods": 13.2.2
     "@octokit/plugin-retry": ^6.0.0
     "@octokit/plugin-throttling": ^8.0.0
     "@octokit/request-error": ^5.0.0
-    "@octokit/types": ^12.0.0
-  checksum: 3ec8efe02144aa6210a5c846947245cbe58d31144fa8e6a1726782001d77fcd044b7e1498a56c5e47aba44c1f5726a37c261f474cb46b816579549f7a09db1f6
+    "@octokit/types": ^13.0.0
+  checksum: e5608f848fb11808d0c977d946c24bffa622179daf8566c4941f6050551d368aa750b362a95aea14647facd0919e4af392c67b2409f8642dc9f27c7b6c0f964e
   languageName: node
   linkType: hard
 

From 6a55e52ff3fafeec2a4fe3ca633dc206e0a85a25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:08:53 +0000
Subject: [PATCH 162/225] chore(deps): bump ws from 8.14.2 to 8.18.0

Bumps [ws](https://github.com/websockets/ws) from 8.14.2 to 8.18.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.14.2...8.18.0)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2b3baa5b33..82cc4670b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -44887,8 +44887,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:*, ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.14.2, ws@npm:^8.16.0, ws@npm:^8.17.0, ws@npm:^8.8.0":
-  version: 8.17.1
-  resolution: "ws@npm:8.17.1"
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -44897,7 +44897,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 442badcce1f1178ec87a0b5372ae2e9771e07c4929a3180321901f226127f252441e8689d765aa5cfba5f50ac60dd830954afc5aeae81609aefa11d3ddf5cecf
+  checksum: 91d4d35bc99ff6df483bdf029b9ea4bfd7af1f16fc91231a96777a63d263e1eabf486e13a2353970efc534f9faa43bdbf9ee76525af22f4752cbc5ebda333975
   languageName: node
   linkType: hard
 

From e6c15cc3045ca5ea28d2f944018ee857ff6b216d Mon Sep 17 00:00:00 2001
From: Nurit Izrailov <nuriti@spotify.com>
Date: Tue, 23 Jul 2024 11:33:26 -0400
Subject: [PATCH 163/225] add support to the new frontend system

Signed-off-by: Nurit Izrailov <nuriti@spotify.com>
---
 .changeset/mean-apricots-perform.md           |   5 +
 packages/app-next/app-config.yaml             |   2 +
 packages/app-next/src/App.tsx                 |   2 +
 plugins/kubernetes/README.md                  |  32 ++++-
 plugins/kubernetes/api-report-alpha.md        |  19 +++
 plugins/kubernetes/package.json               |  17 +++
 plugins/kubernetes/src/alpha.ts               |  18 +++
 .../src/alpha/KubernetesContentPage.tsx       |  24 ++++
 plugins/kubernetes/src/alpha/apis.tsx         | 119 ++++++++++++++++++
 .../kubernetes/src/alpha/entityContents.tsx   |  34 +++++
 plugins/kubernetes/src/alpha/index.ts         |  17 +++
 plugins/kubernetes/src/alpha/pages.tsx        |  33 +++++
 plugins/kubernetes/src/alpha/plugin.tsx       |  40 ++++++
 yarn.lock                                     |   2 +
 14 files changed, 363 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/mean-apricots-perform.md
 create mode 100644 plugins/kubernetes/api-report-alpha.md
 create mode 100644 plugins/kubernetes/src/alpha.ts
 create mode 100644 plugins/kubernetes/src/alpha/KubernetesContentPage.tsx
 create mode 100644 plugins/kubernetes/src/alpha/apis.tsx
 create mode 100644 plugins/kubernetes/src/alpha/entityContents.tsx
 create mode 100644 plugins/kubernetes/src/alpha/index.ts
 create mode 100644 plugins/kubernetes/src/alpha/pages.tsx
 create mode 100644 plugins/kubernetes/src/alpha/plugin.tsx

diff --git a/.changeset/mean-apricots-perform.md b/.changeset/mean-apricots-perform.md
new file mode 100644
index 0000000000..089a3ea7a4
--- /dev/null
+++ b/.changeset/mean-apricots-perform.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes': minor
+---
+
+Adds support for Backstage's new frontend system
diff --git a/packages/app-next/app-config.yaml b/packages/app-next/app-config.yaml
index 271040ecec..f6d0174ca1 100644
--- a/packages/app-next/app-config.yaml
+++ b/packages/app-next/app-config.yaml
@@ -43,6 +43,8 @@ app:
     - entity-card:org/ownership
     - entity-card:org/user-profile
 
+    - entity-content:kubernetes/kubernetes
+
   # scmAuthExtension: >-
   #   createScmAuthExtension({
   #     id: 'apis.scmAuth.addons.ghe',
diff --git a/packages/app-next/src/App.tsx b/packages/app-next/src/App.tsx
index c911a01258..303d751338 100644
--- a/packages/app-next/src/App.tsx
+++ b/packages/app-next/src/App.tsx
@@ -48,6 +48,7 @@ import {
 } from '@backstage/integration-react';
 import { createSignInPageExtension } from '@backstage/frontend-plugin-api';
 import { SignInPage } from '@backstage/core-components';
+import kubernetesPlugin from '@backstage/plugin-kubernetes/alpha';
 
 /*
 
@@ -121,6 +122,7 @@ const app = createApp({
     userSettingsPlugin,
     homePlugin,
     appVisualizerPlugin,
+    kubernetesPlugin,
     ...collectedLegacyPlugins,
     createExtensionOverrides({
       extensions: [
diff --git a/plugins/kubernetes/README.md b/plugins/kubernetes/README.md
index 15dfd16b17..4ffde719f2 100644
--- a/plugins/kubernetes/README.md
+++ b/plugins/kubernetes/README.md
@@ -26,8 +26,38 @@ For more information, see the [formal documentation about the Kubernetes feature
 
 ## Getting started
 
-Your plugin has been added to the example app in this repository, meaning you'll be able to access it by running `yarn start` in the root directory, and then navigating to [/kubernetes](http://localhost:3000/kubernetes).
+Your plugin has been added to the example app in this repository, meaning you'll be able to access it by running `yarn start` in the root directory, and then navigating to [/kubernetes](http://localhost:3000/catalog/default/component/:component-name/kubernetes).
 
 You can also serve the plugin in isolation by running `yarn start` in the plugin directory.
 This method of serving the plugin provides quicker iteration speed and a faster startup and hot reloads.
 It is only meant for local development, and the setup for it can be found inside the [/dev](./dev) directory.
+
+### Integrating with `EntityPage` (New Frontend System)
+
+Follow this section if you are using Backstage's [new frontend system](https://backstage.io/docs/frontend-system/).
+
+1. Import `kubernetesPlugin` in your `App.tsx` and add it to your app's `features` array:
+
+```typescript
+import kubernetesPlugin from '@backstage/plugin-kubernetes/alpha';
+
+// ...
+
+export const app = createApp({
+  features: [
+    // ...
+    kubernetesPlugin,
+    // ...
+  ],
+});
+```
+
+2. Next, enable your desired extensions in `app-config.yaml`
+
+```yaml
+app:
+  extensions:
+    - entity-content:kubernetes/kubernetes
+```
+
+Now, the extension appears on your entity page as one of the tabs, which is called `KUBERNETES`
diff --git a/plugins/kubernetes/api-report-alpha.md b/plugins/kubernetes/api-report-alpha.md
new file mode 100644
index 0000000000..8bd6e98baa
--- /dev/null
+++ b/plugins/kubernetes/api-report-alpha.md
@@ -0,0 +1,19 @@
+## API Report File for "@backstage/plugin-kubernetes"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { BackstagePlugin } from '@backstage/frontend-plugin-api';
+import { RouteRef } from '@backstage/frontend-plugin-api';
+
+// @public (undocumented)
+const _default: BackstagePlugin<
+  {
+    kubernetes: RouteRef<undefined>;
+  },
+  {}
+>;
+export default _default;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 1ab92f5b3c..6a66e42a94 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -30,8 +30,23 @@
   },
   "license": "Apache-2.0",
   "sideEffects": false,
+  "exports": {
+    ".": "./src/index.ts",
+    "./alpha": "./src/alpha.ts",
+    "./package.json": "./package.json"
+  },
   "main": "src/index.ts",
   "types": "src/index.ts",
+  "typesVersions": {
+    "*": {
+      "alpha": [
+        "src/alpha.ts"
+      ],
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
   "files": [
     "dist"
   ],
@@ -46,8 +61,10 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "workspace:^",
+    "@backstage/core-compat-api": "workspace:^",
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/frontend-plugin-api": "workspace:^",
     "@backstage/plugin-catalog-react": "workspace:^",
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@backstage/plugin-kubernetes-react": "workspace:^",
diff --git a/plugins/kubernetes/src/alpha.ts b/plugins/kubernetes/src/alpha.ts
new file mode 100644
index 0000000000..e80f131817
--- /dev/null
+++ b/plugins/kubernetes/src/alpha.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './alpha/index';
+export { default } from './alpha/index';
diff --git a/plugins/kubernetes/src/alpha/KubernetesContentPage.tsx b/plugins/kubernetes/src/alpha/KubernetesContentPage.tsx
new file mode 100644
index 0000000000..948a492e63
--- /dev/null
+++ b/plugins/kubernetes/src/alpha/KubernetesContentPage.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useEntity } from '@backstage/plugin-catalog-react';
+import { KubernetesContent } from '../KubernetesContent';
+import React from 'react';
+
+export function KubernetesContentPage() {
+  const { entity } = useEntity();
+  return <KubernetesContent entity={entity} />;
+}
diff --git a/plugins/kubernetes/src/alpha/apis.tsx b/plugins/kubernetes/src/alpha/apis.tsx
new file mode 100644
index 0000000000..6c880d2f53
--- /dev/null
+++ b/plugins/kubernetes/src/alpha/apis.tsx
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  createApiExtension,
+  createApiFactory,
+  discoveryApiRef,
+  fetchApiRef,
+} from '@backstage/frontend-plugin-api';
+import {
+  KubernetesBackendClient,
+  kubernetesApiRef,
+  kubernetesProxyApiRef,
+  kubernetesAuthProvidersApiRef,
+  KubernetesAuthProviders,
+  KubernetesProxyClient,
+  kubernetesClusterLinkFormatterApiRef,
+  getDefaultFormatters,
+  KubernetesClusterLinkFormatter,
+  DEFAULT_FORMATTER_NAME,
+} from '@backstage/plugin-kubernetes-react';
+import {
+  gitlabAuthApiRef,
+  googleAuthApiRef,
+  microsoftAuthApiRef,
+  oktaAuthApiRef,
+  oneloginAuthApiRef,
+} from '@backstage/core-plugin-api';
+
+export const kubernetesApiExtension = createApiExtension({
+  factory: createApiFactory({
+    api: kubernetesApiRef,
+    deps: {
+      discoveryApi: discoveryApiRef,
+      fetchApi: fetchApiRef,
+      kubernetesAuthProvidersApi: kubernetesAuthProvidersApiRef,
+    },
+    factory: ({ discoveryApi, fetchApi, kubernetesAuthProvidersApi }) =>
+      new KubernetesBackendClient({
+        discoveryApi,
+        fetchApi,
+        kubernetesAuthProvidersApi,
+      }),
+  }),
+});
+
+export const kubernetesProxyApi = createApiExtension({
+  factory: createApiFactory({
+    api: kubernetesProxyApiRef,
+    deps: {
+      kubernetesApi: kubernetesApiRef,
+    },
+    factory: ({ kubernetesApi }) =>
+      new KubernetesProxyClient({
+        kubernetesApi,
+      }),
+  }),
+});
+
+export const kubernetesAuthProvidersApi = createApiExtension({
+  factory: createApiFactory({
+    api: kubernetesAuthProvidersApiRef,
+    deps: {
+      gitlabAuthApi: gitlabAuthApiRef,
+      googleAuthApi: googleAuthApiRef,
+      microsoftAuthApi: microsoftAuthApiRef,
+      oktaAuthApi: oktaAuthApiRef,
+      oneloginAuthApi: oneloginAuthApiRef,
+    },
+    factory: ({
+      gitlabAuthApi,
+      googleAuthApi,
+      microsoftAuthApi,
+      oktaAuthApi,
+      oneloginAuthApi,
+    }) => {
+      const oidcProviders = {
+        gitlab: gitlabAuthApi,
+        google: googleAuthApi,
+        microsoft: microsoftAuthApi,
+        okta: oktaAuthApi,
+        onelogin: oneloginAuthApi,
+      };
+
+      return new KubernetesAuthProviders({
+        microsoftAuthApi,
+        googleAuthApi,
+        oidcProviders,
+      });
+    },
+  }),
+});
+
+export const kubernetesClusterLinkFormatterApi = createApiExtension({
+  factory: createApiFactory({
+    api: kubernetesClusterLinkFormatterApiRef,
+    deps: { googleAuthApi: googleAuthApiRef },
+    factory: deps => {
+      const formatters = getDefaultFormatters(deps);
+      return new KubernetesClusterLinkFormatter({
+        formatters,
+        defaultFormatterName: DEFAULT_FORMATTER_NAME,
+      });
+    },
+  }),
+});
diff --git a/plugins/kubernetes/src/alpha/entityContents.tsx b/plugins/kubernetes/src/alpha/entityContents.tsx
new file mode 100644
index 0000000000..9ad0b6843f
--- /dev/null
+++ b/plugins/kubernetes/src/alpha/entityContents.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import {
+  compatWrapper,
+  convertLegacyRouteRef,
+} from '@backstage/core-compat-api';
+import { createEntityContentExtension } from '@backstage/plugin-catalog-react/alpha';
+import { rootCatalogKubernetesRouteRef } from '../plugin';
+
+export const entityKubernetesContent = createEntityContentExtension({
+  defaultPath: 'kubernetes',
+  defaultTitle: 'Kubernetes',
+  name: 'kubernetes',
+  routeRef: convertLegacyRouteRef(rootCatalogKubernetesRouteRef),
+  loader: () =>
+    import('./KubernetesContentPage').then(m =>
+      compatWrapper(<m.KubernetesContentPage />),
+    ),
+});
diff --git a/plugins/kubernetes/src/alpha/index.ts b/plugins/kubernetes/src/alpha/index.ts
new file mode 100644
index 0000000000..2f137f09ee
--- /dev/null
+++ b/plugins/kubernetes/src/alpha/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { default } from './plugin';
diff --git a/plugins/kubernetes/src/alpha/pages.tsx b/plugins/kubernetes/src/alpha/pages.tsx
new file mode 100644
index 0000000000..8b5db150bd
--- /dev/null
+++ b/plugins/kubernetes/src/alpha/pages.tsx
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react'; // Add this line to import React
+
+import { createPageExtension } from '@backstage/frontend-plugin-api';
+import {
+  compatWrapper,
+  convertLegacyRouteRef,
+} from '@backstage/core-compat-api';
+import { rootCatalogKubernetesRouteRef } from '../plugin';
+
+export const kubernetesPage = createPageExtension({
+  defaultPath: '/kubernetes',
+  // you can reuse the existing routeRef
+  // by wrapping into the convertLegacyRouteRef.
+  routeRef: convertLegacyRouteRef(rootCatalogKubernetesRouteRef),
+  // these inputs usually match the props required by the component.
+  loader: () => import('../Router').then(m => compatWrapper(<m.Router />)),
+});
diff --git a/plugins/kubernetes/src/alpha/plugin.tsx b/plugins/kubernetes/src/alpha/plugin.tsx
new file mode 100644
index 0000000000..47433bce35
--- /dev/null
+++ b/plugins/kubernetes/src/alpha/plugin.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { convertLegacyRouteRefs } from '@backstage/core-compat-api';
+import { createPlugin } from '@backstage/frontend-plugin-api';
+import { kubernetesPage } from './pages';
+import { entityKubernetesContent } from './entityContents';
+import { rootCatalogKubernetesRouteRef } from '../plugin';
+import {
+  kubernetesApiExtension as kubernetesApi,
+  kubernetesAuthProvidersApi,
+  kubernetesClusterLinkFormatterApi,
+  kubernetesProxyApi,
+} from './apis';
+
+export default createPlugin({
+  id: 'kubernetes',
+  extensions: [
+    kubernetesPage,
+    entityKubernetesContent,
+    kubernetesApi,
+    kubernetesProxyApi,
+    kubernetesAuthProvidersApi,
+    kubernetesClusterLinkFormatterApi,
+  ],
+  routes: convertLegacyRouteRefs({ kubernetes: rootCatalogKubernetesRouteRef }),
+});
diff --git a/yarn.lock b/yarn.lock
index b63d8d7d63..ed5486f498 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6307,9 +6307,11 @@ __metadata:
   dependencies:
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
+    "@backstage/core-compat-api": "workspace:^"
     "@backstage/core-components": "workspace:^"
     "@backstage/core-plugin-api": "workspace:^"
     "@backstage/dev-utils": "workspace:^"
+    "@backstage/frontend-plugin-api": "workspace:^"
     "@backstage/plugin-catalog-react": "workspace:^"
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@backstage/plugin-kubernetes-react": "workspace:^"

From d31aa860eb6c2474e945b337181422507ceeb970 Mon Sep 17 00:00:00 2001
From: Nurit Izrailov <38442135+nuritizra@users.noreply.github.com>
Date: Tue, 23 Jul 2024 13:41:14 -0400
Subject: [PATCH 164/225] Update .changeset/mean-apricots-perform.md

Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
Signed-off-by: Nurit Izrailov <38442135+nuritizra@users.noreply.github.com>
---
 .changeset/mean-apricots-perform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/mean-apricots-perform.md b/.changeset/mean-apricots-perform.md
index 089a3ea7a4..26e547086e 100644
--- a/.changeset/mean-apricots-perform.md
+++ b/.changeset/mean-apricots-perform.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-kubernetes': minor
+'@backstage/plugin-kubernetes': patch
 ---
 
 Adds support for Backstage's new frontend system

From 9397e8f175a0310d68b3be26c70db2fe137f4fe9 Mon Sep 17 00:00:00 2001
From: Nurit Izrailov <38442135+nuritizra@users.noreply.github.com>
Date: Tue, 23 Jul 2024 13:41:22 -0400
Subject: [PATCH 165/225] Update .changeset/mean-apricots-perform.md

Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
Signed-off-by: Nurit Izrailov <38442135+nuritizra@users.noreply.github.com>
---
 .changeset/mean-apricots-perform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/mean-apricots-perform.md b/.changeset/mean-apricots-perform.md
index 26e547086e..c93514cb7f 100644
--- a/.changeset/mean-apricots-perform.md
+++ b/.changeset/mean-apricots-perform.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-kubernetes': patch
 ---
 
-Adds support for Backstage's new frontend system
+Adds support for Backstage's new frontend system, available via the `/alpha` sub-path export.

From 949083ddb41067368bc3638303683e1340614563 Mon Sep 17 00:00:00 2001
From: Isabel Tomb <isabelgtomb@gmail.com>
Date: Mon, 8 Jul 2024 13:03:39 -0500
Subject: [PATCH 166/225] Update `patchMkdocsYmlPreBuild`

Update the `patchMkdocsYmlPreBuild` function to modify `repo_url` and
`edit_uri` independently of each other. Prior to this change both
`repo_url` and `edit_uri` would have to be missing for either to be
generated which caused an issue in the situation where `repo_url`
is provided in the mkdocs.yml and `edit_uri` is not because the default
`edit_uri` value from mkdocs would be used instead. This value uses `master` as
the branch in the link which breaks the edit link for repos that don't use
`master` as the default branch.

Signed-off-by: Isabel Tomb <isabelgtomb@gmail.com>
---
 .changeset/mighty-geckos-kiss.md                            | 5 +++++
 plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/mighty-geckos-kiss.md

diff --git a/.changeset/mighty-geckos-kiss.md b/.changeset/mighty-geckos-kiss.md
new file mode 100644
index 0000000000..0761d8b257
--- /dev/null
+++ b/.changeset/mighty-geckos-kiss.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs-node': patch
+---
+
+Update `patchMkdocsYmlPrebuild` to modify `repo_url` and `edit_uri` independently.
diff --git a/plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts b/plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts
index 762a1c267a..fb95c19a9c 100644
--- a/plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts
+++ b/plugins/techdocs-node/src/stages/generate/mkdocsPatchers.ts
@@ -108,7 +108,7 @@ export const patchMkdocsYmlPreBuild = async (
   scmIntegrations: ScmIntegrationRegistry,
 ) => {
   await patchMkdocsFile(mkdocsYmlPath, logger, mkdocsYml => {
-    if (!('repo_url' in mkdocsYml) && !('edit_uri' in mkdocsYml)) {
+    if (!('repo_url' in mkdocsYml) || !('edit_uri' in mkdocsYml)) {
       // Add edit_uri and/or repo_url to mkdocs.yml if it is missing.
       // This will enable the Page edit button generated by MkDocs.
       // If the either has been set, keep the original value
@@ -119,8 +119,8 @@ export const patchMkdocsYmlPreBuild = async (
       );
 
       if (result.repo_url || result.edit_uri) {
-        mkdocsYml.repo_url = result.repo_url;
-        mkdocsYml.edit_uri = result.edit_uri;
+        mkdocsYml.repo_url = mkdocsYml.repo_url || result.repo_url;
+        mkdocsYml.edit_uri = mkdocsYml.edit_uri || result.edit_uri;
 
         logger.info(
           `Set ${JSON.stringify(

From 839e888e3a7e348b200cb6eeda68b782a12e782c Mon Sep 17 00:00:00 2001
From: Isabel Tomb <isabelgtomb@gmail.com>
Date: Mon, 8 Jul 2024 13:44:01 -0500
Subject: [PATCH 167/225] Add a test for new repo_url edit_uri scenario

Add a test that checks that an edit_uri will be generated as expected
if the mkdocs.yml contains a `repo_url` value but no `edit_uri` vlaue.

Signed-off-by: Isabel Tomb <isabelgtomb@gmail.com>
---
 .../src/stages/generate/helpers.test.ts       | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/plugins/techdocs-node/src/stages/generate/helpers.test.ts b/plugins/techdocs-node/src/stages/generate/helpers.test.ts
index 3589b71c60..a40239c595 100644
--- a/plugins/techdocs-node/src/stages/generate/helpers.test.ts
+++ b/plugins/techdocs-node/src/stages/generate/helpers.test.ts
@@ -299,6 +299,31 @@ describe('helpers', () => {
       );
     });
 
+    it('should add edit_uri to mkdocs.yml with existing repo_url', async () => {
+      const parsedLocationAnnotation: ParsedLocationAnnotation = {
+        type: 'url',
+        target: 'https://github.com/neworg/newrepo/tree/main/',
+      };
+
+      await patchMkdocsYmlPreBuild(
+        mockDir.resolve('mkdocs_with_repo_url.yml'),
+        mockLogger,
+        parsedLocationAnnotation,
+        scmIntegrations,
+      );
+
+      const updatedMkdocsYml = await fs.readFile(
+        mockDir.resolve('mkdocs_with_repo_url.yml'),
+      );
+
+      expect(updatedMkdocsYml.toString()).toContain(
+        'edit_uri: https://github.com/neworg/newrepo/edit/main/docs',
+      );
+      expect(updatedMkdocsYml.toString()).toContain(
+        'repo_url: https://github.com/backstage/backstage',
+      );
+    });
+
     it('should not update mkdocs.yml if nothing should be changed', async () => {
       const parsedLocationAnnotation: ParsedLocationAnnotation = {
         type: 'dir',

From 0afa044555655e07f9e31d3eceb32c2177a0c1db Mon Sep 17 00:00:00 2001
From: Isabel Tomb <isabelgtomb@gmail.com>
Date: Mon, 8 Jul 2024 13:45:50 -0500
Subject: [PATCH 168/225] Update test

Update the test that checks that the existing edit_uri value in a
mkdocs.yml won't be overridden by `patchMkdocsYmlPreBuild` so that it
checks the value of 'edit_uri' was not updated rather than just checking
for the existence of the substring. This change is needed because the
substring will exist in the file but as the `repo_url` value which is
expected after the changes in the previous commits.

Signed-off-by: Isabel Tomb <isabelgtomb@gmail.com>
---
 plugins/techdocs-node/src/stages/generate/helpers.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/techdocs-node/src/stages/generate/helpers.test.ts b/plugins/techdocs-node/src/stages/generate/helpers.test.ts
index a40239c595..6ee3870845 100644
--- a/plugins/techdocs-node/src/stages/generate/helpers.test.ts
+++ b/plugins/techdocs-node/src/stages/generate/helpers.test.ts
@@ -295,7 +295,7 @@ describe('helpers', () => {
         'edit_uri: https://github.com/backstage/backstage/edit/main/docs',
       );
       expect(updatedMkdocsYml.toString()).not.toContain(
-        'https://github.com/neworg/newrepo',
+        'edit_uri: https://github.com/neworg/newrepo',
       );
     });
 

From def53a7f9606550b5cd68744b8c11ab3c8a7cba0 Mon Sep 17 00:00:00 2001
From: Mikko Korhonen <mikko.korhonen@op.fi>
Date: Wed, 24 Jul 2024 12:30:55 +0300
Subject: [PATCH 169/225] Change NotificationTemplateRenderer methods to return
 a promise

Signed-off-by: Mikko Korhonen <mikko.korhonen@op.fi>
---
 .changeset/spicy-planets-provide.md           | 46 +++++++++++++++++++
 .../api-report.md                             |  6 +--
 .../src/extensions.ts                         |  6 +--
 .../processor/NotificationsEmailProcessor.ts  |  6 +--
 4 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/spicy-planets-provide.md

diff --git a/.changeset/spicy-planets-provide.md b/.changeset/spicy-planets-provide.md
new file mode 100644
index 0000000000..f2929df850
--- /dev/null
+++ b/.changeset/spicy-planets-provide.md
@@ -0,0 +1,46 @@
+---
+'@backstage/plugin-notifications-backend-module-email': minor
+---
+
+**BREAKING** Following `NotificationTemplateRenderer` methods now return a Promise and **must** be awaited: `getSubject`, `getText` and `getHtml`.
+
+Required changes and example usage:
+
+```diff
+import { notificationsEmailTemplateExtensionPoint } from '@backstage/plugin-notifications-backend-module-email';
+import { Notification } from '@backstage/plugin-notifications-common';
++import { getNotificationSubject, getNotificationTextContent, getNotificationHtmlContent } from 'my-notification-processing-library`
+export const notificationsModuleEmailDecorator = createBackendModule({
+  pluginId: 'notifications',
+  moduleId: 'email.templates',
+  register(reg) {
+    reg.registerInit({
+      deps: {
+        emailTemplates: notificationsEmailTemplateExtensionPoint,
+      },
+      async init({ emailTemplates }) {
+        emailTemplates.setTemplateRenderer({
+-          getSubject(notification) {
++          async getSubject(notification) {
+-            return `New notification from ${notification.source}`;
++            const subject = await getNotificationSubject(notification);
++            return `New notification from ${subject}`;
+          },
+-          getText(notification) {
++          async getText(notification) {
+-            return notification.content;
++            const text = await getNotificationTextContent(notification);
++            return text;
+          },
+-          getHtml(notification) {
++          async getHtml(notification) {
+-            return `<p>${notification.content}</p>`;
++            const html = await getNotificationHtmlContent(notification);
++            return html;
+          },
+        });
+      },
+    });
+  },
+});
+```
diff --git a/plugins/notifications-backend-module-email/api-report.md b/plugins/notifications-backend-module-email/api-report.md
index 7e8eac6cb7..b105f15cba 100644
--- a/plugins/notifications-backend-module-email/api-report.md
+++ b/plugins/notifications-backend-module-email/api-report.md
@@ -23,10 +23,10 @@ export default notificationsModuleEmail;
 // @public (undocumented)
 export interface NotificationTemplateRenderer {
   // (undocumented)
-  getHtml?(notification: Notification_2): string;
+  getHtml?(notification: Notification_2): Promise<string>;
   // (undocumented)
-  getSubject?(notification: Notification_2): string;
+  getSubject?(notification: Notification_2): Promise<string>;
   // (undocumented)
-  getText?(notification: Notification_2): string;
+  getText?(notification: Notification_2): Promise<string>;
 }
 ```
diff --git a/plugins/notifications-backend-module-email/src/extensions.ts b/plugins/notifications-backend-module-email/src/extensions.ts
index 454fe9b384..49795eadcf 100644
--- a/plugins/notifications-backend-module-email/src/extensions.ts
+++ b/plugins/notifications-backend-module-email/src/extensions.ts
@@ -20,9 +20,9 @@ import { Notification } from '@backstage/plugin-notifications-common';
  * @public
  */
 export interface NotificationTemplateRenderer {
-  getSubject?(notification: Notification): string;
-  getText?(notification: Notification): string;
-  getHtml?(notification: Notification): string;
+  getSubject?(notification: Notification): Promise<string>;
+  getText?(notification: Notification): Promise<string>;
+  getHtml?(notification: Notification): Promise<string>;
 }
 
 /**
diff --git a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
index 8689afc065..3bfccfcc90 100644
--- a/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
+++ b/plugins/notifications-backend-module-email/src/processor/NotificationsEmailProcessor.ts
@@ -280,10 +280,10 @@ export class NotificationsEmailProcessor implements NotificationProcessor {
     const mailOptions = {
       from: this.sender,
       subject:
-        this.templateRenderer?.getSubject?.(notification) ??
+        (await this.templateRenderer?.getSubject?.(notification)) ??
         notification.payload.title,
-      html: this.templateRenderer?.getHtml?.(notification),
-      text: this.templateRenderer?.getText?.(notification),
+      html: await this.templateRenderer?.getHtml?.(notification),
+      text: await this.templateRenderer?.getText?.(notification),
       replyTo: this.replyTo,
     };
 

From 7ca331cc2b07c4ee221c689493025f3c5881b975 Mon Sep 17 00:00:00 2001
From: Thomas Cardonne <thomas.cardonne@adevinta.com>
Date: Wed, 24 Jul 2024 11:45:51 +0200
Subject: [PATCH 170/225] feat(catalog-react): correct alignment of
 EntityDisplayName's icon

Signed-off-by: Thomas Cardonne <thomas.cardonne@adevinta.com>
---
 .changeset/few-wasps-hug.md                                  | 5 +++++
 .../src/components/EntityDisplayName/EntityDisplayName.tsx   | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/few-wasps-hug.md

diff --git a/.changeset/few-wasps-hug.md b/.changeset/few-wasps-hug.md
new file mode 100644
index 0000000000..66cf34fc0b
--- /dev/null
+++ b/.changeset/few-wasps-hug.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Correct `EntityDisplayName`'s icon alignment with the text.
diff --git a/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx b/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
index e953f21afb..68d5ecefdb 100644
--- a/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
+++ b/plugins/catalog-react/src/components/EntityDisplayName/EntityDisplayName.tsx
@@ -38,7 +38,9 @@ const useStyles = makeStyles(
     icon: {
       marginRight: theme.spacing(0.5),
       color: theme.palette.text.secondary,
-      lineHeight: 0,
+      '& svg': {
+        verticalAlign: 'middle',
+      },
     },
   }),
   { name: 'CatalogReactEntityDisplayName' },

From 21b66b184dc88f744c69ead1744f4b4d5de4ff0a Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Tue, 23 Jul 2024 12:37:43 +0200
Subject: [PATCH 171/225] chore: initial experiments

Signed-off-by: blam <ben@blam.sh>

wip
Signed-off-by: blam <ben@blam.sh>

wip2
Signed-off-by: blam <ben@blam.sh>

wip3
Signed-off-by: blam <ben@blam.sh>

wip3

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-plugin-api/api-report.md    | 41 ++++++---
 .../src/extensions/IconBundleBlueprint.ts     | 36 ++++++++
 .../src/wiring/createExtension.ts             | 18 +++-
 .../src/wiring/createExtensionBlueprint.ts    | 92 ++++++++++++++-----
 .../src/app/createExtensionTester.tsx         |  4 +-
 plugins/catalog-graph/api-report-alpha.md     | 72 +++++++++++++++
 plugins/catalog-graph/src/alpha.tsx           | 79 ++++++++++++----
 plugins/catalog-react/api-report-alpha.md     | 56 +++++++++--
 plugins/catalog-react/src/alpha.tsx           | 51 ++++++++++
 plugins/catalog/api-report-alpha.md           | 35 ++++++-
 plugins/catalog/src/alpha/index.ts            |  2 +
 plugins/search-react/api-report-alpha.md      |  3 +-
 plugins/search/api-report-alpha.md            | 26 ++++--
 plugins/techdocs/api-report-alpha.md          | 18 ++--
 plugins/user-settings/api-report-alpha.md     | 10 +-
 15 files changed, 456 insertions(+), 87 deletions(-)

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index d6a91c0c99..0c7c3b1d92 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -89,6 +89,7 @@ import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import { vmwareCloudAuthApiRef } from '@backstage/core-plugin-api';
 import { withApis } from '@backstage/core-plugin-api';
 import { z } from 'zod';
+import { ZodObject } from 'zod';
 import { ZodSchema } from 'zod';
 import { ZodTypeDef } from 'zod';
 
@@ -391,7 +392,7 @@ export function createApiExtension<
     configSchema?: PortableSchema<TConfig>;
     inputs?: TInputs;
   },
-): ExtensionDefinition<TConfig>;
+): ExtensionDefinition<TConfig, ZodObject<any, any, any, any, any>>;
 
 // @public (undocumented)
 export namespace createApiExtension {
@@ -487,7 +488,7 @@ export function createComponentExtension<
           inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         }) => ComponentType<TProps>;
       };
-}): ExtensionDefinition<TConfig>;
+}): ExtensionDefinition<TConfig, ZodObject<any, any, any, any, any>>;
 
 // @public (undocumented)
 export namespace createComponentExtension {
@@ -511,10 +512,11 @@ export function createComponentRef<T extends {} = {}>(options: {
 export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
-  TConfig = never,
+  TConfigSchema extends z.ZodObject<any, any, any, any, any>,
+  TConfig extends z.infer<TConfigSchema>,
 >(
-  options: CreateExtensionOptions<TOutput, TInputs, TConfig>,
-): ExtensionDefinition<TConfig>;
+  options: CreateExtensionOptions<TOutput, TInputs, TConfigSchema, TConfig>,
+): ExtensionDefinition<TConfig, TConfigSchema>;
 
 // @public
 export function createExtensionBlueprint<
@@ -605,7 +607,8 @@ export function createExtensionInput<
 export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
-  TConfig,
+  TConfigSchema extends z.ZodObject<any, any, any, any, any>,
+  TConfig extends z.infer<TConfigSchema>,
 > {
   // (undocumented)
   attachTo: {
@@ -613,6 +616,10 @@ export interface CreateExtensionOptions<
     input: string;
   };
   // (undocumented)
+  config?: {
+    schema: (context: { z: typeof z }) => TConfigSchema;
+  };
+  // @deprecated (undocumented)
   configSchema?: PortableSchema<TConfig>;
   // (undocumented)
   disabled?: boolean;
@@ -672,9 +679,12 @@ export function createNavItemExtension(options: {
   routeRef: RouteRef<undefined>;
   title: string;
   icon: IconComponent_2;
-}): ExtensionDefinition<{
-  title: string;
-}>;
+}): ExtensionDefinition<
+  {
+    title: string;
+  },
+  ZodObject<any, any, any, any, any>
+>;
 
 // @public (undocumented)
 export namespace createNavItemExtension {
@@ -696,7 +706,7 @@ export function createNavLogoExtension(options: {
   namespace?: string;
   logoIcon: JSX.Element;
   logoFull: JSX.Element;
-}): ExtensionDefinition<never>;
+}): ExtensionDefinition<any, ZodObject<any, any, any, any, any>>;
 
 // @public (undocumented)
 export namespace createNavLogoExtension {
@@ -851,7 +861,7 @@ export function createSubRouteRef<
 // @public (undocumented)
 export function createThemeExtension(
   theme: AppTheme,
-): ExtensionDefinition<never>;
+): ExtensionDefinition<any, ZodObject<any, any, any, any, any>>;
 
 // @public (undocumented)
 export namespace createThemeExtension {
@@ -867,7 +877,7 @@ export namespace createThemeExtension {
 export function createTranslationExtension(options: {
   name?: string;
   resource: TranslationResource | TranslationMessages;
-}): ExtensionDefinition<never>;
+}): ExtensionDefinition<any, ZodObject<any, any, any, any, any>>;
 
 // @public (undocumented)
 export namespace createTranslationExtension {
@@ -1011,7 +1021,10 @@ export type ExtensionDataValues<TExtensionData extends AnyExtensionDataMap> = {
 };
 
 // @public (undocumented)
-export interface ExtensionDefinition<TConfig> {
+export interface ExtensionDefinition<
+  TConfig,
+  TConfigSchema extends z.ZodObject<any, any, any, any, any> = any,
+> {
   // (undocumented)
   $$type: '@backstage/ExtensionDefinition';
   // (undocumented)
@@ -1022,6 +1035,8 @@ export interface ExtensionDefinition<TConfig> {
   // (undocumented)
   readonly configSchema?: PortableSchema<TConfig>;
   // (undocumented)
+  readonly configSchema2?: TConfigSchema;
+  // (undocumented)
   readonly disabled: boolean;
   // (undocumented)
   readonly kind?: string;
diff --git a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
index 2ad1404102..aba3303f2f 100644
--- a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
+++ b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
@@ -33,3 +33,39 @@ export const IconBundleBlueprint = createExtensionBlueprint({
     icons: iconsDataRef,
   },
 });
+
+IconBundleBlueprint.make({
+  name: 'asd',
+  params: {
+    icons: {
+      'icon-name': () => null,
+    },
+  },
+});
+
+IconBundleBlueprint.make({
+  name: 'asd',
+  params: {
+    icons: {
+      'icon-name': () => null,
+    },
+  },
+});
+
+IconBundleBlueprint.make({
+  name: 'asd',
+  factory() {
+    return {
+      icons: {
+        'icon-name': () => null,
+      },
+    };
+  },
+});
+
+IconBundleBlueprint.make({
+  name: 'asd',
+  factory(f) {
+    return f({ icons: { 'icon-name': () => null } });
+  },
+});
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index e87f3a638e..3733e44957 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -19,7 +19,7 @@ import { PortableSchema } from '../schema';
 import { Expand } from '../types';
 import { ExtensionDataRef } from './createExtensionDataRef';
 import { ExtensionInput } from './createExtensionInput';
-
+import { z } from 'zod';
 /** @public */
 export type AnyExtensionDataMap = {
   [name in string]: ExtensionDataRef<unknown, string, { optional?: true }>;
@@ -82,6 +82,7 @@ export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
 > {
   kind?: string;
   namespace?: string;
@@ -90,7 +91,11 @@ export interface CreateExtensionOptions<
   disabled?: boolean;
   inputs?: TInputs;
   output: TOutput;
+  /** @deprecated - use `config.schema` instead */
   configSchema?: PortableSchema<TConfig>;
+  config?: {
+    schema: TConfigSchema;
+  };
   factory(context: {
     node: AppNode;
     config: TConfig;
@@ -99,7 +104,7 @@ export interface CreateExtensionOptions<
 }
 
 /** @public */
-export interface ExtensionDefinition<TConfig> {
+export interface ExtensionDefinition<TConfig, TConfigSchema = {}> {
   $$type: '@backstage/ExtensionDefinition';
   readonly kind?: string;
   readonly namespace?: string;
@@ -107,6 +112,9 @@ export interface ExtensionDefinition<TConfig> {
   readonly attachTo: { id: string; input: string };
   readonly disabled: boolean;
   readonly configSchema?: PortableSchema<TConfig>;
+  readonly config?: {
+    schema: TConfigSchema;
+  };
 }
 
 /** @internal */
@@ -144,9 +152,10 @@ export function toInternalExtensionDefinition<TConfig>(
 export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
-  TConfig = never,
+  TConfig,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
 >(
-  options: CreateExtensionOptions<TOutput, TInputs, TConfig>,
+  options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
 ): ExtensionDefinition<TConfig> {
   return {
     $$type: '@backstage/ExtensionDefinition',
@@ -159,6 +168,7 @@ export function createExtension<
     inputs: options.inputs ?? {},
     output: options.output,
     configSchema: options.configSchema,
+    config: options.config,
     factory({ inputs, ...rest }) {
       // TODO: Simplify this, but TS wouldn't infer the input type for some reason
       return options.factory({
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index fb9081f7f8..61227c7dc1 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -15,7 +15,6 @@
  */
 
 import { AppNode } from '../apis';
-import { PortableSchema } from '../schema';
 import { Expand } from '../types';
 import {
   AnyExtensionDataMap,
@@ -25,6 +24,7 @@ import {
   ResolvedExtensionInputs,
   createExtension,
 } from './createExtension';
+import { z } from 'zod';
 
 /**
  * @public
@@ -33,7 +33,7 @@ export interface CreateExtensionBlueprintOptions<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfig,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap,
 > {
   kind: string;
@@ -42,12 +42,16 @@ export interface CreateExtensionBlueprintOptions<
   disabled?: boolean;
   inputs?: TInputs;
   output: TOutput;
-  configSchema?: PortableSchema<TConfig>;
+  config?: {
+    schema: TConfigSchema;
+  };
   factory(
     params: TParams,
     context: {
       node: AppNode;
-      config: TConfig;
+      config: {
+        [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+      };
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
   ): Expand<ExtensionDataValues<TOutput>>;
@@ -62,7 +66,7 @@ export interface ExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfig,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap,
 > {
   dataRefs: TDataRefs;
@@ -73,7 +77,11 @@ export interface ExtensionBlueprint<
    * You must either pass `params` directly, or define a `factory` that can
    * optionally call the original factory with the same params.
    */
-  make(
+  make<
+    TExtensionConfigSchema extends {
+      [key: string]: (zImpl: typeof z) => z.ZodTypeAny;
+    },
+  >(
     args: {
       namespace?: string;
       name?: string;
@@ -81,20 +89,30 @@ export interface ExtensionBlueprint<
       disabled?: boolean;
       inputs?: TInputs;
       output?: TOutput;
-      configSchema?: PortableSchema<TConfig>;
+      config?: {
+        schema: TExtensionConfigSchema;
+      };
     } & (
       | {
           factory(
             originalFactory: (
               params: TParams,
               context?: {
-                config?: TConfig;
+                config?: {
+                  [key in keyof TConfigSchema]: z.infer<
+                    ReturnType<TConfigSchema[key]>
+                  >;
+                };
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
             ) => Expand<ExtensionDataValues<TOutput>>,
             context: {
               node: AppNode;
-              config: TConfig;
+              config: {
+                [key in keyof TExtensionConfigSchema]: z.infer<
+                  ReturnType<TExtensionConfigSchema[key]>
+                >;
+              };
               inputs: Expand<ResolvedExtensionInputs<TInputs>>;
             },
           ): Expand<ExtensionDataValues<TOutput>>;
@@ -103,7 +121,14 @@ export interface ExtensionBlueprint<
           params: TParams;
         }
     ),
-  ): ExtensionDefinition<TConfig>;
+  ): ExtensionDefinition<
+    {
+      [key in keyof TExtensionConfigSchema]: z.infer<
+        ReturnType<TExtensionConfigSchema[key]>
+      >;
+    },
+    TExtensionConfigSchema
+  >;
 }
 
 /**
@@ -113,7 +138,7 @@ class ExtensionBlueprintImpl<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfig,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap,
 > {
   constructor(
@@ -121,7 +146,7 @@ class ExtensionBlueprintImpl<
       TParams,
       TInputs,
       TOutput,
-      TConfig,
+      TConfigSchema,
       TDataRefs
     >,
   ) {
@@ -130,30 +155,49 @@ class ExtensionBlueprintImpl<
 
   dataRefs: TDataRefs;
 
-  public make(args: {
+  public make<
+    TExtensionConfigSchema extends TConfigSchema = TConfigSchema,
+  >(args: {
     namespace?: string;
     name?: string;
     attachTo?: { id: string; input: string };
     disabled?: boolean;
     inputs?: TInputs;
     output?: TOutput;
-    configSchema?: PortableSchema<TConfig>;
     params?: TParams;
+    config?: {
+      schema: TConfigSchema;
+    };
     factory?(
       originalFactory: (
         params: TParams,
         context?: {
-          config?: TConfig;
+          config?: {
+            [key in keyof TConfigSchema]: z.infer<
+              ReturnType<TConfigSchema[key]>
+            >;
+          };
           inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
         },
       ) => Expand<ExtensionDataValues<TOutput>>,
       context: {
         node: AppNode;
-        config: TConfig;
+        config: {
+          [key in keyof TExtensionConfigSchema]: z.infer<
+            ReturnType<TExtensionConfigSchema[key]>
+          >;
+        };
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
       },
     ): Expand<ExtensionDataValues<TOutput>>;
-  }): ExtensionDefinition<TConfig> {
+  }): ExtensionDefinition<
+    {
+      [key in keyof TExtensionConfigSchema]: z.infer<
+        ReturnType<TExtensionConfigSchema[key]>
+      >;
+    },
+    TExtensionConfigSchema
+  > {
     return createExtension({
       kind: this.options.kind,
       namespace: args.namespace ?? this.options.namespace,
@@ -162,14 +206,18 @@ class ExtensionBlueprintImpl<
       disabled: args.disabled ?? this.options.disabled,
       inputs: args.inputs ?? this.options.inputs,
       output: args.output ?? this.options.output,
-      configSchema: args.configSchema ?? this.options.configSchema, // TODO: some config merging or smth
+      config: args.config,
       factory: ({ node, config, inputs }) => {
         if (args.factory) {
           return args.factory(
             (
               innerParams: TParams,
               innerContext?: {
-                config?: TConfig;
+                config?: {
+                  [key in keyof TConfigSchema]: z.infer<
+                    ReturnType<TConfigSchema[key]>
+                  >;
+                };
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
             ) =>
@@ -207,16 +255,16 @@ export function createExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfig,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap = never,
 >(
   options: CreateExtensionBlueprintOptions<
     TParams,
     TInputs,
     TOutput,
-    TConfig,
+    TConfigSchema,
     TDataRefs
   >,
-): ExtensionBlueprint<TParams, TInputs, TOutput, TConfig, TDataRefs> {
+): ExtensionBlueprint<TParams, TInputs, TOutput, TConfigSchema, TDataRefs> {
   return new ExtensionBlueprintImpl(options);
 }
diff --git a/packages/frontend-test-utils/src/app/createExtensionTester.tsx b/packages/frontend-test-utils/src/app/createExtensionTester.tsx
index a98879fbba..d6be346002 100644
--- a/packages/frontend-test-utils/src/app/createExtensionTester.tsx
+++ b/packages/frontend-test-utils/src/app/createExtensionTester.tsx
@@ -102,11 +102,11 @@ export class ExtensionTester {
         ...output,
         path: coreExtensionData.routePath,
       },
-      factory: params => ({
+      factory: (params: any) => ({
         ...factory(params),
         path: '/',
       }),
-    });
+    } as any);
     tester.add(extension, options);
     return tester;
   }
diff --git a/plugins/catalog-graph/api-report-alpha.md b/plugins/catalog-graph/api-report-alpha.md
index 3895f12fcf..afd03965ae 100644
--- a/plugins/catalog-graph/api-report-alpha.md
+++ b/plugins/catalog-graph/api-report-alpha.md
@@ -4,8 +4,76 @@
 
 ```ts
 import { BackstagePlugin } from '@backstage/frontend-plugin-api';
+import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { ExternalRouteRef } from '@backstage/frontend-plugin-api';
+import { objectUtil } from 'zod';
 import { RouteRef } from '@backstage/frontend-plugin-api';
+import { ZodArray } from 'zod';
+import { ZodBoolean } from 'zod';
+import { ZodEnum } from 'zod';
+import { ZodNativeEnum } from 'zod';
+import { ZodNumber } from 'zod';
+import { ZodOptional } from 'zod';
+import { ZodString } from 'zod';
+import { ZodTuple } from 'zod';
+
+// Warning: (ae-missing-release-tag) "CatalogGraphEntityCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const CatalogGraphEntityCard: ExtensionDefinition<
+  {
+    filter?: string | undefined;
+    height?: number | undefined;
+    curve?: 'curveStepBefore' | 'curveMonotoneX' | undefined;
+    direction?: Direction | undefined;
+    title?: string | undefined;
+    zoom?: 'disabled' | 'enabled' | 'enable-on-click' | undefined;
+    relations?: string[] | undefined;
+    maxDepth?: number | undefined;
+    kinds?: string[] | undefined;
+    unidirectional?: boolean | undefined;
+    mergeRelations?: boolean | undefined;
+    relationPairs?: [string, string][] | undefined;
+  },
+  objectUtil.extendShape<
+    objectUtil.extendShape<
+      {
+        filter: ZodOptional<ZodString>;
+      },
+      {
+        title: ZodOptional<ZodString>;
+        height: ZodOptional<ZodNumber>;
+      }
+    >,
+    {
+      kinds: ZodOptional<ZodArray<ZodString, 'many'>>;
+      relations: ZodOptional<ZodArray<ZodString, 'many'>>;
+      maxDepth: ZodOptional<ZodNumber>;
+      unidirectional: ZodOptional<ZodBoolean>;
+      mergeRelations: ZodOptional<ZodBoolean>;
+      direction: ZodOptional<ZodNativeEnum<typeof Direction>>;
+      relationPairs: ZodOptional<
+        ZodArray<ZodTuple<[ZodString, ZodString], null>, 'many'>
+      >;
+      zoom: ZodOptional<ZodEnum<['enabled', 'disabled', 'enable-on-click']>>;
+      curve: ZodOptional<ZodEnum<['curveStepBefore', 'curveMonotoneX']>>;
+    }
+  >,
+  {
+    filter?: string | undefined;
+    height?: number | undefined;
+    curve?: 'curveStepBefore' | 'curveMonotoneX' | undefined;
+    direction?: Direction | undefined;
+    title?: string | undefined;
+    zoom?: 'disabled' | 'enabled' | 'enable-on-click' | undefined;
+    relations?: string[] | undefined;
+    maxDepth?: number | undefined;
+    kinds?: string[] | undefined;
+    unidirectional?: boolean | undefined;
+    mergeRelations?: boolean | undefined;
+    relationPairs?: [string, string][] | undefined;
+  }
+>;
 
 // @public (undocumented)
 const _default: BackstagePlugin<
@@ -25,5 +93,9 @@ const _default: BackstagePlugin<
 >;
 export default _default;
 
+// Warnings were encountered during analysis:
+//
+// src/alpha.d.ts:6:5 - (ae-forgotten-export) The symbol "Direction" needs to be exported by the entry point alpha.d.ts
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-graph/src/alpha.tsx b/plugins/catalog-graph/src/alpha.tsx
index 6d8429332e..cf663406fa 100644
--- a/plugins/catalog-graph/src/alpha.tsx
+++ b/plugins/catalog-graph/src/alpha.tsx
@@ -24,7 +24,7 @@ import {
   compatWrapper,
   convertLegacyRouteRef,
 } from '@backstage/core-compat-api';
-import { createEntityCardExtension } from '@backstage/plugin-catalog-react/alpha';
+import { EntityCardBlueprint } from '@backstage/plugin-catalog-react/alpha';
 import { catalogGraphRouteRef, catalogEntityRouteRef } from './routes';
 import { Direction } from './components';
 
@@ -46,24 +46,67 @@ function getEntityGraphRelationsConfigSchema(
   });
 }
 
-const CatalogGraphEntityCard = createEntityCardExtension({
+export const CatalogGraphEntityCard = EntityCardBlueprint.make({
   name: 'relations',
-  configSchema: createSchemaFromZod(z =>
-    z
-      .object({
-        // Filter is a config required to all entity cards
-        filter: z.string().optional(),
-        title: z.string().optional(),
-        height: z.number().optional(),
-        // Skipping a "variant" config for now, defaulting to "gridItem" in the component
-        // For more details, see this comment: https://github.com/backstage/backstage/pull/22619#discussion_r1477333252
-      })
-      .merge(getEntityGraphRelationsConfigSchema(z)),
-  ),
-  loader: async ({ config: { filter, ...props } }) =>
-    import('./components/CatalogGraphCard').then(m =>
-      compatWrapper(<m.CatalogGraphCard {...props} />),
-    ),
+  // configSchema: origSchema =>
+  //   createSchemaFromZod(z =>
+  //     z
+  //       .object({
+  //         // Filter is a config required to all entity cards
+  //         // filter: z.string().optional(),
+  //         title: z.string().optional(),
+  //         height: z.number().optional(),
+  //         // Skipping a "variant" config for now, defaulting to "gridItem" in the component
+  //         // For more details, see this comment: https://github.com/backstage/backstage/pull/22619#discussion_r1477333252
+  //       })
+  //       .merge(getEntityGraphRelationsConfigSchema(z))
+  //       .merge(origSchema),
+  //   ),
+
+  // config: {
+  //   schema: ({ z, parent }) =>
+  //     parent
+  //       .merge({
+  //         title: z.string().optional(),
+  //         height: z.number().optional(),
+  //       })
+  //       .merge(getEntityGraphRelationsConfigSchema(z)),
+  // },
+
+  // config: {
+  //   schema: ({ z, parent }) =>
+  //     parent
+  //       .extend({
+  //         title: z.string().optional(),
+  //         height: z.number().optional(),
+  //       })
+  //       .merge(getEntityGraphRelationsConfigSchema(z)),
+  //   // .merge(parent)
+  // },
+
+  // TODO: implement this and check the types. 👋 zod types.
+  config: {
+    schema: {
+      title: z => z.string().optional(),
+      height: z => z.number().optional(),
+    },
+  },
+
+  // config: {
+  //   schema: z => ({
+  //     title: z.string().optional(),
+  //     height: z.number().optional(),
+  //   }),
+  // },
+
+  factory(origFactory, { config: { filter: _, ...props } }) {
+    return origFactory({
+      loader: async () =>
+        import('./components/CatalogGraphCard').then(m =>
+          compatWrapper(<m.CatalogGraphCard {...props} />),
+        ),
+    });
+  },
 });
 
 const CatalogGraphPage = createPageExtension({
diff --git a/plugins/catalog-react/api-report-alpha.md b/plugins/catalog-react/api-report-alpha.md
index d2bfb29458..ccf8205f59 100644
--- a/plugins/catalog-react/api-report-alpha.md
+++ b/plugins/catalog-react/api-report-alpha.md
@@ -3,17 +3,20 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="react" />
-
 import { AnyExtensionInputMap } from '@backstage/frontend-plugin-api';
 import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { ExtensionBlueprint } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { PortableSchema } from '@backstage/frontend-plugin-api';
+import { default as React_2 } from 'react';
 import { ResolvedExtensionInputs } from '@backstage/frontend-plugin-api';
 import { ResourcePermission } from '@backstage/plugin-permission-common';
 import { RouteRef } from '@backstage/frontend-plugin-api';
 import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { ZodOptional } from 'zod';
+import { ZodRawShape } from 'zod';
+import { ZodString } from 'zod';
 
 // @alpha (undocumented)
 export const catalogExtensionData: {
@@ -115,7 +118,7 @@ export function createEntityCardExtension<
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }) => Promise<JSX.Element>;
-}): ExtensionDefinition<TConfig>;
+}): ExtensionDefinition<TConfig, ZodRawShape>;
 
 // @alpha (undocumented)
 export function createEntityContentExtension<
@@ -138,11 +141,48 @@ export function createEntityContentExtension<
   loader: (options: {
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }) => Promise<JSX.Element>;
-}): ExtensionDefinition<{
-  title: string;
-  path: string;
-  filter?: string | undefined;
-}>;
+}): ExtensionDefinition<
+  {
+    title: string;
+    path: string;
+    filter?: string | undefined;
+  },
+  ZodRawShape
+>;
+
+// @alpha (undocumented)
+export const EntityCardBlueprint: ExtensionBlueprint<
+  {
+    filter?: string | ((entity: Entity) => boolean) | undefined;
+    loader: () => Promise<JSX.Element>;
+  },
+  AnyExtensionInputMap,
+  {
+    element: ConfigurableExtensionDataRef<
+      'core.reactElement',
+      React_2.JSX.Element,
+      {}
+    >;
+    filterFunction: ConfigurableExtensionDataRef<
+      'catalog.entity-filter-function',
+      (entity: Entity) => boolean,
+      ((entity: Entity) => boolean) & {
+        optional: true;
+      }
+    >;
+    filterExpression: ConfigurableExtensionDataRef<
+      'catalog.entity-filter-expression',
+      string,
+      string & {
+        optional: true;
+      }
+    >;
+  },
+  {
+    filter: ZodOptional<ZodString>;
+  },
+  never
+>;
 
 // @alpha
 export function isOwnerOf(owner: Entity, entity: Entity): boolean;
diff --git a/plugins/catalog-react/src/alpha.tsx b/plugins/catalog-react/src/alpha.tsx
index e81b8e5ebf..f397c76ce0 100644
--- a/plugins/catalog-react/src/alpha.tsx
+++ b/plugins/catalog-react/src/alpha.tsx
@@ -22,6 +22,7 @@ import {
   RouteRef,
   coreExtensionData,
   createExtension,
+  createExtensionBlueprint,
   createExtensionDataRef,
   createSchemaFromZod,
 } from '@backstage/frontend-plugin-api';
@@ -47,6 +48,49 @@ export const catalogExtensionData = {
   }),
 };
 
+/** @alpha */
+export const EntityCardBlueprint = createExtensionBlueprint({
+  kind: 'entity-card',
+  attachTo: { id: 'entity-content:catalog/overview', input: 'cards' },
+  // configSchema: createSchemaFromZod(z =>
+  //   z.object({
+  //     filter: z.string().optional(),
+  //   }),
+  // ),
+  config: {
+    schema: {
+      filter: z => z.string().optional(),
+    },
+  },
+  output: {
+    element: coreExtensionData.reactElement,
+    filterFunction: catalogExtensionData.entityFilterFunction.optional(),
+    filterExpression: catalogExtensionData.entityFilterExpression.optional(),
+  },
+  factory(
+    params: {
+      filter?:
+        | typeof catalogExtensionData.entityFilterFunction.T
+        | typeof catalogExtensionData.entityFilterExpression.T;
+      loader: () => Promise<JSX.Element>;
+    },
+    { node, config },
+  ) {
+    const ExtensionComponent = lazy(() =>
+      params.loader().then(element => ({ default: () => element })),
+    );
+
+    return {
+      element: (
+        <ExtensionBoundary node={node}>
+          <ExtensionComponent />
+        </ExtensionBoundary>
+      ),
+      ...mergeFilters({ config, options: params }),
+    };
+  },
+});
+
 // TODO: Figure out how to merge with provided config schema
 /** @alpha */
 export function createEntityCardExtension<
@@ -154,6 +198,13 @@ export function createEntityContentExtension<
         filter: z.string().optional(),
       }),
     ),
+    // config: {
+    //   schema: ({ z }) => ({
+    //     path: z.string().default(options.defaultPath),
+    //     title: z.string().default(options.defaultTitle),
+    //     filter: z.string().optional(),
+    //   }),
+    // },
     factory({ config, inputs, node }) {
       const ExtensionComponent = lazy(() =>
         options
diff --git a/plugins/catalog/api-report-alpha.md b/plugins/catalog/api-report-alpha.md
index 102e2a7aa3..03711b7d3d 100644
--- a/plugins/catalog/api-report-alpha.md
+++ b/plugins/catalog/api-report-alpha.md
@@ -12,6 +12,39 @@ import { ExternalRouteRef } from '@backstage/frontend-plugin-api';
 import { PortableSchema } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
 import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { ZodObject } from 'zod';
+
+// Warning: (ae-missing-release-tag) "catalogAboutEntityCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const catalogAboutEntityCard: ExtensionDefinition<
+  {
+    filter?: string | undefined;
+  },
+  ZodObject<any, any, any, any, any>
+>;
+
+// Warning: (ae-missing-release-tag) "catalogLinksEntityCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const catalogLinksEntityCard: ExtensionDefinition<
+  {
+    filter?: string | undefined;
+  },
+  ZodObject<any, any, any, any, any>
+>;
+
+// Warning: (ae-missing-release-tag) "catalogOverviewEntityContent" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const catalogOverviewEntityContent: ExtensionDefinition<
+  {
+    title: string;
+    path: string;
+    filter?: string | undefined;
+  },
+  ZodObject<any, any, any, any, any>
+>;
 
 // @alpha (undocumented)
 export const catalogTranslationRef: TranslationRef<
@@ -106,7 +139,7 @@ export function createCatalogFilterExtension<
   inputs?: TInputs;
   configSchema?: PortableSchema<TConfig>;
   loader: (options: { config: TConfig }) => Promise<JSX.Element>;
-}): ExtensionDefinition<TConfig>;
+}): ExtensionDefinition<TConfig, ZodObject<any, any, any, any, any>>;
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
diff --git a/plugins/catalog/src/alpha/index.ts b/plugins/catalog/src/alpha/index.ts
index 06a78ec6ea..acf61865ba 100644
--- a/plugins/catalog/src/alpha/index.ts
+++ b/plugins/catalog/src/alpha/index.ts
@@ -16,3 +16,5 @@
 
 export { default } from './plugin';
 export { createCatalogFilterExtension } from './createCatalogFilterExtension';
+export { catalogAboutEntityCard, catalogLinksEntityCard } from './entityCards';
+export { catalogOverviewEntityContent } from './entityContents';
diff --git a/plugins/search-react/api-report-alpha.md b/plugins/search-react/api-report-alpha.md
index aea85d0f81..6160759042 100644
--- a/plugins/search-react/api-report-alpha.md
+++ b/plugins/search-react/api-report-alpha.md
@@ -11,6 +11,7 @@ import { ListItemProps } from '@material-ui/core/ListItem';
 import { PortableSchema } from '@backstage/frontend-plugin-api';
 import { SearchDocument } from '@backstage/plugin-search-common';
 import { SearchResult } from '@backstage/plugin-search-common';
+import { ZodObject } from 'zod';
 
 // @alpha (undocumented)
 export type BaseSearchResultListItemProps<T = {}> = T & {
@@ -25,7 +26,7 @@ export function createSearchResultListItemExtension<
   },
 >(
   options: SearchResultItemExtensionOptions<TConfig>,
-): ExtensionDefinition<TConfig>;
+): ExtensionDefinition<TConfig, ZodObject<any, any, any, any, any>>;
 
 // @alpha (undocumented)
 export namespace createSearchResultListItemExtension {
diff --git a/plugins/search/api-report-alpha.md b/plugins/search/api-report-alpha.md
index db2999ba25..ade5f530ef 100644
--- a/plugins/search/api-report-alpha.md
+++ b/plugins/search/api-report-alpha.md
@@ -6,6 +6,7 @@
 import { BackstagePlugin } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
+import { ZodObject } from 'zod';
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
@@ -17,18 +18,27 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const searchApi: ExtensionDefinition<{}>;
+export const searchApi: ExtensionDefinition<
+  {},
+  ZodObject<any, any, any, any, any>
+>;
 
 // @alpha (undocumented)
-export const searchNavItem: ExtensionDefinition<{
-  title: string;
-}>;
+export const searchNavItem: ExtensionDefinition<
+  {
+    title: string;
+  },
+  ZodObject<any, any, any, any, any>
+>;
 
 // @alpha (undocumented)
-export const searchPage: ExtensionDefinition<{
-  path: string;
-  noTrack: boolean;
-}>;
+export const searchPage: ExtensionDefinition<
+  {
+    path: string;
+    noTrack: boolean;
+  },
+  any
+>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/techdocs/api-report-alpha.md b/plugins/techdocs/api-report-alpha.md
index cf9f5fa9a3..fc57370a53 100644
--- a/plugins/techdocs/api-report-alpha.md
+++ b/plugins/techdocs/api-report-alpha.md
@@ -6,6 +6,7 @@
 import { BackstagePlugin } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
+import { ZodObject } from 'zod';
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
@@ -23,13 +24,16 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const techDocsSearchResultListItemExtension: ExtensionDefinition<{
-  lineClamp: number;
-  noTrack: boolean;
-  asListItem: boolean;
-  asLink: boolean;
-  title?: string | undefined;
-}>;
+export const techDocsSearchResultListItemExtension: ExtensionDefinition<
+  {
+    lineClamp: number;
+    noTrack: boolean;
+    asListItem: boolean;
+    asLink: boolean;
+    title?: string | undefined;
+  },
+  ZodObject<any, any, any, any, any>
+>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/user-settings/api-report-alpha.md b/plugins/user-settings/api-report-alpha.md
index b06fd1e583..db4373fd43 100644
--- a/plugins/user-settings/api-report-alpha.md
+++ b/plugins/user-settings/api-report-alpha.md
@@ -7,6 +7,7 @@ import { BackstagePlugin } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
 import { TranslationRef } from '@backstage/core-plugin-api/alpha';
+import { ZodObject } from 'zod';
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
@@ -18,9 +19,12 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const settingsNavItem: ExtensionDefinition<{
-  title: string;
-}>;
+export const settingsNavItem: ExtensionDefinition<
+  {
+    title: string;
+  },
+  ZodObject<any, any, any, any, any>
+>;
 
 // @alpha (undocumented)
 export const userSettingsTranslationRef: TranslationRef<

From 8e387301a4f27c17aa631005a8ec6634f495965b Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 10:56:12 +0200
Subject: [PATCH 172/225] chore: moving things around

Signed-off-by: blam <ben@blam.sh>
---
 .../src/wiring/createExtension.ts             |  13 +-
 .../src/wiring/createExtensionBlueprint.ts    | 125 +++++++++++-------
 2 files changed, 84 insertions(+), 54 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 3733e44957..61223ca8e8 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -82,7 +82,7 @@ export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
-  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
+  TConfigSchema extends { [key: string]: z.ZodTypeAny },
 > {
   kind?: string;
   namespace?: string;
@@ -94,7 +94,9 @@ export interface CreateExtensionOptions<
   /** @deprecated - use `config.schema` instead */
   configSchema?: PortableSchema<TConfig>;
   config?: {
-    schema: TConfigSchema;
+    schema: {
+      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
+    };
   };
   factory(context: {
     node: AppNode;
@@ -104,7 +106,10 @@ export interface CreateExtensionOptions<
 }
 
 /** @public */
-export interface ExtensionDefinition<TConfig, TConfigSchema = {}> {
+export interface ExtensionDefinition<
+  TConfig,
+  TConfigSchema = never /* TODO -> refactor */,
+> {
   $$type: '@backstage/ExtensionDefinition';
   readonly kind?: string;
   readonly namespace?: string;
@@ -153,7 +158,7 @@ export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
-  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
+  TConfigSchema extends { [key: string]: z.ZodTypeAny },
 >(
   options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
 ): ExtensionDefinition<TConfig> {
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 61227c7dc1..9cd5689a95 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -33,7 +33,7 @@ export interface CreateExtensionBlueprintOptions<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
+  TConfigSchema extends { [key: string]: z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap,
 > {
   kind: string;
@@ -43,15 +43,17 @@ export interface CreateExtensionBlueprintOptions<
   inputs?: TInputs;
   output: TOutput;
   config?: {
-    schema: TConfigSchema;
+    schema: {
+      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
+    };
   };
   factory(
     params: TParams,
     context: {
       node: AppNode;
-      config: {
-        [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
-      };
+      config: Expand<{
+        [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+      }>;
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
   ): Expand<ExtensionDataValues<TOutput>>;
@@ -66,7 +68,7 @@ export interface ExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
+  TConfigSchema extends { [key: string]: z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap,
 > {
   dataRefs: TDataRefs;
@@ -77,11 +79,7 @@ export interface ExtensionBlueprint<
    * You must either pass `params` directly, or define a `factory` that can
    * optionally call the original factory with the same params.
    */
-  make<
-    TExtensionConfigSchema extends {
-      [key: string]: (zImpl: typeof z) => z.ZodTypeAny;
-    },
-  >(
+  make<TExtensionConfigSchema extends { [key: string]: z.ZodTypeAny }>(
     args: {
       namespace?: string;
       name?: string;
@@ -90,7 +88,11 @@ export interface ExtensionBlueprint<
       inputs?: TInputs;
       output?: TOutput;
       config?: {
-        schema: TExtensionConfigSchema;
+        schema: {
+          [key in keyof TExtensionConfigSchema]: (
+            zImpl: typeof z,
+          ) => TExtensionConfigSchema[key];
+        };
       };
     } & (
       | {
@@ -98,21 +100,23 @@ export interface ExtensionBlueprint<
             originalFactory: (
               params: TParams,
               context?: {
-                config?: {
-                  [key in keyof TConfigSchema]: z.infer<
-                    ReturnType<TConfigSchema[key]>
-                  >;
-                };
+                config?: Expand<{
+                  [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+                }>;
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
             ) => Expand<ExtensionDataValues<TOutput>>,
             context: {
               node: AppNode;
-              config: {
-                [key in keyof TExtensionConfigSchema]: z.infer<
-                  ReturnType<TExtensionConfigSchema[key]>
-                >;
-              };
+              config: Expand<
+                {
+                  [key in keyof TExtensionConfigSchema]: z.infer<
+                    TExtensionConfigSchema[key]
+                  >;
+                } & {
+                  [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+                }
+              >;
               inputs: Expand<ResolvedExtensionInputs<TInputs>>;
             },
           ): Expand<ExtensionDataValues<TOutput>>;
@@ -124,7 +128,7 @@ export interface ExtensionBlueprint<
   ): ExtensionDefinition<
     {
       [key in keyof TExtensionConfigSchema]: z.infer<
-        ReturnType<TExtensionConfigSchema[key]>
+        TExtensionConfigSchema[key]
       >;
     },
     TExtensionConfigSchema
@@ -138,7 +142,7 @@ class ExtensionBlueprintImpl<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
+  TConfigSchema extends { [key: string]: z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap,
 > {
   constructor(
@@ -156,7 +160,7 @@ class ExtensionBlueprintImpl<
   dataRefs: TDataRefs;
 
   public make<
-    TExtensionConfigSchema extends TConfigSchema = TConfigSchema,
+    TExtensionConfigSchema extends { [key: string]: z.ZodTypeAny },
   >(args: {
     namespace?: string;
     name?: string;
@@ -166,37 +170,45 @@ class ExtensionBlueprintImpl<
     output?: TOutput;
     params?: TParams;
     config?: {
-      schema: TConfigSchema;
+      schema: {
+        [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
+      };
     };
     factory?(
       originalFactory: (
         params: TParams,
         context?: {
-          config?: {
-            [key in keyof TConfigSchema]: z.infer<
-              ReturnType<TConfigSchema[key]>
-            >;
-          };
+          config?: Expand<{
+            [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+          }>;
           inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
         },
       ) => Expand<ExtensionDataValues<TOutput>>,
       context: {
         node: AppNode;
-        config: {
-          [key in keyof TExtensionConfigSchema]: z.infer<
-            ReturnType<TExtensionConfigSchema[key]>
-          >;
-        };
+        config: Expand<
+          {
+            [key in keyof TExtensionConfigSchema]: z.infer<
+              TExtensionConfigSchema[key]
+            >;
+          } & {
+            [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+          }
+        >;
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
       },
     ): Expand<ExtensionDataValues<TOutput>>;
   }): ExtensionDefinition<
-    {
-      [key in keyof TExtensionConfigSchema]: z.infer<
-        ReturnType<TExtensionConfigSchema[key]>
-      >;
-    },
-    TExtensionConfigSchema
+    Expand<
+      {
+        [key in keyof TExtensionConfigSchema]: z.infer<
+          TExtensionConfigSchema[key]
+        >;
+      } & {
+        [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+      }
+    >,
+    Expand<TConfigSchema & TExtensionConfigSchema>
   > {
     return createExtension({
       kind: this.options.kind,
@@ -206,18 +218,31 @@ class ExtensionBlueprintImpl<
       disabled: args.disabled ?? this.options.disabled,
       inputs: args.inputs ?? this.options.inputs,
       output: args.output ?? this.options.output,
-      config: args.config,
+      config: {
+        schema: {
+          ...this.options.config?.schema,
+          ...args.config,
+        } as Expand<
+          {
+            [key in keyof TConfigSchema]: (
+              zImpl: typeof z,
+            ) => TConfigSchema[key];
+          } & {
+            [key in keyof TExtensionConfigSchema]: (
+              zImpl: typeof z,
+            ) => TExtensionConfigSchema[key];
+          }
+        >,
+      },
       factory: ({ node, config, inputs }) => {
         if (args.factory) {
           return args.factory(
             (
               innerParams: TParams,
               innerContext?: {
-                config?: {
-                  [key in keyof TConfigSchema]: z.infer<
-                    ReturnType<TConfigSchema[key]>
-                  >;
-                };
+                config?: Expand<{
+                  [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+                }>;
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
             ) =>
@@ -255,7 +280,7 @@ export function createExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodTypeAny },
+  TConfigSchema extends { [key: string]: z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap = never,
 >(
   options: CreateExtensionBlueprintOptions<
@@ -266,5 +291,5 @@ export function createExtensionBlueprint<
     TDataRefs
   >,
 ): ExtensionBlueprint<TParams, TInputs, TOutput, TConfigSchema, TDataRefs> {
-  return new ExtensionBlueprintImpl(options);
+  return new ExtensionBlueprintImpl(options) as any;
 }

From d22f1316c50da7ea5d767fd23d9c6acf9be9ba07 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 11:25:11 +0200
Subject: [PATCH 173/225] chore: getting somewhere with portable schemas and
 zod types

Signed-off-by: blam <ben@blam.sh>
---
 .../src/wiring/createExtension.ts             |  25 ++--
 .../src/wiring/createExtensionBlueprint.ts    | 120 ++++++++----------
 plugins/catalog-graph/api-report-alpha.md     |  67 +---------
 3 files changed, 75 insertions(+), 137 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 61223ca8e8..6fa3a50634 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -15,7 +15,7 @@
  */
 
 import { AppNode } from '../apis';
-import { PortableSchema } from '../schema';
+import { PortableSchema, createSchemaFromZod } from '../schema';
 import { Expand } from '../types';
 import { ExtensionDataRef } from './createExtensionDataRef';
 import { ExtensionInput } from './createExtensionInput';
@@ -106,10 +106,7 @@ export interface CreateExtensionOptions<
 }
 
 /** @public */
-export interface ExtensionDefinition<
-  TConfig,
-  TConfigSchema = never /* TODO -> refactor */,
-> {
+export interface ExtensionDefinition<TConfig> {
   $$type: '@backstage/ExtensionDefinition';
   readonly kind?: string;
   readonly namespace?: string;
@@ -117,9 +114,6 @@ export interface ExtensionDefinition<
   readonly attachTo: { id: string; input: string };
   readonly disabled: boolean;
   readonly configSchema?: PortableSchema<TConfig>;
-  readonly config?: {
-    schema: TConfigSchema;
-  };
 }
 
 /** @internal */
@@ -162,6 +156,18 @@ export function createExtension<
 >(
   options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
 ): ExtensionDefinition<TConfig> {
+  // TODO: resovle configSchema from either configSchema or config.schema
+  const newConfigSchema = options.config?.schema;
+  const configSchema = newConfigSchema
+    ? createSchemaFromZod(innerZ =>
+        innerZ.object(
+          Object.fromEntries(
+            Object.entries(newConfigSchema).map(([k, v]) => [k, v(innerZ)]),
+          ),
+        ),
+      )
+    : options.configSchema;
+
   return {
     $$type: '@backstage/ExtensionDefinition',
     version: 'v1',
@@ -172,8 +178,7 @@ export function createExtension<
     disabled: options.disabled ?? false,
     inputs: options.inputs ?? {},
     output: options.output,
-    configSchema: options.configSchema,
-    config: options.config,
+    configSchema,
     factory({ inputs, ...rest }) {
       // TODO: Simplify this, but TS wouldn't infer the input type for some reason
       return options.factory({
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 9cd5689a95..c54131622f 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -33,7 +33,7 @@ export interface CreateExtensionBlueprintOptions<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key: string]: z.ZodTypeAny },
+  TConfigSchema extends { [key in string]: z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap,
 > {
   kind: string;
@@ -51,9 +51,9 @@ export interface CreateExtensionBlueprintOptions<
     params: TParams,
     context: {
       node: AppNode;
-      config: Expand<{
+      config: {
         [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
-      }>;
+      };
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
   ): Expand<ExtensionDataValues<TOutput>>;
@@ -68,7 +68,7 @@ export interface ExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key: string]: z.ZodTypeAny },
+  TConfig extends { [key in string]: unknown },
   TDataRefs extends AnyExtensionDataMap,
 > {
   dataRefs: TDataRefs;
@@ -79,7 +79,7 @@ export interface ExtensionBlueprint<
    * You must either pass `params` directly, or define a `factory` that can
    * optionally call the original factory with the same params.
    */
-  make<TExtensionConfigSchema extends { [key: string]: z.ZodTypeAny }>(
+  make<TExtensionConfigSchema extends { [key in string]: z.ZodTypeAny }>(
     args: {
       namespace?: string;
       name?: string;
@@ -100,23 +100,17 @@ export interface ExtensionBlueprint<
             originalFactory: (
               params: TParams,
               context?: {
-                config?: Expand<{
-                  [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
-                }>;
+                config?: TConfig;
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
             ) => Expand<ExtensionDataValues<TOutput>>,
             context: {
               node: AppNode;
-              config: Expand<
-                {
-                  [key in keyof TExtensionConfigSchema]: z.infer<
-                    TExtensionConfigSchema[key]
-                  >;
-                } & {
-                  [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
-                }
-              >;
+              config: {
+                [key in keyof TExtensionConfigSchema]: z.infer<
+                  TExtensionConfigSchema[key]
+                >;
+              } & TConfig;
               inputs: Expand<ResolvedExtensionInputs<TInputs>>;
             },
           ): Expand<ExtensionDataValues<TOutput>>;
@@ -130,8 +124,7 @@ export interface ExtensionBlueprint<
       [key in keyof TExtensionConfigSchema]: z.infer<
         TExtensionConfigSchema[key]
       >;
-    },
-    TExtensionConfigSchema
+    } & TConfig
   >;
 }
 
@@ -142,7 +135,7 @@ class ExtensionBlueprintImpl<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key: string]: z.ZodTypeAny },
+  TConfigSchema extends { [key in string]: z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap,
 > {
   constructor(
@@ -160,7 +153,7 @@ class ExtensionBlueprintImpl<
   dataRefs: TDataRefs;
 
   public make<
-    TExtensionConfigSchema extends { [key: string]: z.ZodTypeAny },
+    TExtensionConfigSchema extends { [key in string]: z.ZodTypeAny },
   >(args: {
     namespace?: string;
     name?: string;
@@ -171,45 +164,53 @@ class ExtensionBlueprintImpl<
     params?: TParams;
     config?: {
       schema: {
-        [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
+        [key in keyof TExtensionConfigSchema]: (
+          zImpl: typeof z,
+        ) => TExtensionConfigSchema[key];
       };
     };
     factory?(
       originalFactory: (
         params: TParams,
         context?: {
-          config?: Expand<{
+          config?: {
             [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
-          }>;
+          };
           inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
         },
       ) => Expand<ExtensionDataValues<TOutput>>,
       context: {
         node: AppNode;
-        config: Expand<
-          {
-            [key in keyof TExtensionConfigSchema]: z.infer<
-              TExtensionConfigSchema[key]
-            >;
-          } & {
-            [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
-          }
-        >;
+        config: {
+          [key in keyof TExtensionConfigSchema]: z.infer<
+            TExtensionConfigSchema[key]
+          >;
+        } & {
+          [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+        };
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
       },
     ): Expand<ExtensionDataValues<TOutput>>;
   }): ExtensionDefinition<
-    Expand<
-      {
-        [key in keyof TExtensionConfigSchema]: z.infer<
-          TExtensionConfigSchema[key]
-        >;
-      } & {
-        [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
-      }
-    >,
-    Expand<TConfigSchema & TExtensionConfigSchema>
+    {
+      [key in keyof TExtensionConfigSchema]: z.infer<
+        TExtensionConfigSchema[key]
+      >;
+    } & {
+      [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+    }
   > {
+    const schema = {
+      ...this.options.config?.schema,
+      ...args.config,
+    } as {
+      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
+    } & {
+      [key in keyof TExtensionConfigSchema]: (
+        zImpl: typeof z,
+      ) => TExtensionConfigSchema[key];
+    };
+
     return createExtension({
       kind: this.options.kind,
       namespace: args.namespace ?? this.options.namespace,
@@ -218,31 +219,16 @@ class ExtensionBlueprintImpl<
       disabled: args.disabled ?? this.options.disabled,
       inputs: args.inputs ?? this.options.inputs,
       output: args.output ?? this.options.output,
-      config: {
-        schema: {
-          ...this.options.config?.schema,
-          ...args.config,
-        } as Expand<
-          {
-            [key in keyof TConfigSchema]: (
-              zImpl: typeof z,
-            ) => TConfigSchema[key];
-          } & {
-            [key in keyof TExtensionConfigSchema]: (
-              zImpl: typeof z,
-            ) => TExtensionConfigSchema[key];
-          }
-        >,
-      },
+      config: Object.keys(schema).length === 0 ? undefined : { schema },
       factory: ({ node, config, inputs }) => {
         if (args.factory) {
           return args.factory(
             (
               innerParams: TParams,
               innerContext?: {
-                config?: Expand<{
+                config?: {
                   [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
-                }>;
+                };
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
             ) =>
@@ -280,7 +266,7 @@ export function createExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key: string]: z.ZodTypeAny },
+  TConfigSchema extends { [key in string]: z.ZodTypeAny },
   TDataRefs extends AnyExtensionDataMap = never,
 >(
   options: CreateExtensionBlueprintOptions<
@@ -290,6 +276,12 @@ export function createExtensionBlueprint<
     TConfigSchema,
     TDataRefs
   >,
-): ExtensionBlueprint<TParams, TInputs, TOutput, TConfigSchema, TDataRefs> {
-  return new ExtensionBlueprintImpl(options) as any;
+): ExtensionBlueprint<
+  TParams,
+  TInputs,
+  TOutput,
+  { [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]> },
+  TDataRefs
+> {
+  return new ExtensionBlueprintImpl(options);
 }
diff --git a/plugins/catalog-graph/api-report-alpha.md b/plugins/catalog-graph/api-report-alpha.md
index afd03965ae..59a387adf0 100644
--- a/plugins/catalog-graph/api-report-alpha.md
+++ b/plugins/catalog-graph/api-report-alpha.md
@@ -6,72 +6,17 @@
 import { BackstagePlugin } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { ExternalRouteRef } from '@backstage/frontend-plugin-api';
-import { objectUtil } from 'zod';
 import { RouteRef } from '@backstage/frontend-plugin-api';
-import { ZodArray } from 'zod';
-import { ZodBoolean } from 'zod';
-import { ZodEnum } from 'zod';
-import { ZodNativeEnum } from 'zod';
-import { ZodNumber } from 'zod';
-import { ZodOptional } from 'zod';
-import { ZodString } from 'zod';
-import { ZodTuple } from 'zod';
 
 // Warning: (ae-missing-release-tag) "CatalogGraphEntityCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const CatalogGraphEntityCard: ExtensionDefinition<
   {
-    filter?: string | undefined;
-    height?: number | undefined;
-    curve?: 'curveStepBefore' | 'curveMonotoneX' | undefined;
-    direction?: Direction | undefined;
-    title?: string | undefined;
-    zoom?: 'disabled' | 'enabled' | 'enable-on-click' | undefined;
-    relations?: string[] | undefined;
-    maxDepth?: number | undefined;
-    kinds?: string[] | undefined;
-    unidirectional?: boolean | undefined;
-    mergeRelations?: boolean | undefined;
-    relationPairs?: [string, string][] | undefined;
-  },
-  objectUtil.extendShape<
-    objectUtil.extendShape<
-      {
-        filter: ZodOptional<ZodString>;
-      },
-      {
-        title: ZodOptional<ZodString>;
-        height: ZodOptional<ZodNumber>;
-      }
-    >,
-    {
-      kinds: ZodOptional<ZodArray<ZodString, 'many'>>;
-      relations: ZodOptional<ZodArray<ZodString, 'many'>>;
-      maxDepth: ZodOptional<ZodNumber>;
-      unidirectional: ZodOptional<ZodBoolean>;
-      mergeRelations: ZodOptional<ZodBoolean>;
-      direction: ZodOptional<ZodNativeEnum<typeof Direction>>;
-      relationPairs: ZodOptional<
-        ZodArray<ZodTuple<[ZodString, ZodString], null>, 'many'>
-      >;
-      zoom: ZodOptional<ZodEnum<['enabled', 'disabled', 'enable-on-click']>>;
-      curve: ZodOptional<ZodEnum<['curveStepBefore', 'curveMonotoneX']>>;
-    }
-  >,
-  {
-    filter?: string | undefined;
-    height?: number | undefined;
-    curve?: 'curveStepBefore' | 'curveMonotoneX' | undefined;
-    direction?: Direction | undefined;
-    title?: string | undefined;
-    zoom?: 'disabled' | 'enabled' | 'enable-on-click' | undefined;
-    relations?: string[] | undefined;
-    maxDepth?: number | undefined;
-    kinds?: string[] | undefined;
-    unidirectional?: boolean | undefined;
-    mergeRelations?: boolean | undefined;
-    relationPairs?: [string, string][] | undefined;
+    title: string | undefined;
+    height: number | undefined;
+  } & {
+    filter: string | undefined;
   }
 >;
 
@@ -93,9 +38,5 @@ const _default: BackstagePlugin<
 >;
 export default _default;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:6:5 - (ae-forgotten-export) The symbol "Direction" needs to be exported by the entry point alpha.d.ts
-
 // (No @packageDocumentation comment for this package)
 ```

From cac9c3f851221bebef7ae9a3a0b6cc3b816eb9a3 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 11:48:07 +0200
Subject: [PATCH 174/225] chore: added some tests

Signed-off-by: blam <ben@blam.sh>
---
 .../src/schema/createSchemaFromZod.ts         |  5 +-
 .../src/wiring/createExtension.test.ts        | 62 ++++++++++++++++++
 .../src/wiring/createExtension.ts             | 17 +++--
 .../wiring/createExtensionBlueprint.test.tsx  | 65 +++++++++++++++++++
 .../src/wiring/createExtensionBlueprint.ts    | 12 ++--
 5 files changed, 149 insertions(+), 12 deletions(-)

diff --git a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
index bfaf57f522..c69ef5dc60 100644
--- a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
+++ b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
@@ -19,7 +19,10 @@ import { z, ZodSchema, ZodTypeDef } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 import { PortableSchema } from './types';
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use the `config.schema` option of `createExtension` instead, or use `createExtensionBlueprint`.
+ */
 export function createSchemaFromZod<TOutput, TInput>(
   schemaCreator: (zImpl: typeof z) => ZodSchema<TOutput, ZodTypeDef, TInput>,
 ): PortableSchema<TOutput> {
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index 4323737540..468da21eb7 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -291,4 +291,66 @@ describe('createExtension', () => {
       'ExtensionDefinition{namespace=test,attachTo=root@default}',
     );
   });
+
+  it('should create an extension with config', () => {
+    const extension = createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      config: {
+        schema: {
+          foo: z => z.string(),
+          bar: z => z.string().default('bar'),
+          baz: z => z.string().optional(),
+        },
+      },
+      output: {
+        foo: stringData,
+      },
+      factory({ config }) {
+        const a1: string = config.foo;
+        const a2: string = config.bar;
+        // @ts-expect-error
+        const a3: string = config.baz;
+        // @ts-expect-error
+        const c1: number = config.foo;
+        // @ts-expect-error
+        const c2: number = config.bar;
+        // @ts-expect-error
+        const c3: number = config.baz;
+        unused(a1, a2, a3, c1, c2, c3);
+
+        return {
+          foo: 'bar',
+        };
+      },
+    });
+    expect(extension.namespace).toBe('test');
+    expect(String(extension)).toBe(
+      'ExtensionDefinition{namespace=test,attachTo=root@default}',
+    );
+
+    expect(
+      extension.configSchema?.parse({
+        foo: 'x',
+        bar: 'y',
+        baz: 'z',
+        qux: 'w',
+      }),
+    ).toEqual({
+      foo: 'x',
+      bar: 'y',
+      baz: 'z',
+    });
+    expect(
+      extension.configSchema?.parse({
+        foo: 'x',
+      }),
+    ).toEqual({
+      foo: 'x',
+      bar: 'bar',
+    });
+    expect(() => extension.configSchema?.parse({})).toThrow(
+      "Missing required value at 'foo'",
+    );
+  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 6fa3a50634..7783f8e14d 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -82,7 +82,7 @@ export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
-  TConfigSchema extends { [key: string]: z.ZodTypeAny },
+  TConfigSchema extends { [key: string]: z.ZodType },
 > {
   kind?: string;
   namespace?: string;
@@ -100,7 +100,9 @@ export interface CreateExtensionOptions<
   };
   factory(context: {
     node: AppNode;
-    config: TConfig;
+    config: TConfig & {
+      [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+    };
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }): Expand<ExtensionDataValues<TOutput>>;
 }
@@ -152,12 +154,14 @@ export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
-  TConfigSchema extends { [key: string]: z.ZodTypeAny },
+  TConfigSchema extends { [key: string]: z.ZodType },
 >(
   options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
 ): ExtensionDefinition<TConfig> {
-  // TODO: resovle configSchema from either configSchema or config.schema
   const newConfigSchema = options.config?.schema;
+  if (newConfigSchema && options.configSchema) {
+    throw new Error(`Cannot provide both configSchema and config.schema`);
+  }
   const configSchema = newConfigSchema
     ? createSchemaFromZod(innerZ =>
         innerZ.object(
@@ -179,10 +183,13 @@ export function createExtension<
     inputs: options.inputs ?? {},
     output: options.output,
     configSchema,
-    factory({ inputs, ...rest }) {
+    factory({ inputs, config, ...rest }) {
       // TODO: Simplify this, but TS wouldn't infer the input type for some reason
       return options.factory({
         inputs: inputs as Expand<ResolvedExtensionInputs<TInputs>>,
+        config: config as TConfig & {
+          [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+        },
         ...rest,
       });
     },
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index d2373518a3..cf7de0fed3 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -20,6 +20,8 @@ import { createExtensionBlueprint } from './createExtensionBlueprint';
 import { createExtensionTester } from '@backstage/frontend-test-utils';
 import { createExtensionDataRef } from './createExtensionDataRef';
 
+function unused(..._any: any[]) {}
+
 describe('createExtensionBlueprint', () => {
   it('should allow creation of extension blueprints', () => {
     const TestExtensionBlueprint = createExtensionBlueprint({
@@ -124,4 +126,67 @@ describe('createExtensionBlueprint', () => {
       data: dataRef,
     });
   });
+
+  it('should allow defining a config schema with additional properties in the instance', () => {
+    const TestExtensionBlueprint = createExtensionBlueprint({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      config: {
+        schema: {
+          text: z => z.string(),
+        },
+      },
+      factory(_, { config }) {
+        // @ts-expect-error
+        const b = config.something;
+
+        const a: string = config.text;
+        unused(a);
+
+        expect(config.text).toBe('Hello, world!');
+
+        return {
+          element: <h1>{config.text}</h1>,
+        };
+      },
+    });
+
+    const extension = TestExtensionBlueprint.make({
+      name: 'my-extension',
+      params: {
+        text: 'Hello, world!',
+      },
+      config: {
+        schema: {
+          something: z => z.string(),
+          defaulted: z => z.string().optional().default('default'),
+        },
+      },
+      factory(origFactory, { config }) {
+        const b: string = config.something;
+        const c: string = config.text;
+        const d: string = config.defaulted;
+
+        unused(b, c, d);
+
+        expect(config.text).toBe('Hello, world!');
+        expect(config.something).toBe('something new!');
+        expect(config.defaulted).toBe('lolz');
+        return origFactory({});
+      },
+    });
+
+    expect.assertions(4);
+
+    createExtensionTester(extension, {
+      config: {
+        something: 'something new!',
+        text: 'Hello, world!',
+        defaulted: 'lolz',
+      },
+    }).render();
+  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index c54131622f..56edcd8141 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -33,7 +33,7 @@ export interface CreateExtensionBlueprintOptions<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key in string]: z.ZodTypeAny },
+  TConfigSchema extends { [key in string]: z.ZodType },
   TDataRefs extends AnyExtensionDataMap,
 > {
   kind: string;
@@ -79,7 +79,7 @@ export interface ExtensionBlueprint<
    * You must either pass `params` directly, or define a `factory` that can
    * optionally call the original factory with the same params.
    */
-  make<TExtensionConfigSchema extends { [key in string]: z.ZodTypeAny }>(
+  make<TExtensionConfigSchema extends { [key in string]: z.ZodType }>(
     args: {
       namespace?: string;
       name?: string;
@@ -135,7 +135,7 @@ class ExtensionBlueprintImpl<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key in string]: z.ZodTypeAny },
+  TConfigSchema extends { [key in string]: z.ZodType },
   TDataRefs extends AnyExtensionDataMap,
 > {
   constructor(
@@ -153,7 +153,7 @@ class ExtensionBlueprintImpl<
   dataRefs: TDataRefs;
 
   public make<
-    TExtensionConfigSchema extends { [key in string]: z.ZodTypeAny },
+    TExtensionConfigSchema extends { [key in string]: z.ZodType },
   >(args: {
     namespace?: string;
     name?: string;
@@ -202,7 +202,7 @@ class ExtensionBlueprintImpl<
   > {
     const schema = {
       ...this.options.config?.schema,
-      ...args.config,
+      ...args.config?.schema,
     } as {
       [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
     } & {
@@ -266,7 +266,7 @@ export function createExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key in string]: z.ZodTypeAny },
+  TConfigSchema extends { [key in string]: z.ZodType },
   TDataRefs extends AnyExtensionDataMap = never,
 >(
   options: CreateExtensionBlueprintOptions<

From 97157c547052fdd46e86c1a28f6c99387a3f89d7 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 11:51:52 +0200
Subject: [PATCH 175/225] chore: do not allow redefing types from blueprint in
 make config schema

Signed-off-by: blam <ben@blam.sh>
---
 .../wiring/createExtensionBlueprint.test.tsx  | 36 +++++++++++++++++++
 .../src/wiring/createExtensionBlueprint.ts    |  2 ++
 2 files changed, 38 insertions(+)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index cf7de0fed3..209e9759bd 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -189,4 +189,40 @@ describe('createExtensionBlueprint', () => {
       },
     }).render();
   });
+
+  it('should not allow overlapping config keys', () => {
+    const TestExtensionBlueprint = createExtensionBlueprint({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      config: {
+        schema: {
+          text: z => z.string(),
+        },
+      },
+      factory(params: { text: string }) {
+        return {
+          element: <div>{params.text}</div>,
+        };
+      },
+    });
+
+    TestExtensionBlueprint.make({
+      name: 'my-extension',
+      params: {
+        text: 'Hello, world!',
+      },
+      config: {
+        schema: {
+          // @ts-expect-error
+          text: z => z.number(),
+          something: z => z.string(),
+        },
+      },
+    });
+
+    expect('test').toBe('test');
+  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 56edcd8141..21c10f3c0e 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -92,6 +92,8 @@ export interface ExtensionBlueprint<
           [key in keyof TExtensionConfigSchema]: (
             zImpl: typeof z,
           ) => TExtensionConfigSchema[key];
+        } & {
+          [key in keyof TConfig]?: never;
         };
       };
     } & (

From e59ff0b2bc1b637df7b476dc323aa44d7e92ca37 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 12:06:53 +0200
Subject: [PATCH 176/225] chore: tidy up

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-plugin-api/api-report.md    | 121 ++++++++++++------
 .../src/extensions/IconBundleBlueprint.ts     |  36 ------
 .../src/app/createExtensionTester.tsx         |   4 +-
 plugins/catalog-graph/api-report-alpha.md     |  13 --
 plugins/catalog-graph/src/alpha.tsx           |  79 +++---------
 plugins/catalog-react/api-report-alpha.md     |  56 ++------
 plugins/catalog-react/src/alpha.tsx           |  51 --------
 plugins/catalog/api-report-alpha.md           |  35 +----
 plugins/catalog/src/alpha/index.ts            |   2 -
 plugins/search-react/api-report-alpha.md      |   3 +-
 plugins/search/api-report-alpha.md            |  26 ++--
 plugins/techdocs/api-report-alpha.md          |  18 +--
 plugins/user-settings/api-report-alpha.md     |  10 +-
 13 files changed, 130 insertions(+), 324 deletions(-)

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 0c7c3b1d92..33ac02437c 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -89,7 +89,6 @@ import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import { vmwareCloudAuthApiRef } from '@backstage/core-plugin-api';
 import { withApis } from '@backstage/core-plugin-api';
 import { z } from 'zod';
-import { ZodObject } from 'zod';
 import { ZodSchema } from 'zod';
 import { ZodTypeDef } from 'zod';
 
@@ -392,7 +391,7 @@ export function createApiExtension<
     configSchema?: PortableSchema<TConfig>;
     inputs?: TInputs;
   },
-): ExtensionDefinition<TConfig, ZodObject<any, any, any, any, any>>;
+): ExtensionDefinition<TConfig>;
 
 // @public (undocumented)
 export namespace createApiExtension {
@@ -488,7 +487,7 @@ export function createComponentExtension<
           inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         }) => ComponentType<TProps>;
       };
-}): ExtensionDefinition<TConfig, ZodObject<any, any, any, any, any>>;
+}): ExtensionDefinition<TConfig>;
 
 // @public (undocumented)
 export namespace createComponentExtension {
@@ -512,35 +511,49 @@ export function createComponentRef<T extends {} = {}>(options: {
 export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
-  TConfigSchema extends z.ZodObject<any, any, any, any, any>,
-  TConfig extends z.infer<TConfigSchema>,
+  TConfig,
+  TConfigSchema extends {
+    [key: string]: z.ZodType;
+  },
 >(
-  options: CreateExtensionOptions<TOutput, TInputs, TConfigSchema, TConfig>,
-): ExtensionDefinition<TConfig, TConfigSchema>;
+  options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
+): ExtensionDefinition<TConfig>;
 
 // @public
 export function createExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfig,
+  TConfigSchema extends {
+    [key in string]: z.ZodType;
+  },
   TDataRefs extends AnyExtensionDataMap = never,
 >(
   options: CreateExtensionBlueprintOptions<
     TParams,
     TInputs,
     TOutput,
-    TConfig,
+    TConfigSchema,
     TDataRefs
   >,
-): ExtensionBlueprint<TParams, TInputs, TOutput, TConfig, TDataRefs>;
+): ExtensionBlueprint<
+  TParams,
+  TInputs,
+  TOutput,
+  {
+    [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+  },
+  TDataRefs
+>;
 
 // @public (undocumented)
 export interface CreateExtensionBlueprintOptions<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfig,
+  TConfigSchema extends {
+    [key in string]: z.ZodType;
+  },
   TDataRefs extends AnyExtensionDataMap,
 > {
   // (undocumented)
@@ -549,7 +562,11 @@ export interface CreateExtensionBlueprintOptions<
     input: string;
   };
   // (undocumented)
-  configSchema?: PortableSchema<TConfig>;
+  config?: {
+    schema: {
+      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
+    };
+  };
   // (undocumented)
   dataRefs?: TDataRefs;
   // (undocumented)
@@ -559,7 +576,9 @@ export interface CreateExtensionBlueprintOptions<
     params: TParams,
     context: {
       node: AppNode;
-      config: TConfig;
+      config: {
+        [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+      };
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
   ): Expand<ExtensionDataValues<TOutput>>;
@@ -607,8 +626,10 @@ export function createExtensionInput<
 export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
-  TConfigSchema extends z.ZodObject<any, any, any, any, any>,
-  TConfig extends z.infer<TConfigSchema>,
+  TConfig,
+  TConfigSchema extends {
+    [key: string]: z.ZodType;
+  },
 > {
   // (undocumented)
   attachTo: {
@@ -617,7 +638,9 @@ export interface CreateExtensionOptions<
   };
   // (undocumented)
   config?: {
-    schema: (context: { z: typeof z }) => TConfigSchema;
+    schema: {
+      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
+    };
   };
   // @deprecated (undocumented)
   configSchema?: PortableSchema<TConfig>;
@@ -626,7 +649,9 @@ export interface CreateExtensionOptions<
   // (undocumented)
   factory(context: {
     node: AppNode;
-    config: TConfig;
+    config: TConfig & {
+      [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+    };
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }): Expand<ExtensionDataValues<TOutput>>;
   // (undocumented)
@@ -679,12 +704,9 @@ export function createNavItemExtension(options: {
   routeRef: RouteRef<undefined>;
   title: string;
   icon: IconComponent_2;
-}): ExtensionDefinition<
-  {
-    title: string;
-  },
-  ZodObject<any, any, any, any, any>
->;
+}): ExtensionDefinition<{
+  title: string;
+}>;
 
 // @public (undocumented)
 export namespace createNavItemExtension {
@@ -706,7 +728,7 @@ export function createNavLogoExtension(options: {
   namespace?: string;
   logoIcon: JSX.Element;
   logoFull: JSX.Element;
-}): ExtensionDefinition<any, ZodObject<any, any, any, any, any>>;
+}): ExtensionDefinition<unknown>;
 
 // @public (undocumented)
 export namespace createNavLogoExtension {
@@ -814,7 +836,7 @@ export namespace createRouterExtension {
     >;
 }
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export function createSchemaFromZod<TOutput, TInput>(
   schemaCreator: (zImpl: typeof z) => ZodSchema<TOutput, ZodTypeDef, TInput>,
 ): PortableSchema<TOutput>;
@@ -861,7 +883,7 @@ export function createSubRouteRef<
 // @public (undocumented)
 export function createThemeExtension(
   theme: AppTheme,
-): ExtensionDefinition<any, ZodObject<any, any, any, any, any>>;
+): ExtensionDefinition<unknown>;
 
 // @public (undocumented)
 export namespace createThemeExtension {
@@ -877,7 +899,7 @@ export namespace createThemeExtension {
 export function createTranslationExtension(options: {
   name?: string;
   resource: TranslationResource | TranslationMessages;
-}): ExtensionDefinition<any, ZodObject<any, any, any, any, any>>;
+}): ExtensionDefinition<unknown>;
 
 // @public (undocumented)
 export namespace createTranslationExtension {
@@ -936,12 +958,18 @@ export interface ExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfig,
+  TConfig extends {
+    [key in string]: unknown;
+  },
   TDataRefs extends AnyExtensionDataMap,
 > {
   // (undocumented)
   dataRefs: TDataRefs;
-  make(
+  make<
+    TExtensionConfigSchema extends {
+      [key in string]: z.ZodType;
+    },
+  >(
     args: {
       namespace?: string;
       name?: string;
@@ -952,7 +980,15 @@ export interface ExtensionBlueprint<
       disabled?: boolean;
       inputs?: TInputs;
       output?: TOutput;
-      configSchema?: PortableSchema<TConfig>;
+      config?: {
+        schema: {
+          [key in keyof TExtensionConfigSchema]: (
+            zImpl: typeof z,
+          ) => TExtensionConfigSchema[key];
+        } & {
+          [key in keyof TConfig]?: never;
+        };
+      };
     } & (
       | {
           factory(
@@ -965,7 +1001,11 @@ export interface ExtensionBlueprint<
             ) => Expand<ExtensionDataValues<TOutput>>,
             context: {
               node: AppNode;
-              config: TConfig;
+              config: {
+                [key in keyof TExtensionConfigSchema]: z.infer<
+                  TExtensionConfigSchema[key]
+                >;
+              } & TConfig;
               inputs: Expand<ResolvedExtensionInputs<TInputs>>;
             },
           ): Expand<ExtensionDataValues<TOutput>>;
@@ -974,7 +1014,13 @@ export interface ExtensionBlueprint<
           params: TParams;
         }
     ),
-  ): ExtensionDefinition<TConfig>;
+  ): ExtensionDefinition<
+    {
+      [key in keyof TExtensionConfigSchema]: z.infer<
+        TExtensionConfigSchema[key]
+      >;
+    } & TConfig
+  >;
 }
 
 // @public (undocumented)
@@ -1021,10 +1067,7 @@ export type ExtensionDataValues<TExtensionData extends AnyExtensionDataMap> = {
 };
 
 // @public (undocumented)
-export interface ExtensionDefinition<
-  TConfig,
-  TConfigSchema extends z.ZodObject<any, any, any, any, any> = any,
-> {
+export interface ExtensionDefinition<TConfig> {
   // (undocumented)
   $$type: '@backstage/ExtensionDefinition';
   // (undocumented)
@@ -1035,8 +1078,6 @@ export interface ExtensionDefinition<
   // (undocumented)
   readonly configSchema?: PortableSchema<TConfig>;
   // (undocumented)
-  readonly configSchema2?: TConfigSchema;
-  // (undocumented)
   readonly disabled: boolean;
   // (undocumented)
   readonly kind?: string;
@@ -1134,7 +1175,9 @@ export const IconBundleBlueprint: ExtensionBlueprint<
       {}
     >;
   },
-  unknown,
+  {
+    [x: string]: any;
+  },
   {
     icons: ConfigurableExtensionDataRef<
       'core.icons',
diff --git a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
index aba3303f2f..2ad1404102 100644
--- a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
+++ b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
@@ -33,39 +33,3 @@ export const IconBundleBlueprint = createExtensionBlueprint({
     icons: iconsDataRef,
   },
 });
-
-IconBundleBlueprint.make({
-  name: 'asd',
-  params: {
-    icons: {
-      'icon-name': () => null,
-    },
-  },
-});
-
-IconBundleBlueprint.make({
-  name: 'asd',
-  params: {
-    icons: {
-      'icon-name': () => null,
-    },
-  },
-});
-
-IconBundleBlueprint.make({
-  name: 'asd',
-  factory() {
-    return {
-      icons: {
-        'icon-name': () => null,
-      },
-    };
-  },
-});
-
-IconBundleBlueprint.make({
-  name: 'asd',
-  factory(f) {
-    return f({ icons: { 'icon-name': () => null } });
-  },
-});
diff --git a/packages/frontend-test-utils/src/app/createExtensionTester.tsx b/packages/frontend-test-utils/src/app/createExtensionTester.tsx
index d6be346002..a98879fbba 100644
--- a/packages/frontend-test-utils/src/app/createExtensionTester.tsx
+++ b/packages/frontend-test-utils/src/app/createExtensionTester.tsx
@@ -102,11 +102,11 @@ export class ExtensionTester {
         ...output,
         path: coreExtensionData.routePath,
       },
-      factory: (params: any) => ({
+      factory: params => ({
         ...factory(params),
         path: '/',
       }),
-    } as any);
+    });
     tester.add(extension, options);
     return tester;
   }
diff --git a/plugins/catalog-graph/api-report-alpha.md b/plugins/catalog-graph/api-report-alpha.md
index 59a387adf0..3895f12fcf 100644
--- a/plugins/catalog-graph/api-report-alpha.md
+++ b/plugins/catalog-graph/api-report-alpha.md
@@ -4,22 +4,9 @@
 
 ```ts
 import { BackstagePlugin } from '@backstage/frontend-plugin-api';
-import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { ExternalRouteRef } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
 
-// Warning: (ae-missing-release-tag) "CatalogGraphEntityCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const CatalogGraphEntityCard: ExtensionDefinition<
-  {
-    title: string | undefined;
-    height: number | undefined;
-  } & {
-    filter: string | undefined;
-  }
->;
-
 // @public (undocumented)
 const _default: BackstagePlugin<
   {
diff --git a/plugins/catalog-graph/src/alpha.tsx b/plugins/catalog-graph/src/alpha.tsx
index cf663406fa..6d8429332e 100644
--- a/plugins/catalog-graph/src/alpha.tsx
+++ b/plugins/catalog-graph/src/alpha.tsx
@@ -24,7 +24,7 @@ import {
   compatWrapper,
   convertLegacyRouteRef,
 } from '@backstage/core-compat-api';
-import { EntityCardBlueprint } from '@backstage/plugin-catalog-react/alpha';
+import { createEntityCardExtension } from '@backstage/plugin-catalog-react/alpha';
 import { catalogGraphRouteRef, catalogEntityRouteRef } from './routes';
 import { Direction } from './components';
 
@@ -46,67 +46,24 @@ function getEntityGraphRelationsConfigSchema(
   });
 }
 
-export const CatalogGraphEntityCard = EntityCardBlueprint.make({
+const CatalogGraphEntityCard = createEntityCardExtension({
   name: 'relations',
-  // configSchema: origSchema =>
-  //   createSchemaFromZod(z =>
-  //     z
-  //       .object({
-  //         // Filter is a config required to all entity cards
-  //         // filter: z.string().optional(),
-  //         title: z.string().optional(),
-  //         height: z.number().optional(),
-  //         // Skipping a "variant" config for now, defaulting to "gridItem" in the component
-  //         // For more details, see this comment: https://github.com/backstage/backstage/pull/22619#discussion_r1477333252
-  //       })
-  //       .merge(getEntityGraphRelationsConfigSchema(z))
-  //       .merge(origSchema),
-  //   ),
-
-  // config: {
-  //   schema: ({ z, parent }) =>
-  //     parent
-  //       .merge({
-  //         title: z.string().optional(),
-  //         height: z.number().optional(),
-  //       })
-  //       .merge(getEntityGraphRelationsConfigSchema(z)),
-  // },
-
-  // config: {
-  //   schema: ({ z, parent }) =>
-  //     parent
-  //       .extend({
-  //         title: z.string().optional(),
-  //         height: z.number().optional(),
-  //       })
-  //       .merge(getEntityGraphRelationsConfigSchema(z)),
-  //   // .merge(parent)
-  // },
-
-  // TODO: implement this and check the types. 👋 zod types.
-  config: {
-    schema: {
-      title: z => z.string().optional(),
-      height: z => z.number().optional(),
-    },
-  },
-
-  // config: {
-  //   schema: z => ({
-  //     title: z.string().optional(),
-  //     height: z.number().optional(),
-  //   }),
-  // },
-
-  factory(origFactory, { config: { filter: _, ...props } }) {
-    return origFactory({
-      loader: async () =>
-        import('./components/CatalogGraphCard').then(m =>
-          compatWrapper(<m.CatalogGraphCard {...props} />),
-        ),
-    });
-  },
+  configSchema: createSchemaFromZod(z =>
+    z
+      .object({
+        // Filter is a config required to all entity cards
+        filter: z.string().optional(),
+        title: z.string().optional(),
+        height: z.number().optional(),
+        // Skipping a "variant" config for now, defaulting to "gridItem" in the component
+        // For more details, see this comment: https://github.com/backstage/backstage/pull/22619#discussion_r1477333252
+      })
+      .merge(getEntityGraphRelationsConfigSchema(z)),
+  ),
+  loader: async ({ config: { filter, ...props } }) =>
+    import('./components/CatalogGraphCard').then(m =>
+      compatWrapper(<m.CatalogGraphCard {...props} />),
+    ),
 });
 
 const CatalogGraphPage = createPageExtension({
diff --git a/plugins/catalog-react/api-report-alpha.md b/plugins/catalog-react/api-report-alpha.md
index ccf8205f59..d2bfb29458 100644
--- a/plugins/catalog-react/api-report-alpha.md
+++ b/plugins/catalog-react/api-report-alpha.md
@@ -3,20 +3,17 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="react" />
+
 import { AnyExtensionInputMap } from '@backstage/frontend-plugin-api';
 import { ConfigurableExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { ExtensionBlueprint } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { PortableSchema } from '@backstage/frontend-plugin-api';
-import { default as React_2 } from 'react';
 import { ResolvedExtensionInputs } from '@backstage/frontend-plugin-api';
 import { ResourcePermission } from '@backstage/plugin-permission-common';
 import { RouteRef } from '@backstage/frontend-plugin-api';
 import { TranslationRef } from '@backstage/core-plugin-api/alpha';
-import { ZodOptional } from 'zod';
-import { ZodRawShape } from 'zod';
-import { ZodString } from 'zod';
 
 // @alpha (undocumented)
 export const catalogExtensionData: {
@@ -118,7 +115,7 @@ export function createEntityCardExtension<
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }) => Promise<JSX.Element>;
-}): ExtensionDefinition<TConfig, ZodRawShape>;
+}): ExtensionDefinition<TConfig>;
 
 // @alpha (undocumented)
 export function createEntityContentExtension<
@@ -141,48 +138,11 @@ export function createEntityContentExtension<
   loader: (options: {
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }) => Promise<JSX.Element>;
-}): ExtensionDefinition<
-  {
-    title: string;
-    path: string;
-    filter?: string | undefined;
-  },
-  ZodRawShape
->;
-
-// @alpha (undocumented)
-export const EntityCardBlueprint: ExtensionBlueprint<
-  {
-    filter?: string | ((entity: Entity) => boolean) | undefined;
-    loader: () => Promise<JSX.Element>;
-  },
-  AnyExtensionInputMap,
-  {
-    element: ConfigurableExtensionDataRef<
-      'core.reactElement',
-      React_2.JSX.Element,
-      {}
-    >;
-    filterFunction: ConfigurableExtensionDataRef<
-      'catalog.entity-filter-function',
-      (entity: Entity) => boolean,
-      ((entity: Entity) => boolean) & {
-        optional: true;
-      }
-    >;
-    filterExpression: ConfigurableExtensionDataRef<
-      'catalog.entity-filter-expression',
-      string,
-      string & {
-        optional: true;
-      }
-    >;
-  },
-  {
-    filter: ZodOptional<ZodString>;
-  },
-  never
->;
+}): ExtensionDefinition<{
+  title: string;
+  path: string;
+  filter?: string | undefined;
+}>;
 
 // @alpha
 export function isOwnerOf(owner: Entity, entity: Entity): boolean;
diff --git a/plugins/catalog-react/src/alpha.tsx b/plugins/catalog-react/src/alpha.tsx
index f397c76ce0..e81b8e5ebf 100644
--- a/plugins/catalog-react/src/alpha.tsx
+++ b/plugins/catalog-react/src/alpha.tsx
@@ -22,7 +22,6 @@ import {
   RouteRef,
   coreExtensionData,
   createExtension,
-  createExtensionBlueprint,
   createExtensionDataRef,
   createSchemaFromZod,
 } from '@backstage/frontend-plugin-api';
@@ -48,49 +47,6 @@ export const catalogExtensionData = {
   }),
 };
 
-/** @alpha */
-export const EntityCardBlueprint = createExtensionBlueprint({
-  kind: 'entity-card',
-  attachTo: { id: 'entity-content:catalog/overview', input: 'cards' },
-  // configSchema: createSchemaFromZod(z =>
-  //   z.object({
-  //     filter: z.string().optional(),
-  //   }),
-  // ),
-  config: {
-    schema: {
-      filter: z => z.string().optional(),
-    },
-  },
-  output: {
-    element: coreExtensionData.reactElement,
-    filterFunction: catalogExtensionData.entityFilterFunction.optional(),
-    filterExpression: catalogExtensionData.entityFilterExpression.optional(),
-  },
-  factory(
-    params: {
-      filter?:
-        | typeof catalogExtensionData.entityFilterFunction.T
-        | typeof catalogExtensionData.entityFilterExpression.T;
-      loader: () => Promise<JSX.Element>;
-    },
-    { node, config },
-  ) {
-    const ExtensionComponent = lazy(() =>
-      params.loader().then(element => ({ default: () => element })),
-    );
-
-    return {
-      element: (
-        <ExtensionBoundary node={node}>
-          <ExtensionComponent />
-        </ExtensionBoundary>
-      ),
-      ...mergeFilters({ config, options: params }),
-    };
-  },
-});
-
 // TODO: Figure out how to merge with provided config schema
 /** @alpha */
 export function createEntityCardExtension<
@@ -198,13 +154,6 @@ export function createEntityContentExtension<
         filter: z.string().optional(),
       }),
     ),
-    // config: {
-    //   schema: ({ z }) => ({
-    //     path: z.string().default(options.defaultPath),
-    //     title: z.string().default(options.defaultTitle),
-    //     filter: z.string().optional(),
-    //   }),
-    // },
     factory({ config, inputs, node }) {
       const ExtensionComponent = lazy(() =>
         options
diff --git a/plugins/catalog/api-report-alpha.md b/plugins/catalog/api-report-alpha.md
index 03711b7d3d..102e2a7aa3 100644
--- a/plugins/catalog/api-report-alpha.md
+++ b/plugins/catalog/api-report-alpha.md
@@ -12,39 +12,6 @@ import { ExternalRouteRef } from '@backstage/frontend-plugin-api';
 import { PortableSchema } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
 import { TranslationRef } from '@backstage/core-plugin-api/alpha';
-import { ZodObject } from 'zod';
-
-// Warning: (ae-missing-release-tag) "catalogAboutEntityCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const catalogAboutEntityCard: ExtensionDefinition<
-  {
-    filter?: string | undefined;
-  },
-  ZodObject<any, any, any, any, any>
->;
-
-// Warning: (ae-missing-release-tag) "catalogLinksEntityCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const catalogLinksEntityCard: ExtensionDefinition<
-  {
-    filter?: string | undefined;
-  },
-  ZodObject<any, any, any, any, any>
->;
-
-// Warning: (ae-missing-release-tag) "catalogOverviewEntityContent" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const catalogOverviewEntityContent: ExtensionDefinition<
-  {
-    title: string;
-    path: string;
-    filter?: string | undefined;
-  },
-  ZodObject<any, any, any, any, any>
->;
 
 // @alpha (undocumented)
 export const catalogTranslationRef: TranslationRef<
@@ -139,7 +106,7 @@ export function createCatalogFilterExtension<
   inputs?: TInputs;
   configSchema?: PortableSchema<TConfig>;
   loader: (options: { config: TConfig }) => Promise<JSX.Element>;
-}): ExtensionDefinition<TConfig, ZodObject<any, any, any, any, any>>;
+}): ExtensionDefinition<TConfig>;
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
diff --git a/plugins/catalog/src/alpha/index.ts b/plugins/catalog/src/alpha/index.ts
index acf61865ba..06a78ec6ea 100644
--- a/plugins/catalog/src/alpha/index.ts
+++ b/plugins/catalog/src/alpha/index.ts
@@ -16,5 +16,3 @@
 
 export { default } from './plugin';
 export { createCatalogFilterExtension } from './createCatalogFilterExtension';
-export { catalogAboutEntityCard, catalogLinksEntityCard } from './entityCards';
-export { catalogOverviewEntityContent } from './entityContents';
diff --git a/plugins/search-react/api-report-alpha.md b/plugins/search-react/api-report-alpha.md
index 6160759042..aea85d0f81 100644
--- a/plugins/search-react/api-report-alpha.md
+++ b/plugins/search-react/api-report-alpha.md
@@ -11,7 +11,6 @@ import { ListItemProps } from '@material-ui/core/ListItem';
 import { PortableSchema } from '@backstage/frontend-plugin-api';
 import { SearchDocument } from '@backstage/plugin-search-common';
 import { SearchResult } from '@backstage/plugin-search-common';
-import { ZodObject } from 'zod';
 
 // @alpha (undocumented)
 export type BaseSearchResultListItemProps<T = {}> = T & {
@@ -26,7 +25,7 @@ export function createSearchResultListItemExtension<
   },
 >(
   options: SearchResultItemExtensionOptions<TConfig>,
-): ExtensionDefinition<TConfig, ZodObject<any, any, any, any, any>>;
+): ExtensionDefinition<TConfig>;
 
 // @alpha (undocumented)
 export namespace createSearchResultListItemExtension {
diff --git a/plugins/search/api-report-alpha.md b/plugins/search/api-report-alpha.md
index ade5f530ef..db2999ba25 100644
--- a/plugins/search/api-report-alpha.md
+++ b/plugins/search/api-report-alpha.md
@@ -6,7 +6,6 @@
 import { BackstagePlugin } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
-import { ZodObject } from 'zod';
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
@@ -18,27 +17,18 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const searchApi: ExtensionDefinition<
-  {},
-  ZodObject<any, any, any, any, any>
->;
+export const searchApi: ExtensionDefinition<{}>;
 
 // @alpha (undocumented)
-export const searchNavItem: ExtensionDefinition<
-  {
-    title: string;
-  },
-  ZodObject<any, any, any, any, any>
->;
+export const searchNavItem: ExtensionDefinition<{
+  title: string;
+}>;
 
 // @alpha (undocumented)
-export const searchPage: ExtensionDefinition<
-  {
-    path: string;
-    noTrack: boolean;
-  },
-  any
->;
+export const searchPage: ExtensionDefinition<{
+  path: string;
+  noTrack: boolean;
+}>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/techdocs/api-report-alpha.md b/plugins/techdocs/api-report-alpha.md
index fc57370a53..cf9f5fa9a3 100644
--- a/plugins/techdocs/api-report-alpha.md
+++ b/plugins/techdocs/api-report-alpha.md
@@ -6,7 +6,6 @@
 import { BackstagePlugin } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
-import { ZodObject } from 'zod';
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
@@ -24,16 +23,13 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const techDocsSearchResultListItemExtension: ExtensionDefinition<
-  {
-    lineClamp: number;
-    noTrack: boolean;
-    asListItem: boolean;
-    asLink: boolean;
-    title?: string | undefined;
-  },
-  ZodObject<any, any, any, any, any>
->;
+export const techDocsSearchResultListItemExtension: ExtensionDefinition<{
+  lineClamp: number;
+  noTrack: boolean;
+  asListItem: boolean;
+  asLink: boolean;
+  title?: string | undefined;
+}>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/user-settings/api-report-alpha.md b/plugins/user-settings/api-report-alpha.md
index db4373fd43..b06fd1e583 100644
--- a/plugins/user-settings/api-report-alpha.md
+++ b/plugins/user-settings/api-report-alpha.md
@@ -7,7 +7,6 @@ import { BackstagePlugin } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/frontend-plugin-api';
 import { TranslationRef } from '@backstage/core-plugin-api/alpha';
-import { ZodObject } from 'zod';
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
@@ -19,12 +18,9 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const settingsNavItem: ExtensionDefinition<
-  {
-    title: string;
-  },
-  ZodObject<any, any, any, any, any>
->;
+export const settingsNavItem: ExtensionDefinition<{
+  title: string;
+}>;
 
 // @alpha (undocumented)
 export const userSettingsTranslationRef: TranslationRef<

From 3fb421d1b05281ffdbdfbb42ceb5554931a0aa2f Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 12:48:49 +0200
Subject: [PATCH 177/225] chore: added changeset

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

diff --git a/.changeset/sweet-oranges-buy.md b/.changeset/sweet-oranges-buy.md
new file mode 100644
index 0000000000..d9f3343e3d
--- /dev/null
+++ b/.changeset/sweet-oranges-buy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/frontend-plugin-api': patch
+---
+
+Added support to be able to define `zod` config schema in Blueprints, with built in schema merging from the Blueprint and the extension instances.

From e9673327852493d196430c0c4eddf12e2effe8bb Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 13:40:43 +0200
Subject: [PATCH 178/225] chore: small refactor and fixing some of the types

Signed-off-by: blam <ben@blam.sh>
---
 packages/frontend-plugin-api/api-report.md    | 51 +++++------
 .../src/wiring/createExtension.ts             | 12 ++-
 .../wiring/createExtensionBlueprint.test.tsx  | 49 +++++++++++
 .../src/wiring/createExtensionBlueprint.ts    | 86 ++++++++++---------
 4 files changed, 122 insertions(+), 76 deletions(-)

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 33ac02437c..45ed51b415 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -513,7 +513,7 @@ export function createExtension<
   TInputs extends AnyExtensionInputMap,
   TConfig,
   TConfigSchema extends {
-    [key: string]: z.ZodType;
+    [key: string]: (zImpl: typeof z) => z.ZodType;
   },
 >(
   options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
@@ -525,7 +525,7 @@ export function createExtensionBlueprint<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfigSchema extends {
-    [key in string]: z.ZodType;
+    [key in string]: (zImpl: typeof z) => z.ZodType;
   },
   TDataRefs extends AnyExtensionDataMap = never,
 >(
@@ -540,9 +540,11 @@ export function createExtensionBlueprint<
   TParams,
   TInputs,
   TOutput,
-  {
-    [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
-  },
+  string extends keyof TConfigSchema
+    ? {}
+    : {
+        [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+      },
   TDataRefs
 >;
 
@@ -552,7 +554,7 @@ export interface CreateExtensionBlueprintOptions<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfigSchema extends {
-    [key in string]: z.ZodType;
+    [key in string]: (zImpl: typeof z) => z.ZodType;
   },
   TDataRefs extends AnyExtensionDataMap,
 > {
@@ -563,9 +565,7 @@ export interface CreateExtensionBlueprintOptions<
   };
   // (undocumented)
   config?: {
-    schema: {
-      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
-    };
+    schema: TConfigSchema;
   };
   // (undocumented)
   dataRefs?: TDataRefs;
@@ -577,7 +577,7 @@ export interface CreateExtensionBlueprintOptions<
     context: {
       node: AppNode;
       config: {
-        [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+        [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
       };
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
@@ -628,7 +628,7 @@ export interface CreateExtensionOptions<
   TInputs extends AnyExtensionInputMap,
   TConfig,
   TConfigSchema extends {
-    [key: string]: z.ZodType;
+    [key: string]: (zImpl: typeof z) => z.ZodType;
   },
 > {
   // (undocumented)
@@ -638,9 +638,7 @@ export interface CreateExtensionOptions<
   };
   // (undocumented)
   config?: {
-    schema: {
-      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
-    };
+    schema: TConfigSchema;
   };
   // @deprecated (undocumented)
   configSchema?: PortableSchema<TConfig>;
@@ -650,7 +648,7 @@ export interface CreateExtensionOptions<
   factory(context: {
     node: AppNode;
     config: TConfig & {
-      [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+      [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
     };
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }): Expand<ExtensionDataValues<TOutput>>;
@@ -967,7 +965,7 @@ export interface ExtensionBlueprint<
   dataRefs: TDataRefs;
   make<
     TExtensionConfigSchema extends {
-      [key in string]: z.ZodType;
+      [key in string]: (zImpl: typeof z) => z.ZodType;
     },
   >(
     args: {
@@ -981,12 +979,9 @@ export interface ExtensionBlueprint<
       inputs?: TInputs;
       output?: TOutput;
       config?: {
-        schema: {
-          [key in keyof TExtensionConfigSchema]: (
-            zImpl: typeof z,
-          ) => TExtensionConfigSchema[key];
-        } & {
-          [key in keyof TConfig]?: never;
+        schema: TExtensionConfigSchema & {
+          [KName in keyof TConfig]?: `Error: Config key '${KName &
+            string}' is already defined in parent schema`;
         };
       };
     } & (
@@ -1001,11 +996,11 @@ export interface ExtensionBlueprint<
             ) => Expand<ExtensionDataValues<TOutput>>,
             context: {
               node: AppNode;
-              config: {
+              config: TConfig & {
                 [key in keyof TExtensionConfigSchema]: z.infer<
-                  TExtensionConfigSchema[key]
+                  ReturnType<TExtensionConfigSchema[key]>
                 >;
-              } & TConfig;
+              };
               inputs: Expand<ResolvedExtensionInputs<TInputs>>;
             },
           ): Expand<ExtensionDataValues<TOutput>>;
@@ -1017,7 +1012,7 @@ export interface ExtensionBlueprint<
   ): ExtensionDefinition<
     {
       [key in keyof TExtensionConfigSchema]: z.infer<
-        TExtensionConfigSchema[key]
+        ReturnType<TExtensionConfigSchema[key]>
       >;
     } & TConfig
   >;
@@ -1175,9 +1170,7 @@ export const IconBundleBlueprint: ExtensionBlueprint<
       {}
     >;
   },
-  {
-    [x: string]: any;
-  },
+  {},
   {
     icons: ConfigurableExtensionDataRef<
       'core.icons',
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 7783f8e14d..ac91557906 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -82,7 +82,7 @@ export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
-  TConfigSchema extends { [key: string]: z.ZodType },
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
 > {
   kind?: string;
   namespace?: string;
@@ -94,14 +94,12 @@ export interface CreateExtensionOptions<
   /** @deprecated - use `config.schema` instead */
   configSchema?: PortableSchema<TConfig>;
   config?: {
-    schema: {
-      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
-    };
+    schema: TConfigSchema;
   };
   factory(context: {
     node: AppNode;
     config: TConfig & {
-      [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+      [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
     };
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }): Expand<ExtensionDataValues<TOutput>>;
@@ -154,7 +152,7 @@ export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
-  TConfigSchema extends { [key: string]: z.ZodType },
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
 >(
   options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
 ): ExtensionDefinition<TConfig> {
@@ -188,7 +186,7 @@ export function createExtension<
       return options.factory({
         inputs: inputs as Expand<ResolvedExtensionInputs<TInputs>>,
         config: config as TConfig & {
-          [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
         },
         ...rest,
       });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index 209e9759bd..cb8855d892 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -225,4 +225,53 @@ describe('createExtensionBlueprint', () => {
 
     expect('test').toBe('test');
   });
+
+  it('should allow setting config when one was not already defined in the blueprint', () => {
+    const TestExtensionBlueprint = createExtensionBlueprint({
+      kind: 'test-extension',
+      attachTo: { id: 'test', input: 'default' },
+      output: {
+        element: coreExtensionData.reactElement,
+      },
+      factory(_, { config }) {
+        // @ts-expect-error
+        const b = config.something;
+
+        return {
+          element: <div />,
+        };
+      },
+    });
+
+    const extension = TestExtensionBlueprint.make({
+      name: 'my-extension',
+      params: {
+        text: 'Hello, world!',
+      },
+      config: {
+        schema: {
+          something: z => z.string(),
+          defaulted: z => z.string().optional().default('default'),
+        },
+      },
+      factory(origFactory, { config }) {
+        const b: string = config.something;
+
+        unused(b);
+
+        expect(config.something).toBe('something new!');
+        expect(config.defaulted).toBe('lolz');
+        return origFactory({});
+      },
+    });
+
+    expect.assertions(2);
+
+    createExtensionTester(extension, {
+      config: {
+        something: 'something new!',
+        defaulted: 'lolz',
+      },
+    }).render();
+  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 21c10f3c0e..ce3e650342 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -33,7 +33,7 @@ export interface CreateExtensionBlueprintOptions<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key in string]: z.ZodType },
+  TConfigSchema extends { [key in string]: (zImpl: typeof z) => z.ZodType },
   TDataRefs extends AnyExtensionDataMap,
 > {
   kind: string;
@@ -43,16 +43,14 @@ export interface CreateExtensionBlueprintOptions<
   inputs?: TInputs;
   output: TOutput;
   config?: {
-    schema: {
-      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
-    };
+    schema: TConfigSchema;
   };
   factory(
     params: TParams,
     context: {
       node: AppNode;
       config: {
-        [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+        [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
       };
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
@@ -79,7 +77,11 @@ export interface ExtensionBlueprint<
    * You must either pass `params` directly, or define a `factory` that can
    * optionally call the original factory with the same params.
    */
-  make<TExtensionConfigSchema extends { [key in string]: z.ZodType }>(
+  make<
+    TExtensionConfigSchema extends {
+      [key in string]: (zImpl: typeof z) => z.ZodType;
+    },
+  >(
     args: {
       namespace?: string;
       name?: string;
@@ -88,12 +90,9 @@ export interface ExtensionBlueprint<
       inputs?: TInputs;
       output?: TOutput;
       config?: {
-        schema: {
-          [key in keyof TExtensionConfigSchema]: (
-            zImpl: typeof z,
-          ) => TExtensionConfigSchema[key];
-        } & {
-          [key in keyof TConfig]?: never;
+        schema: TExtensionConfigSchema & {
+          [KName in keyof TConfig]?: `Error: Config key '${KName &
+            string}' is already defined in parent schema`;
         };
       };
     } & (
@@ -108,11 +107,11 @@ export interface ExtensionBlueprint<
             ) => Expand<ExtensionDataValues<TOutput>>,
             context: {
               node: AppNode;
-              config: {
+              config: TConfig & {
                 [key in keyof TExtensionConfigSchema]: z.infer<
-                  TExtensionConfigSchema[key]
+                  ReturnType<TExtensionConfigSchema[key]>
                 >;
-              } & TConfig;
+              };
               inputs: Expand<ResolvedExtensionInputs<TInputs>>;
             },
           ): Expand<ExtensionDataValues<TOutput>>;
@@ -124,7 +123,7 @@ export interface ExtensionBlueprint<
   ): ExtensionDefinition<
     {
       [key in keyof TExtensionConfigSchema]: z.infer<
-        TExtensionConfigSchema[key]
+        ReturnType<TExtensionConfigSchema[key]>
       >;
     } & TConfig
   >;
@@ -137,7 +136,7 @@ class ExtensionBlueprintImpl<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key in string]: z.ZodType },
+  TConfigSchema extends { [key in string]: (zImpl: typeof z) => z.ZodType },
   TDataRefs extends AnyExtensionDataMap,
 > {
   constructor(
@@ -155,7 +154,9 @@ class ExtensionBlueprintImpl<
   dataRefs: TDataRefs;
 
   public make<
-    TExtensionConfigSchema extends { [key in string]: z.ZodType },
+    TExtensionConfigSchema extends {
+      [key in string]: (zImpl: typeof z) => z.ZodType;
+    },
   >(args: {
     namespace?: string;
     name?: string;
@@ -165,18 +166,16 @@ class ExtensionBlueprintImpl<
     output?: TOutput;
     params?: TParams;
     config?: {
-      schema: {
-        [key in keyof TExtensionConfigSchema]: (
-          zImpl: typeof z,
-        ) => TExtensionConfigSchema[key];
-      };
+      schema: TExtensionConfigSchema;
     };
     factory?(
       originalFactory: (
         params: TParams,
         context?: {
           config?: {
-            [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+            [key in keyof TConfigSchema]: z.infer<
+              ReturnType<TConfigSchema[key]>
+            >;
           };
           inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
         },
@@ -185,10 +184,10 @@ class ExtensionBlueprintImpl<
         node: AppNode;
         config: {
           [key in keyof TExtensionConfigSchema]: z.infer<
-            TExtensionConfigSchema[key]
+            ReturnType<TExtensionConfigSchema[key]>
           >;
         } & {
-          [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
         };
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
       },
@@ -196,23 +195,16 @@ class ExtensionBlueprintImpl<
   }): ExtensionDefinition<
     {
       [key in keyof TExtensionConfigSchema]: z.infer<
-        TExtensionConfigSchema[key]
+        ReturnType<TExtensionConfigSchema[key]>
       >;
     } & {
-      [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+      [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
     }
   > {
     const schema = {
       ...this.options.config?.schema,
       ...args.config?.schema,
-    } as {
-      [key in keyof TConfigSchema]: (zImpl: typeof z) => TConfigSchema[key];
-    } & {
-      [key in keyof TExtensionConfigSchema]: (
-        zImpl: typeof z,
-      ) => TExtensionConfigSchema[key];
-    };
-
+    } as TConfigSchema & TExtensionConfigSchema;
     return createExtension({
       kind: this.options.kind,
       namespace: args.namespace ?? this.options.namespace,
@@ -229,7 +221,9 @@ class ExtensionBlueprintImpl<
               innerParams: TParams,
               innerContext?: {
                 config?: {
-                  [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]>;
+                  [key in keyof TConfigSchema]: z.infer<
+                    ReturnType<TConfigSchema[key]>
+                  >;
                 };
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
@@ -268,7 +262,7 @@ export function createExtensionBlueprint<
   TParams,
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
-  TConfigSchema extends { [key in string]: z.ZodType },
+  TConfigSchema extends { [key in string]: (zImpl: typeof z) => z.ZodType },
   TDataRefs extends AnyExtensionDataMap = never,
 >(
   options: CreateExtensionBlueprintOptions<
@@ -282,8 +276,20 @@ export function createExtensionBlueprint<
   TParams,
   TInputs,
   TOutput,
-  { [key in keyof TConfigSchema]: z.infer<TConfigSchema[key]> },
+  string extends keyof TConfigSchema
+    ? {}
+    : { [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>> },
   TDataRefs
 > {
-  return new ExtensionBlueprintImpl(options);
+  return new ExtensionBlueprintImpl(options) as ExtensionBlueprint<
+    TParams,
+    TInputs,
+    TOutput,
+    string extends keyof TConfigSchema
+      ? {}
+      : {
+          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+        },
+    TDataRefs
+  >;
 }

From 0ad542cbc7e144c45feb4c2b20babebae9a5c60d Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 14:36:22 +0200
Subject: [PATCH 179/225] feat: added input types for the config to the
 extensions

Signed-off-by: blam <ben@blam.sh>
---
 .../src/collectLegacyRoutes.tsx               |   4 +-
 .../extractRouteInfoFromAppNode.test.ts       |   2 +-
 .../src/tree/createAppTree.ts                 |   2 +-
 .../src/tree/instantiateAppNodeTree.test.ts   |  14 +--
 .../src/tree/resolveAppTree.test.ts           |   4 +-
 packages/frontend-plugin-api/api-report.md    | 102 +++++++++++++-----
 .../src/apis/definitions/AppTreeApi.ts        |   2 +-
 .../src/extensions/IconBundleBlueprint.ts     |   6 ++
 .../src/schema/createSchemaFromZod.test.ts    |  15 ++-
 .../src/schema/createSchemaFromZod.ts         |   2 +-
 .../frontend-plugin-api/src/schema/types.ts   |   4 +-
 .../src/wiring/createExtension.test.ts        |   8 +-
 .../src/wiring/createExtension.ts             |  78 +++++++++++---
 .../src/wiring/createExtensionBlueprint.ts    |  38 ++++++-
 .../src/wiring/createExtensionOverrides.ts    |   2 +-
 .../src/wiring/createPlugin.ts                |   2 +-
 .../src/wiring/resolveExtensionDefinition.ts  |  23 ++--
 packages/frontend-test-utils/api-report.md    |   6 +-
 .../src/app/createExtensionTester.tsx         |  14 +--
 plugins/catalog-react/api-report-alpha.md     |  19 ++--
 plugins/catalog/api-report-alpha.md           |   4 +-
 .../alpha/createCatalogFilterExtension.tsx    |   2 +-
 plugins/search-react/api-report-alpha.md      |   2 +-
 plugins/search/api-report-alpha.md            |  27 +++--
 plugins/techdocs/api-report-alpha.md          |  23 ++--
 plugins/user-settings/api-report-alpha.md     |  11 +-
 26 files changed, 300 insertions(+), 116 deletions(-)

diff --git a/packages/core-compat-api/src/collectLegacyRoutes.tsx b/packages/core-compat-api/src/collectLegacyRoutes.tsx
index b9f4e5528c..3523b0a40b 100644
--- a/packages/core-compat-api/src/collectLegacyRoutes.tsx
+++ b/packages/core-compat-api/src/collectLegacyRoutes.tsx
@@ -101,7 +101,7 @@ function visitRouteChildren(options: {
   parentExtensionId: string;
   context: {
     pluginId: string;
-    extensions: ExtensionDefinition<unknown>[];
+    extensions: ExtensionDefinition<any, any>[];
     getUniqueName: () => string;
     discoverPlugin: (plugin: LegacyBackstagePlugin) => void;
   };
@@ -154,7 +154,7 @@ export function collectLegacyRoutes(
 ): BackstagePlugin[] {
   const pluginExtensions = new Map<
     LegacyBackstagePlugin,
-    ExtensionDefinition<unknown>[]
+    ExtensionDefinition<any, any>[]
   >();
 
   const getUniqueName = (() => {
diff --git a/packages/frontend-app-api/src/routing/extractRouteInfoFromAppNode.test.ts b/packages/frontend-app-api/src/routing/extractRouteInfoFromAppNode.test.ts
index 1c332b331f..bdab2781e0 100644
--- a/packages/frontend-app-api/src/routing/extractRouteInfoFromAppNode.test.ts
+++ b/packages/frontend-app-api/src/routing/extractRouteInfoFromAppNode.test.ts
@@ -70,7 +70,7 @@ function createTestExtension(options: {
   });
 }
 
-function routeInfoFromExtensions(extensions: ExtensionDefinition<unknown>[]) {
+function routeInfoFromExtensions(extensions: ExtensionDefinition<any, any>[]) {
   const plugin = createPlugin({
     id: 'test',
     extensions,
diff --git a/packages/frontend-app-api/src/tree/createAppTree.ts b/packages/frontend-app-api/src/tree/createAppTree.ts
index 12c7f7fc3a..ee9704c3c3 100644
--- a/packages/frontend-app-api/src/tree/createAppTree.ts
+++ b/packages/frontend-app-api/src/tree/createAppTree.ts
@@ -25,7 +25,7 @@ import { instantiateAppNodeTree } from './instantiateAppNodeTree';
 /** @internal */
 export interface CreateAppTreeOptions {
   features: FrontendFeature[];
-  builtinExtensions: Extension<unknown>[];
+  builtinExtensions: Extension<any, any>[];
   config: Config;
 }
 
diff --git a/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts b/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
index c5c66e8319..a82c8d99ee 100644
--- a/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
+++ b/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
@@ -59,22 +59,22 @@ const simpleExtension = resolveExtensionDefinition(
   }),
 );
 
-function makeSpec<TConfig>(
-  extension: Extension<TConfig>,
+function makeSpec<TConfig, TConfigInput>(
+  extension: Extension<TConfig, TConfigInput>,
   spec?: Partial<AppNodeSpec>,
 ): AppNodeSpec {
   return {
     id: extension.id,
     attachTo: extension.attachTo,
     disabled: extension.disabled,
-    extension,
+    extension: extension as Extension<unknown, unknown>,
     source: undefined,
     ...spec,
   };
 }
 
-function makeNode<TConfig>(
-  extension: Extension<TConfig>,
+function makeNode<TConfig, TConfigInput>(
+  extension: Extension<TConfig, TConfigInput>,
   spec?: Partial<AppNodeSpec>,
 ): AppNode {
   return {
@@ -85,8 +85,8 @@ function makeNode<TConfig>(
   };
 }
 
-function makeInstanceWithId<TConfig>(
-  extension: Extension<TConfig>,
+function makeInstanceWithId<TConfig, TConfigInput>(
+  extension: Extension<TConfig, TConfigInput>,
   config?: TConfig,
 ): AppNode {
   const node = makeNode(extension, { config });
diff --git a/packages/frontend-app-api/src/tree/resolveAppTree.test.ts b/packages/frontend-app-api/src/tree/resolveAppTree.test.ts
index f964fceb50..d9b65555fe 100644
--- a/packages/frontend-app-api/src/tree/resolveAppTree.test.ts
+++ b/packages/frontend-app-api/src/tree/resolveAppTree.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { createExtension } from '@backstage/frontend-plugin-api';
+import { createExtension, Extension } from '@backstage/frontend-plugin-api';
 import { resolveAppTree } from './resolveAppTree';
 // eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import { resolveExtensionDefinition } from '../../../frontend-plugin-api/src/wiring/resolveExtensionDefinition';
@@ -26,7 +26,7 @@ const extension = resolveExtensionDefinition(
     output: {},
     factory: () => ({}),
   }),
-);
+) as Extension<unknown, unknown>;
 
 const baseSpec = {
   extension,
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 45ed51b415..c4a96cba59 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -230,7 +230,7 @@ export interface AppNodeSpec {
   // (undocumented)
   readonly disabled: boolean;
   // (undocumented)
-  readonly extension: Extension<unknown>;
+  readonly extension: Extension<unknown, unknown>;
   // (undocumented)
   readonly id: string;
   // (undocumented)
@@ -391,7 +391,7 @@ export function createApiExtension<
     configSchema?: PortableSchema<TConfig>;
     inputs?: TInputs;
   },
-): ExtensionDefinition<TConfig>;
+): ExtensionDefinition<TConfig & {}, TConfig & {}>;
 
 // @public (undocumented)
 export namespace createApiExtension {
@@ -487,7 +487,7 @@ export function createComponentExtension<
           inputs: Expand<ResolvedExtensionInputs<TInputs>>;
         }) => ComponentType<TProps>;
       };
-}): ExtensionDefinition<TConfig>;
+}): ExtensionDefinition<TConfig & {}, TConfig & {}>;
 
 // @public (undocumented)
 export namespace createComponentExtension {
@@ -512,12 +512,34 @@ export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
+  TConfigInput,
   TConfigSchema extends {
     [key: string]: (zImpl: typeof z) => z.ZodType;
   },
 >(
-  options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
-): ExtensionDefinition<TConfig>;
+  options: CreateExtensionOptions<
+    TOutput,
+    TInputs,
+    TConfig,
+    TConfigInput,
+    TConfigSchema
+  >,
+): ExtensionDefinition<
+  TConfig &
+    (string extends keyof TConfigSchema
+      ? {}
+      : {
+          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+        }),
+  TConfigInput &
+    (string extends keyof TConfigSchema
+      ? {}
+      : z.input<
+          z.ZodObject<{
+            [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+          }>
+        >)
+>;
 
 // @public
 export function createExtensionBlueprint<
@@ -545,6 +567,13 @@ export function createExtensionBlueprint<
     : {
         [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
       },
+  string extends keyof TConfigSchema
+    ? {}
+    : z.input<
+        z.ZodObject<{
+          [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+        }>
+      >,
   TDataRefs
 >;
 
@@ -627,6 +656,7 @@ export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
+  TConfigInput,
   TConfigSchema extends {
     [key: string]: (zImpl: typeof z) => z.ZodType;
   },
@@ -641,15 +671,20 @@ export interface CreateExtensionOptions<
     schema: TConfigSchema;
   };
   // @deprecated (undocumented)
-  configSchema?: PortableSchema<TConfig>;
+  configSchema?: PortableSchema<TConfig, TConfigInput>;
   // (undocumented)
   disabled?: boolean;
   // (undocumented)
   factory(context: {
     node: AppNode;
-    config: TConfig & {
-      [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
-    };
+    config: TConfig &
+      (string extends keyof TConfigSchema
+        ? {}
+        : {
+            [key in keyof TConfigSchema]: z.infer<
+              ReturnType<TConfigSchema[key]>
+            >;
+          });
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }): Expand<ExtensionDataValues<TOutput>>;
   // (undocumented)
@@ -702,9 +737,14 @@ export function createNavItemExtension(options: {
   routeRef: RouteRef<undefined>;
   title: string;
   icon: IconComponent_2;
-}): ExtensionDefinition<{
-  title: string;
-}>;
+}): ExtensionDefinition<
+  {
+    title: string;
+  },
+  {
+    title?: string | undefined;
+  }
+>;
 
 // @public (undocumented)
 export namespace createNavItemExtension {
@@ -726,7 +766,7 @@ export function createNavLogoExtension(options: {
   namespace?: string;
   logoIcon: JSX.Element;
   logoFull: JSX.Element;
-}): ExtensionDefinition<unknown>;
+}): ExtensionDefinition<{}, {}>;
 
 // @public (undocumented)
 export namespace createNavLogoExtension {
@@ -837,7 +877,7 @@ export namespace createRouterExtension {
 // @public @deprecated (undocumented)
 export function createSchemaFromZod<TOutput, TInput>(
   schemaCreator: (zImpl: typeof z) => ZodSchema<TOutput, ZodTypeDef, TInput>,
-): PortableSchema<TOutput>;
+): PortableSchema<TOutput, TInput>;
 
 // @public (undocumented)
 export function createSignInPageExtension<
@@ -881,7 +921,7 @@ export function createSubRouteRef<
 // @public (undocumented)
 export function createThemeExtension(
   theme: AppTheme,
-): ExtensionDefinition<unknown>;
+): ExtensionDefinition<{}, {}>;
 
 // @public (undocumented)
 export namespace createThemeExtension {
@@ -897,7 +937,7 @@ export namespace createThemeExtension {
 export function createTranslationExtension(options: {
   name?: string;
   resource: TranslationResource | TranslationMessages;
-}): ExtensionDefinition<unknown>;
+}): ExtensionDefinition<{}, {}>;
 
 // @public (undocumented)
 export namespace createTranslationExtension {
@@ -935,7 +975,7 @@ export { ErrorApiErrorContext };
 export { errorApiRef };
 
 // @public (undocumented)
-export interface Extension<TConfig> {
+export interface Extension<TConfig, TConfigInput = TConfig> {
   // (undocumented)
   $$type: '@backstage/Extension';
   // (undocumented)
@@ -944,7 +984,7 @@ export interface Extension<TConfig> {
     input: string;
   };
   // (undocumented)
-  readonly configSchema?: PortableSchema<TConfig>;
+  readonly configSchema?: PortableSchema<TConfig, TConfigInput>;
   // (undocumented)
   readonly disabled: boolean;
   // (undocumented)
@@ -959,6 +999,9 @@ export interface ExtensionBlueprint<
   TConfig extends {
     [key in string]: unknown;
   },
+  TConfigInput extends {
+    [key in string]: unknown;
+  },
   TDataRefs extends AnyExtensionDataMap,
 > {
   // (undocumented)
@@ -1014,7 +1057,15 @@ export interface ExtensionBlueprint<
       [key in keyof TExtensionConfigSchema]: z.infer<
         ReturnType<TExtensionConfigSchema[key]>
       >;
-    } & TConfig
+    } & TConfig,
+    z.input<
+      z.ZodObject<{
+        [key in keyof TExtensionConfigSchema]: ReturnType<
+          TExtensionConfigSchema[key]
+        >;
+      }>
+    > &
+      TConfigInput
   >;
 }
 
@@ -1062,7 +1113,7 @@ export type ExtensionDataValues<TExtensionData extends AnyExtensionDataMap> = {
 };
 
 // @public (undocumented)
-export interface ExtensionDefinition<TConfig> {
+export interface ExtensionDefinition<TConfig, TConfigInput = TConfig> {
   // (undocumented)
   $$type: '@backstage/ExtensionDefinition';
   // (undocumented)
@@ -1071,7 +1122,7 @@ export interface ExtensionDefinition<TConfig> {
     input: string;
   };
   // (undocumented)
-  readonly configSchema?: PortableSchema<TConfig>;
+  readonly configSchema?: PortableSchema<TConfig, TConfigInput>;
   // (undocumented)
   readonly disabled: boolean;
   // (undocumented)
@@ -1107,7 +1158,7 @@ export interface ExtensionOverrides {
 // @public (undocumented)
 export interface ExtensionOverridesOptions {
   // (undocumented)
-  extensions: ExtensionDefinition<unknown>[];
+  extensions: ExtensionDefinition<any, any>[];
   // (undocumented)
   featureFlags?: FeatureFlagConfig[];
 }
@@ -1171,6 +1222,7 @@ export const IconBundleBlueprint: ExtensionBlueprint<
     >;
   },
   {},
+  {},
   {
     icons: ConfigurableExtensionDataRef<
       'core.icons',
@@ -1235,7 +1287,7 @@ export interface PluginOptions<
   ExternalRoutes extends AnyExternalRoutes,
 > {
   // (undocumented)
-  extensions?: ExtensionDefinition<unknown>[];
+  extensions?: ExtensionDefinition<any, any>[];
   // (undocumented)
   externalRoutes?: ExternalRoutes;
   // (undocumented)
@@ -1247,8 +1299,8 @@ export interface PluginOptions<
 }
 
 // @public (undocumented)
-export type PortableSchema<TOutput> = {
-  parse: (input: unknown) => TOutput;
+export type PortableSchema<TOutput, TInput = TOutput> = {
+  parse: (input: TInput) => TOutput;
   schema: JsonObject;
 };
 
diff --git a/packages/frontend-plugin-api/src/apis/definitions/AppTreeApi.ts b/packages/frontend-plugin-api/src/apis/definitions/AppTreeApi.ts
index 6c79a16964..4b5672f894 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/AppTreeApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/AppTreeApi.ts
@@ -29,7 +29,7 @@ import { BackstagePlugin, Extension, ExtensionDataRef } from '../../wiring';
 export interface AppNodeSpec {
   readonly id: string;
   readonly attachTo: { id: string; input: string };
-  readonly extension: Extension<unknown>;
+  readonly extension: Extension<unknown, unknown>;
   readonly disabled: boolean;
   readonly config?: unknown;
   readonly source?: BackstagePlugin;
diff --git a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
index 2ad1404102..438da09b4a 100644
--- a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
+++ b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
@@ -28,6 +28,12 @@ export const IconBundleBlueprint = createExtensionBlueprint({
   output: {
     icons: iconsDataRef,
   },
+  config: {
+    schema: {
+      icons: z => z.string().default('blob'),
+      test: z => z.string(),
+    },
+  },
   factory: (params: { icons: { [key in string]: IconComponent } }) => params,
   dataRefs: {
     icons: iconsDataRef,
diff --git a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.test.ts b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.test.ts
index 90eba44249..477a1a58c6 100644
--- a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.test.ts
+++ b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.test.ts
@@ -25,10 +25,19 @@ describe('createSchemaFromZod', () => {
       }),
     );
 
-    expect(() => parse({ derp: { bar: 'derp' } })).toThrow(
+    expect(() => {
+      // @ts-expect-error
+      return parse({ derp: { bar: 'derp' } });
+    }).toThrow(
       `Missing required value at 'foo'; Expected number, received string at 'derp.bar'`,
     );
-    expect(() => parse(undefined)).toThrow(`Missing required value`);
-    expect(() => parse('derp')).toThrow(`Expected object, received string`);
+    expect(() => {
+      // @ts-expect-error
+      return parse(undefined);
+    }).toThrow(`Missing required value`);
+    expect(() => {
+      // @ts-expect-error
+      return parse('derp');
+    }).toThrow(`Expected object, received string`);
   });
 });
diff --git a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
index c69ef5dc60..9e63515ae4 100644
--- a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
+++ b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts
@@ -25,7 +25,7 @@ import { PortableSchema } from './types';
  */
 export function createSchemaFromZod<TOutput, TInput>(
   schemaCreator: (zImpl: typeof z) => ZodSchema<TOutput, ZodTypeDef, TInput>,
-): PortableSchema<TOutput> {
+): PortableSchema<TOutput, TInput> {
   const schema = schemaCreator(z);
   return {
     // TODO: Types allow z.array etc here but it will break stuff
diff --git a/packages/frontend-plugin-api/src/schema/types.ts b/packages/frontend-plugin-api/src/schema/types.ts
index 9636d3b896..5644068e90 100644
--- a/packages/frontend-plugin-api/src/schema/types.ts
+++ b/packages/frontend-plugin-api/src/schema/types.ts
@@ -17,7 +17,7 @@
 import { JsonObject } from '@backstage/types';
 
 /** @public */
-export type PortableSchema<TOutput> = {
-  parse: (input: unknown) => TOutput;
+export type PortableSchema<TOutput, TInput = TOutput> = {
+  parse: (input: TInput) => TOutput;
   schema: JsonObject;
 };
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index 468da21eb7..5b737746c2 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -334,6 +334,7 @@ describe('createExtension', () => {
         foo: 'x',
         bar: 'y',
         baz: 'z',
+        // @ts-expect-error
         qux: 'w',
       }),
     ).toEqual({
@@ -349,8 +350,9 @@ describe('createExtension', () => {
       foo: 'x',
       bar: 'bar',
     });
-    expect(() => extension.configSchema?.parse({})).toThrow(
-      "Missing required value at 'foo'",
-    );
+    expect(() => {
+      // @ts-expect-error
+      return extension.configSchema?.parse({});
+    }).toThrow("Missing required value at 'foo'");
   });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index ac91557906..cc2bec91c9 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -82,6 +82,7 @@ export interface CreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
+  TConfigInput,
   TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
 > {
   kind?: string;
@@ -92,33 +93,38 @@ export interface CreateExtensionOptions<
   inputs?: TInputs;
   output: TOutput;
   /** @deprecated - use `config.schema` instead */
-  configSchema?: PortableSchema<TConfig>;
+  configSchema?: PortableSchema<TConfig, TConfigInput>;
   config?: {
     schema: TConfigSchema;
   };
   factory(context: {
     node: AppNode;
-    config: TConfig & {
-      [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
-    };
+    config: TConfig &
+      (string extends keyof TConfigSchema
+        ? {}
+        : {
+            [key in keyof TConfigSchema]: z.infer<
+              ReturnType<TConfigSchema[key]>
+            >;
+          });
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }): Expand<ExtensionDataValues<TOutput>>;
 }
 
 /** @public */
-export interface ExtensionDefinition<TConfig> {
+export interface ExtensionDefinition<TConfig, TConfigInput = TConfig> {
   $$type: '@backstage/ExtensionDefinition';
   readonly kind?: string;
   readonly namespace?: string;
   readonly name?: string;
   readonly attachTo: { id: string; input: string };
   readonly disabled: boolean;
-  readonly configSchema?: PortableSchema<TConfig>;
+  readonly configSchema?: PortableSchema<TConfig, TConfigInput>;
 }
 
 /** @internal */
-export interface InternalExtensionDefinition<TConfig>
-  extends ExtensionDefinition<TConfig> {
+export interface InternalExtensionDefinition<TConfig, TConfigInput>
+  extends ExtensionDefinition<TConfig, TConfigInput> {
   readonly version: 'v1';
   readonly inputs: AnyExtensionInputMap;
   readonly output: AnyExtensionDataMap;
@@ -130,10 +136,13 @@ export interface InternalExtensionDefinition<TConfig>
 }
 
 /** @internal */
-export function toInternalExtensionDefinition<TConfig>(
-  overrides: ExtensionDefinition<TConfig>,
-): InternalExtensionDefinition<TConfig> {
-  const internal = overrides as InternalExtensionDefinition<TConfig>;
+export function toInternalExtensionDefinition<TConfig, TConfigInput>(
+  overrides: ExtensionDefinition<TConfig, TConfigInput>,
+): InternalExtensionDefinition<TConfig, TConfigInput> {
+  const internal = overrides as InternalExtensionDefinition<
+    TConfig,
+    TConfigInput
+  >;
   if (internal.$$type !== '@backstage/ExtensionDefinition') {
     throw new Error(
       `Invalid extension definition instance, bad type '${internal.$$type}'`,
@@ -152,10 +161,32 @@ export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
+  TConfigInput,
   TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
 >(
-  options: CreateExtensionOptions<TOutput, TInputs, TConfig, TConfigSchema>,
-): ExtensionDefinition<TConfig> {
+  options: CreateExtensionOptions<
+    TOutput,
+    TInputs,
+    TConfig,
+    TConfigInput,
+    TConfigSchema
+  >,
+): ExtensionDefinition<
+  TConfig &
+    (string extends keyof TConfigSchema
+      ? {}
+      : {
+          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+        }),
+  TConfigInput &
+    (string extends keyof TConfigSchema
+      ? {}
+      : z.input<
+          z.ZodObject<{
+            [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+          }>
+        >)
+> {
   const newConfigSchema = options.config?.schema;
   if (newConfigSchema && options.configSchema) {
     throw new Error(`Cannot provide both configSchema and config.schema`);
@@ -205,5 +236,22 @@ export function createExtension<
       parts.push(`attachTo=${options.attachTo.id}@${options.attachTo.input}`);
       return `ExtensionDefinition{${parts.join(',')}}`;
     },
-  } as InternalExtensionDefinition<TConfig>;
+  } as InternalExtensionDefinition<
+    TConfig &
+      (string extends keyof TConfigSchema
+        ? {}
+        : {
+            [key in keyof TConfigSchema]: z.infer<
+              ReturnType<TConfigSchema[key]>
+            >;
+          }),
+    TConfigInput &
+      (string extends keyof TConfigSchema
+        ? {}
+        : z.input<
+            z.ZodObject<{
+              [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+            }>
+          >)
+  >;
 }
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index ce3e650342..7393ca233e 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -67,6 +67,7 @@ export interface ExtensionBlueprint<
   TInputs extends AnyExtensionInputMap,
   TOutput extends AnyExtensionDataMap,
   TConfig extends { [key in string]: unknown },
+  TConfigInput extends { [key in string]: unknown },
   TDataRefs extends AnyExtensionDataMap,
 > {
   dataRefs: TDataRefs;
@@ -125,7 +126,15 @@ export interface ExtensionBlueprint<
       [key in keyof TExtensionConfigSchema]: z.infer<
         ReturnType<TExtensionConfigSchema[key]>
       >;
-    } & TConfig
+    } & TConfig,
+    z.input<
+      z.ZodObject<{
+        [key in keyof TExtensionConfigSchema]: ReturnType<
+          TExtensionConfigSchema[key]
+        >;
+      }>
+    > &
+      TConfigInput
   >;
 }
 
@@ -199,7 +208,18 @@ class ExtensionBlueprintImpl<
       >;
     } & {
       [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
-    }
+    },
+    z.input<
+      z.ZodObject<
+        {
+          [key in keyof TExtensionConfigSchema]: ReturnType<
+            TExtensionConfigSchema[key]
+          >;
+        } & {
+          [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+        }
+      >
+    >
   > {
     const schema = {
       ...this.options.config?.schema,
@@ -279,6 +299,13 @@ export function createExtensionBlueprint<
   string extends keyof TConfigSchema
     ? {}
     : { [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>> },
+  string extends keyof TConfigSchema
+    ? {}
+    : z.input<
+        z.ZodObject<{
+          [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+        }>
+      >,
   TDataRefs
 > {
   return new ExtensionBlueprintImpl(options) as ExtensionBlueprint<
@@ -290,6 +317,13 @@ export function createExtensionBlueprint<
       : {
           [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
         },
+    string extends keyof TConfigSchema
+      ? {}
+      : z.input<
+          z.ZodObject<{
+            [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+          }>
+        >,
     TDataRefs
   >;
 }
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionOverrides.ts b/packages/frontend-plugin-api/src/wiring/createExtensionOverrides.ts
index 1f88038944..75c43a36d2 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionOverrides.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionOverrides.ts
@@ -23,7 +23,7 @@ import { ExtensionOverrides, FeatureFlagConfig } from './types';
 
 /** @public */
 export interface ExtensionOverridesOptions {
-  extensions: ExtensionDefinition<unknown>[];
+  extensions: ExtensionDefinition<any, any>[];
   featureFlags?: FeatureFlagConfig[];
 }
 
diff --git a/packages/frontend-plugin-api/src/wiring/createPlugin.ts b/packages/frontend-plugin-api/src/wiring/createPlugin.ts
index 797c46e58e..b671d95d2f 100644
--- a/packages/frontend-plugin-api/src/wiring/createPlugin.ts
+++ b/packages/frontend-plugin-api/src/wiring/createPlugin.ts
@@ -34,7 +34,7 @@ export interface PluginOptions<
   id: string;
   routes?: Routes;
   externalRoutes?: ExternalRoutes;
-  extensions?: ExtensionDefinition<unknown>[];
+  extensions?: ExtensionDefinition<any, any>[];
   featureFlags?: FeatureFlagConfig[];
 }
 
diff --git a/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.ts b/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.ts
index 0a44de4ab4..eddd923702 100644
--- a/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.ts
+++ b/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.ts
@@ -26,16 +26,17 @@ import {
 import { PortableSchema } from '../schema';
 
 /** @public */
-export interface Extension<TConfig> {
+export interface Extension<TConfig, TConfigInput = TConfig> {
   $$type: '@backstage/Extension';
   readonly id: string;
   readonly attachTo: { id: string; input: string };
   readonly disabled: boolean;
-  readonly configSchema?: PortableSchema<TConfig>;
+  readonly configSchema?: PortableSchema<TConfig, TConfigInput>;
 }
 
 /** @internal */
-export interface InternalExtension<TConfig> extends Extension<TConfig> {
+export interface InternalExtension<TConfig, TConfigInput>
+  extends Extension<TConfig, TConfigInput> {
   readonly version: 'v1';
   readonly inputs: AnyExtensionInputMap;
   readonly output: AnyExtensionDataMap;
@@ -47,10 +48,10 @@ export interface InternalExtension<TConfig> extends Extension<TConfig> {
 }
 
 /** @internal */
-export function toInternalExtension<TConfig>(
-  overrides: Extension<TConfig>,
-): InternalExtension<TConfig> {
-  const internal = overrides as InternalExtension<TConfig>;
+export function toInternalExtension<TConfig, TConfigInput>(
+  overrides: Extension<TConfig, TConfigInput>,
+): InternalExtension<TConfig, TConfigInput> {
+  const internal = overrides as InternalExtension<TConfig, TConfigInput>;
   if (internal.$$type !== '@backstage/Extension') {
     throw new Error(
       `Invalid extension instance, bad type '${internal.$$type}'`,
@@ -65,10 +66,10 @@ export function toInternalExtension<TConfig>(
 }
 
 /** @internal */
-export function resolveExtensionDefinition<TConfig>(
-  definition: ExtensionDefinition<TConfig>,
+export function resolveExtensionDefinition<TConfig, TConfigInput>(
+  definition: ExtensionDefinition<TConfig, TConfigInput>,
   context?: { namespace?: string },
-): Extension<TConfig> {
+): Extension<TConfig, TConfigInput> {
   const internalDefinition = toInternalExtensionDefinition(definition);
   const { name, kind, namespace: _, ...rest } = internalDefinition;
   const namespace = internalDefinition.namespace ?? context?.namespace;
@@ -91,5 +92,5 @@ export function resolveExtensionDefinition<TConfig>(
     toString() {
       return `Extension{id=${id}}`;
     },
-  } as Extension<TConfig>;
+  } as Extension<TConfig, TConfigInput>;
 }
diff --git a/packages/frontend-test-utils/api-report.md b/packages/frontend-test-utils/api-report.md
index 9629e13bfa..3b368394ca 100644
--- a/packages/frontend-test-utils/api-report.md
+++ b/packages/frontend-test-utils/api-report.md
@@ -39,10 +39,10 @@ export { ErrorWithContext };
 // @public (undocumented)
 export class ExtensionTester {
   // (undocumented)
-  add<TConfig>(
-    extension: ExtensionDefinition<TConfig>,
+  add<TConfig, TConfigInput>(
+    extension: ExtensionDefinition<TConfig, TConfigInput>,
     options?: {
-      config?: TConfig;
+      config?: TConfigInput;
     },
   ): ExtensionTester;
   // (undocumented)
diff --git a/packages/frontend-test-utils/src/app/createExtensionTester.tsx b/packages/frontend-test-utils/src/app/createExtensionTester.tsx
index a98879fbba..69c4b09d06 100644
--- a/packages/frontend-test-utils/src/app/createExtensionTester.tsx
+++ b/packages/frontend-test-utils/src/app/createExtensionTester.tsx
@@ -88,9 +88,9 @@ const TestAppNavExtension = createExtension({
 /** @public */
 export class ExtensionTester {
   /** @internal */
-  static forSubject<TConfig>(
-    subject: ExtensionDefinition<TConfig>,
-    options?: { config?: TConfig },
+  static forSubject<TConfig, TConfigInput>(
+    subject: ExtensionDefinition<TConfig, TConfigInput>,
+    options?: { config?: TConfigInput },
   ): ExtensionTester {
     const tester = new ExtensionTester();
     const { output, factory, ...rest } = toInternalExtensionDefinition(subject);
@@ -107,7 +107,7 @@ export class ExtensionTester {
         path: '/',
       }),
     });
-    tester.add(extension, options);
+    tester.add(extension, options as TConfigInput & {});
     return tester;
   }
 
@@ -117,9 +117,9 @@ export class ExtensionTester {
     config?: JsonValue;
   }>();
 
-  add<TConfig>(
-    extension: ExtensionDefinition<TConfig>,
-    options?: { config?: TConfig },
+  add<TConfig, TConfigInput>(
+    extension: ExtensionDefinition<TConfig, TConfigInput>,
+    options?: { config?: TConfigInput },
   ): ExtensionTester {
     const { name, namespace } = extension;
 
diff --git a/plugins/catalog-react/api-report-alpha.md b/plugins/catalog-react/api-report-alpha.md
index d2bfb29458..1ffa67068f 100644
--- a/plugins/catalog-react/api-report-alpha.md
+++ b/plugins/catalog-react/api-report-alpha.md
@@ -115,7 +115,7 @@ export function createEntityCardExtension<
     config: TConfig;
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }) => Promise<JSX.Element>;
-}): ExtensionDefinition<TConfig>;
+}): ExtensionDefinition<TConfig & {}, TConfig & {}>;
 
 // @alpha (undocumented)
 export function createEntityContentExtension<
@@ -138,11 +138,18 @@ export function createEntityContentExtension<
   loader: (options: {
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }) => Promise<JSX.Element>;
-}): ExtensionDefinition<{
-  title: string;
-  path: string;
-  filter?: string | undefined;
-}>;
+}): ExtensionDefinition<
+  {
+    title: string;
+    path: string;
+    filter?: string | undefined;
+  },
+  {
+    filter?: string | undefined;
+    title?: string | undefined;
+    path?: string | undefined;
+  }
+>;
 
 // @alpha
 export function isOwnerOf(owner: Entity, entity: Entity): boolean;
diff --git a/plugins/catalog/api-report-alpha.md b/plugins/catalog/api-report-alpha.md
index 102e2a7aa3..a62b047c4c 100644
--- a/plugins/catalog/api-report-alpha.md
+++ b/plugins/catalog/api-report-alpha.md
@@ -99,14 +99,14 @@ export const catalogTranslationRef: TranslationRef<
 // @alpha (undocumented)
 export function createCatalogFilterExtension<
   TInputs extends AnyExtensionInputMap,
-  TConfig = never,
+  TConfig,
 >(options: {
   namespace?: string;
   name?: string;
   inputs?: TInputs;
   configSchema?: PortableSchema<TConfig>;
   loader: (options: { config: TConfig }) => Promise<JSX.Element>;
-}): ExtensionDefinition<TConfig>;
+}): ExtensionDefinition<TConfig & {}, TConfig & {}>;
 
 // @alpha (undocumented)
 const _default: BackstagePlugin<
diff --git a/plugins/catalog/src/alpha/createCatalogFilterExtension.tsx b/plugins/catalog/src/alpha/createCatalogFilterExtension.tsx
index 48ee647b81..d8a218f8f3 100644
--- a/plugins/catalog/src/alpha/createCatalogFilterExtension.tsx
+++ b/plugins/catalog/src/alpha/createCatalogFilterExtension.tsx
@@ -26,7 +26,7 @@ import {
 /** @alpha */
 export function createCatalogFilterExtension<
   TInputs extends AnyExtensionInputMap,
-  TConfig = never,
+  TConfig,
 >(options: {
   namespace?: string;
   name?: string;
diff --git a/plugins/search-react/api-report-alpha.md b/plugins/search-react/api-report-alpha.md
index aea85d0f81..3da9ac23a4 100644
--- a/plugins/search-react/api-report-alpha.md
+++ b/plugins/search-react/api-report-alpha.md
@@ -25,7 +25,7 @@ export function createSearchResultListItemExtension<
   },
 >(
   options: SearchResultItemExtensionOptions<TConfig>,
-): ExtensionDefinition<TConfig>;
+): ExtensionDefinition<TConfig & {}, TConfig & {}>;
 
 // @alpha (undocumented)
 export namespace createSearchResultListItemExtension {
diff --git a/plugins/search/api-report-alpha.md b/plugins/search/api-report-alpha.md
index db2999ba25..e9b86f1f87 100644
--- a/plugins/search/api-report-alpha.md
+++ b/plugins/search/api-report-alpha.md
@@ -17,18 +17,29 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const searchApi: ExtensionDefinition<{}>;
+export const searchApi: ExtensionDefinition<{}, {}>;
 
 // @alpha (undocumented)
-export const searchNavItem: ExtensionDefinition<{
-  title: string;
-}>;
+export const searchNavItem: ExtensionDefinition<
+  {
+    title: string;
+  },
+  {
+    title?: string | undefined;
+  }
+>;
 
 // @alpha (undocumented)
-export const searchPage: ExtensionDefinition<{
-  path: string;
-  noTrack: boolean;
-}>;
+export const searchPage: ExtensionDefinition<
+  {
+    path: string;
+    noTrack: boolean;
+  },
+  {
+    path: string;
+    noTrack: boolean;
+  }
+>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/techdocs/api-report-alpha.md b/plugins/techdocs/api-report-alpha.md
index cf9f5fa9a3..04a0c5c512 100644
--- a/plugins/techdocs/api-report-alpha.md
+++ b/plugins/techdocs/api-report-alpha.md
@@ -23,13 +23,22 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const techDocsSearchResultListItemExtension: ExtensionDefinition<{
-  lineClamp: number;
-  noTrack: boolean;
-  asListItem: boolean;
-  asLink: boolean;
-  title?: string | undefined;
-}>;
+export const techDocsSearchResultListItemExtension: ExtensionDefinition<
+  {
+    lineClamp: number;
+    noTrack: boolean;
+    asListItem: boolean;
+    asLink: boolean;
+    title?: string | undefined;
+  },
+  {
+    lineClamp: number;
+    noTrack: boolean;
+    asListItem: boolean;
+    asLink: boolean;
+    title?: string | undefined;
+  }
+>;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/user-settings/api-report-alpha.md b/plugins/user-settings/api-report-alpha.md
index b06fd1e583..fdb2c5f6bf 100644
--- a/plugins/user-settings/api-report-alpha.md
+++ b/plugins/user-settings/api-report-alpha.md
@@ -18,9 +18,14 @@ const _default: BackstagePlugin<
 export default _default;
 
 // @alpha (undocumented)
-export const settingsNavItem: ExtensionDefinition<{
-  title: string;
-}>;
+export const settingsNavItem: ExtensionDefinition<
+  {
+    title: string;
+  },
+  {
+    title?: string | undefined;
+  }
+>;
 
 // @alpha (undocumented)
 export const userSettingsTranslationRef: TranslationRef<

From 634909993c888a0857fba702ad2b692c96858933 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 24 Jul 2024 14:37:38 +0200
Subject: [PATCH 180/225] chore: added changeset

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/young-games-visit.md            | 14 ++++++++++++++
 packages/frontend-plugin-api/api-report.md | 10 ++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/young-games-visit.md

diff --git a/.changeset/young-games-visit.md b/.changeset/young-games-visit.md
new file mode 100644
index 0000000000..467abcec86
--- /dev/null
+++ b/.changeset/young-games-visit.md
@@ -0,0 +1,14 @@
+---
+'@backstage/frontend-plugin-api': patch
+'@backstage/frontend-test-utils': patch
+'@backstage/frontend-app-api': patch
+'@backstage/core-compat-api': patch
+'@backstage/plugin-catalog-react': patch
+'@backstage/plugin-user-settings': patch
+'@backstage/plugin-search-react': patch
+'@backstage/plugin-techdocs': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-search': patch
+---
+
+Added config input type to the extensions
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index c4a96cba59..2c92f863e8 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -1221,8 +1221,14 @@ export const IconBundleBlueprint: ExtensionBlueprint<
       {}
     >;
   },
-  {},
-  {},
+  {
+    icons: string;
+    test: string;
+  },
+  {
+    test: string;
+    icons?: string | undefined;
+  },
   {
     icons: ConfigurableExtensionDataRef<
       'core.icons',

From e6e7d862fec44754faac302e6e4d7021a19b9ef0 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 24 Jul 2024 15:04:05 +0200
Subject: [PATCH 181/225] cli: use lowercase es2022

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/shaggy-dodos-applaud.md         | 5 +++++
 packages/cli/src/lib/bundler/transforms.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/shaggy-dodos-applaud.md

diff --git a/.changeset/shaggy-dodos-applaud.md b/.changeset/shaggy-dodos-applaud.md
new file mode 100644
index 0000000000..b7f968aa39
--- /dev/null
+++ b/.changeset/shaggy-dodos-applaud.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Switched the target from `'ES2022'` to `'es2022'` for better compatibility with older versions of `swc`.
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index 1be54f7a73..302b2fbe68 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -57,7 +57,7 @@ export const transforms = (options: TransformOptions): Transforms => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'ES2022',
+              target: 'es2022',
               externalHelpers: !isBackend,
               parser: {
                 syntax: 'typescript',
@@ -85,7 +85,7 @@ export const transforms = (options: TransformOptions): Transforms => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'ES2022',
+              target: 'es2022',
               externalHelpers: !isBackend,
               parser: {
                 syntax: 'ecmascript',

From 41fa9d58c50a12017dac05067e4ceb04d1748ee3 Mon Sep 17 00:00:00 2001
From: Nurit Izrailov <nuriti@spotify.com>
Date: Wed, 24 Jul 2024 09:16:30 -0400
Subject: [PATCH 182/225] run yarn backstage-cli repo fix

Signed-off-by: Nurit Izrailov <nuriti@spotify.com>
---
 plugins/kubernetes/package.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 6c5a65dddd..d44d175211 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -14,9 +14,7 @@
     ]
   },
   "publishConfig": {
-    "access": "public",
-    "main": "dist/index.esm.js",
-    "types": "dist/index.d.ts"
+    "access": "public"
   },
   "keywords": [
     "backstage",

From aac3c52d2229adf6bc19fb494b355942d9ec837b Mon Sep 17 00:00:00 2001
From: rghara <rghara@outlook.com>
Date: Wed, 24 Jul 2024 11:33:41 -0400
Subject: [PATCH 183/225] In the Gettin Started/authentication document
 SignInPage is already imported. Removing the duplicate import that causes
 compilation error. import { SignInPage } from '@backstage/core-components';

Signed-off-by: rghara <rghara@outlook.com>
---
 docs/getting-started/config/authentication.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/getting-started/config/authentication.md b/docs/getting-started/config/authentication.md
index 874964696a..e97ed3d89c 100644
--- a/docs/getting-started/config/authentication.md
+++ b/docs/getting-started/config/authentication.md
@@ -50,7 +50,6 @@ Open `packages/app/src/App.tsx` and below the last `import` line, add:
 
 ```typescript title="packages/app/src/App.tsx"
 import { githubAuthApiRef } from '@backstage/core-plugin-api';
-import { SignInPage } from '@backstage/core-components';
 ```
 
 Search for `const app = createApp({` in this file, and below `apis,` add:

From 132529ae23a1295c294e42b55628d1fcc8cd033c Mon Sep 17 00:00:00 2001
From: raphtalia <59540801+raphtalia@users.noreply.github.com>
Date: Wed, 24 Jul 2024 10:36:00 -0500
Subject: [PATCH 184/225] Add Cigna/Evernorth

Signed-off-by: raphtalia <59540801+raphtalia@users.noreply.github.com>
---
 ADOPTERS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ADOPTERS.md b/ADOPTERS.md
index 870b4c93d4..3b534052f1 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -274,3 +274,4 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
 | [Grupo OLX](https://www.olx.com.br/) | [@marciorgb](https://github.com/marciorgb), [@jeffbraga](https://github.com/jeffbraga), [@rogerfernandes](https://github.com/rogerfernandes), [@stockrt](https://github.com/stockrt) | At Grupo OLX, we are using Backstage to reduce friction and enhance developer autonomy by creating Golden Paths, which automate previously manual processes. Additionally, Backstage's catalog integrates various views of our organizational structure and workflows, offering a comprehensive overview of how different components interconnect. |
 | [DPG Media](https://www.dpgmediagroup.com) | [@benjidotsh](https://github.com/benjidotsh), [@lvstb](https://github.com/lvstb), [@ssliman](https://github.com/ssliman), [@edewel-beep](https://github.com/edewel-beep) | Access to infrastructure, documentation and internal tooling |
 | [Baloise](https://www.baloise.ch) | [@dweber019](https://github.com/dweber019), [@mikevader](https://github.com/mikevader) | We are using Backstage as internal developer protal for use cases like software catalog, documentation, infrastructure. |
+| [Cigna](https://www.cigna.com/) / [Evernorth](https://www.evernorth.com/) | [@raphtalia](https://github.com/raphtalia), [Devon Paluso](mailto:Devon.Paluso@evernorth.com), [Bryan Rego](mailto:Bryan.Rego@evernorth.com), [Ian Skillings](mailto:Ian.Skillings@evernorth.com) | Internal developer portal providing TechDocs, software templates, centralized secret management, with information consolidation from ServiceNow, Okta, GitHub, GitLab, and WebEx. |

From 4cda00c9968835174bed5925e4e0c24548063daf Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 24 Jul 2024 15:04:05 +0200
Subject: [PATCH 185/225] cli: use lowercase es2022

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
Signed-off-by: Nishkarsh Raj <nishkarshraj000@gmail.com>
---
 .changeset/shaggy-dodos-applaud.md         | 5 +++++
 packages/cli/src/lib/bundler/transforms.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/shaggy-dodos-applaud.md

diff --git a/.changeset/shaggy-dodos-applaud.md b/.changeset/shaggy-dodos-applaud.md
new file mode 100644
index 0000000000..b7f968aa39
--- /dev/null
+++ b/.changeset/shaggy-dodos-applaud.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Switched the target from `'ES2022'` to `'es2022'` for better compatibility with older versions of `swc`.
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index 1be54f7a73..302b2fbe68 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -57,7 +57,7 @@ export const transforms = (options: TransformOptions): Transforms => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'ES2022',
+              target: 'es2022',
               externalHelpers: !isBackend,
               parser: {
                 syntax: 'typescript',
@@ -85,7 +85,7 @@ export const transforms = (options: TransformOptions): Transforms => {
           loader: require.resolve('swc-loader'),
           options: {
             jsc: {
-              target: 'ES2022',
+              target: 'es2022',
               externalHelpers: !isBackend,
               parser: {
                 syntax: 'ecmascript',

From 93e8169b053ff6c5eb48ac139f7e83a391cade81 Mon Sep 17 00:00:00 2001
From: Nishkarsh Raj <nishkarshraj000@gmail.com>
Date: Wed, 24 Jul 2024 18:45:19 +0000
Subject: [PATCH 186/225] Adding StatusNeo as Commercial Partners for
 Backstage.io

Signed-off-by: Nishkarsh Raj <nishkarshraj000@gmail.com>
---
 microsite/src/pages/community/index.tsx         |   5 +++++
 microsite/static/img/partner-logo-statusneo.png | Bin 0 -> 4663 bytes
 2 files changed, 5 insertions(+)
 create mode 100644 microsite/static/img/partner-logo-statusneo.png

diff --git a/microsite/src/pages/community/index.tsx b/microsite/src/pages/community/index.tsx
index c331638c78..a32f5edd13 100644
--- a/microsite/src/pages/community/index.tsx
+++ b/microsite/src/pages/community/index.tsx
@@ -96,6 +96,11 @@ const Community = () => {
       url: 'https://tanzu.vmware.com/developer-portal',
       logo: 'img/partner-logo-tanzubybroadcom.png',
     },
+    {
+      name: 'StatusNeo',
+      url: 'https://statusneo.com/backstage',
+      logo: 'img/partner-logo-statusneo.png',
+    },
   ];
   //#endregion
 
diff --git a/microsite/static/img/partner-logo-statusneo.png b/microsite/static/img/partner-logo-statusneo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4209ecaca30647db6ea50cc2ceb4ad2d8e07aa92
GIT binary patch
literal 4663
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

literal 0
HcmV?d00001


From 963106f8456ad5aa44cfb1ab58ddaf219111d9ab Mon Sep 17 00:00:00 2001
From: Chap Ambrose <cambrose@salesforce.com>
Date: Wed, 24 Jul 2024 15:05:07 -0500
Subject: [PATCH 187/225] fix typo in heroku docs

Signed-off-by: Chap Ambrose <cambrose@salesforce.com>
---
 docs/deployment/heroku.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment/heroku.md b/docs/deployment/heroku.md
index d285e4b397..51d0b4b439 100644
--- a/docs/deployment/heroku.md
+++ b/docs/deployment/heroku.md
@@ -104,7 +104,7 @@ heroku open -a <your-app>
 View logs:
 
 ```shell
-heroku heroku -a <your-app>
+heroku logs -a <your-app>
 ```
 
 ## Docker

From 51240ee9f790a9a54e851b8e359faf8dd470ce85 Mon Sep 17 00:00:00 2001
From: Thomas Cardonne <thomas.cardonne@adevinta.com>
Date: Thu, 25 Jul 2024 00:18:15 +0200
Subject: [PATCH 188/225] fix(catalog-backend): preserve default
 allowedLocationTypes

Signed-off-by: Thomas Cardonne <thomas.cardonne@adevinta.com>
---
 .changeset/odd-books-share.md                        |  5 +++++
 plugins/catalog-backend/src/service/CatalogPlugin.ts | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/odd-books-share.md

diff --git a/.changeset/odd-books-share.md b/.changeset/odd-books-share.md
new file mode 100644
index 0000000000..858a2564ad
--- /dev/null
+++ b/.changeset/odd-books-share.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Preserve default `allowedLocationTypes` when `setAllowedLocationTypes()` of `CatalogLocationsExtensionPoint` is not called.
diff --git a/plugins/catalog-backend/src/service/CatalogPlugin.ts b/plugins/catalog-backend/src/service/CatalogPlugin.ts
index 2f5fd9103d..269100e586 100644
--- a/plugins/catalog-backend/src/service/CatalogPlugin.ts
+++ b/plugins/catalog-backend/src/service/CatalogPlugin.ts
@@ -46,7 +46,7 @@ import { ForwardedError } from '@backstage/errors';
 class CatalogLocationsExtensionPointImpl
   implements CatalogLocationsExtensionPoint
 {
-  #locationTypes = new Array<string>();
+  #locationTypes: string[] | undefined;
 
   setAllowedLocationTypes(locationTypes: Array<string>) {
     this.#locationTypes = locationTypes;
@@ -293,9 +293,11 @@ export const catalogPlugin = createBackendPlugin({
         builder.addPermissionRules(...permissionExtensions.permissionRules);
         builder.setFieldFormatValidators(modelExtensions.fieldValidators);
 
-        builder.setAllowedLocationTypes(
-          locationTypeExtensions.allowedLocationTypes,
-        );
+        if (locationTypeExtensions.allowedLocationTypes) {
+          builder.setAllowedLocationTypes(
+            locationTypeExtensions.allowedLocationTypes,
+          );
+        }
 
         const { processingEngine, router } = await builder.build();
 

From 7e5c374cfeb1161a99ab4467e267cf3faf2dea23 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 09:00:53 +0000
Subject: [PATCH 189/225] chore(deps): update github/codeql-action action to
 v3.25.14

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml         | 2 +-
 .github/workflows/sync_snyk-monitor.yml | 2 +-
 .github/workflows/verify_codeql.yml     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ecf18d71ad..354a76760b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/sync_snyk-monitor.yml b/.github/workflows/sync_snyk-monitor.yml
index b1e50397ce..44699964a6 100644
--- a/.github/workflows/sync_snyk-monitor.yml
+++ b/.github/workflows/sync_snyk-monitor.yml
@@ -58,6 +58,6 @@ jobs:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
           NODE_OPTIONS: --max-old-space-size=7168
       - name: Upload Snyk report
-        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
         with:
           sarif_file: snyk.sarif
diff --git a/.github/workflows/verify_codeql.yml b/.github/workflows/verify_codeql.yml
index e19187b6ce..b2fb2dc6ec 100644
--- a/.github/workflows/verify_codeql.yml
+++ b/.github/workflows/verify_codeql.yml
@@ -55,7 +55,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/init@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/autobuild@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -80,4 +80,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/analyze@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14

From ef87e06e5b21663f516101fbb4e53d5d87d1fa80 Mon Sep 17 00:00:00 2001
From: Teo ShaoWei <teo_shaowei@estl.sg>
Date: Wed, 24 Jul 2024 20:11:23 +0800
Subject: [PATCH 190/225] fix: scaffolder action catalog:write not working in
 nested folders

From the design of `catalog:write`, it is meant to support writing to a nested file path, e.g. `backstage/catalog-info.yaml`.

However, if the directory doesn't exists, then `fs.writeFile` will throw an error. This commit fixed the issue by using `fs.outputFile` instead which will create the parent directory if it does not exist: https://github.com/jprichardson/node-fs-extra/blob/master/docs/outputFile.md

The test `'should support a custom filename'` in `write.test.ts` did not catch this issue because `fs` is mocked. It is better to use fake instead of mock, e.g. create a throwaway temp folder for the tests since the file operations are part of the feature. However fixing of the tests as a whole is out of scope for this PR.

Signed-off-by: ShaoWei Teo <tookunokaze@gmail.com>
---
 .changeset/thick-hotels-know.md                      |  5 +++++
 .../actions/builtin/catalog/write.examples.test.ts   |  4 ++--
 .../scaffolder/actions/builtin/catalog/write.test.ts | 12 ++++++------
 .../src/scaffolder/actions/builtin/catalog/write.ts  |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/thick-hotels-know.md

diff --git a/.changeset/thick-hotels-know.md b/.changeset/thick-hotels-know.md
new file mode 100644
index 0000000000..a2331b6df2
--- /dev/null
+++ b/.changeset/thick-hotels-know.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Fix scaffolder action catalog:write to work in nested folders.
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.examples.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.examples.test.ts
index e6b4bcde47..f900e87a1d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.examples.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.examples.test.ts
@@ -55,8 +55,8 @@ describe('catalog:write', () => {
       input: yaml.parse(examples[0].example).steps[0].input,
     });
 
-    expect(fsMock.writeFile).toHaveBeenCalledTimes(1);
-    expect(fsMock.writeFile).toHaveBeenCalledWith(
+    expect(fsMock.outputFile).toHaveBeenCalledTimes(1);
+    expect(fsMock.outputFile).toHaveBeenCalledWith(
       resolvePath(mockContext.workspacePath, 'catalog-info.yaml'),
       yaml.stringify(entity),
     );
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.test.ts
index 658e4365bf..469b4d5c6d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.test.ts
@@ -59,8 +59,8 @@ describe('catalog:write', () => {
       },
     });
 
-    expect(fsMock.writeFile).toHaveBeenCalledTimes(1);
-    expect(fsMock.writeFile).toHaveBeenCalledWith(
+    expect(fsMock.outputFile).toHaveBeenCalledTimes(1);
+    expect(fsMock.outputFile).toHaveBeenCalledWith(
       resolvePath(mockContext.workspacePath, 'catalog-info.yaml'),
       yaml.stringify(entity),
     );
@@ -88,8 +88,8 @@ describe('catalog:write', () => {
       },
     });
 
-    expect(fsMock.writeFile).toHaveBeenCalledTimes(1);
-    expect(fsMock.writeFile).toHaveBeenCalledWith(
+    expect(fsMock.outputFile).toHaveBeenCalledTimes(1);
+    expect(fsMock.outputFile).toHaveBeenCalledWith(
       resolvePath(mockContext.workspacePath, 'some-dir/entity-info.yaml'),
       yaml.stringify(entity),
     );
@@ -118,8 +118,8 @@ describe('catalog:write', () => {
       'backstage.io/source-template': 'template:default/test-skeleton',
     };
 
-    expect(fsMock.writeFile).toHaveBeenCalledTimes(1);
-    expect(fsMock.writeFile).toHaveBeenCalledWith(
+    expect(fsMock.outputFile).toHaveBeenCalledTimes(1);
+    expect(fsMock.outputFile).toHaveBeenCalledWith(
       resolvePath(mockContext.workspacePath, 'catalog-info.yaml'),
       yaml.stringify(expectedEntity),
     );
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts
index a957adb71a..29ce6c986d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts
@@ -54,7 +54,7 @@ export function createCatalogWriteAction() {
       const path = filePath ?? 'catalog-info.yaml';
       ctx.logger.info(`Writing ${path}`);
 
-      await fs.writeFile(
+      await fs.outputFile(
         resolveSafeChildPath(ctx.workspacePath, path),
         yaml.stringify({
           ...entity,

From cc21fa8f4e599273357339eaaca378a840272754 Mon Sep 17 00:00:00 2001
From: Nishkarsh Raj <nishkarshraj000@gmail.com>
Date: Thu, 25 Jul 2024 14:25:27 +0000
Subject: [PATCH 191/225] Making StatusNeo Partner logo consistent with color
 scheme

Signed-off-by: Nishkarsh Raj <nishkarshraj000@gmail.com>
---
 .../static/img/partner-logo-statusneo.png     | Bin 4663 -> 4396 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/microsite/static/img/partner-logo-statusneo.png b/microsite/static/img/partner-logo-statusneo.png
index 4209ecaca30647db6ea50cc2ceb4ad2d8e07aa92..61a676a2207109feb905815cadd6735df1653f3a 100644
GIT binary patch
literal 4396
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
SsCe!FmC)BV(n4w2hyM?ImwcB1

literal 4663
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


From 3c2976d7ea93f1b0137424b7c83737d880efbb7b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 14:51:30 +0000
Subject: [PATCH 192/225] chore(deps): update actions/setup-node action to
 v4.0.3

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/api-breaking-changes.yml           | 2 +-
 .github/workflows/ci.yml                             | 6 +++---
 .github/workflows/deploy_docker-image.yml            | 2 +-
 .github/workflows/deploy_microsite.yml               | 2 +-
 .github/workflows/deploy_nightly.yml                 | 2 +-
 .github/workflows/deploy_packages.yml                | 4 ++--
 .github/workflows/sync_code-formatting.yml           | 2 +-
 .github/workflows/sync_release-manifest.yml          | 2 +-
 .github/workflows/sync_snyk-github-issues.yml        | 2 +-
 .github/workflows/verify_accessibility.yml           | 2 +-
 .github/workflows/verify_e2e-kubernetes.yml          | 2 +-
 .github/workflows/verify_e2e-linux.yml               | 2 +-
 .github/workflows/verify_e2e-windows.yml             | 2 +-
 .github/workflows/verify_microsite.yml               | 2 +-
 .github/workflows/verify_microsite_accessibility.yml | 2 +-
 .github/workflows/verify_storybook.yml               | 2 +-
 .github/workflows/verify_windows.yml                 | 2 +-
 17 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/api-breaking-changes.yml b/.github/workflows/api-breaking-changes.yml
index e334a29b82..c39fdf7f7c 100644
--- a/.github/workflows/api-breaking-changes.yml
+++ b/.github/workflows/api-breaking-changes.yml
@@ -27,7 +27,7 @@ jobs:
         run: git fetch --depth 1 origin ${{ github.base_ref }}
 
       - name: setup-node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 18.x
           registry-url: https://registry.npmjs.org/
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 135076ba40..168d6205e4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
@@ -216,7 +216,7 @@ jobs:
         run: git fetch origin ${{ github.event.pull_request.base.ref }}
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/deploy_docker-image.yml b/.github/workflows/deploy_docker-image.yml
index 8b4709337a..9f305f9a20 100644
--- a/.github/workflows/deploy_docker-image.yml
+++ b/.github/workflows/deploy_docker-image.yml
@@ -31,7 +31,7 @@ jobs:
           ref: ${{ github.event.client_payload.version && env.RELEASE_VERSION || github.ref }}
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/deploy_microsite.yml b/.github/workflows/deploy_microsite.yml
index a0cdae5774..be46bcfaa0 100644
--- a/.github/workflows/deploy_microsite.yml
+++ b/.github/workflows/deploy_microsite.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js 18.x
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 18.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/deploy_nightly.yml b/.github/workflows/deploy_nightly.yml
index db9489dbb8..5488b9a189 100644
--- a/.github/workflows/deploy_nightly.yml
+++ b/.github/workflows/deploy_nightly.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js 18.x
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 18.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/deploy_packages.yml b/.github/workflows/deploy_packages.yml
index 81e95fab97..7ae5637986 100644
--- a/.github/workflows/deploy_packages.yml
+++ b/.github/workflows/deploy_packages.yml
@@ -77,7 +77,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
@@ -161,7 +161,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/sync_code-formatting.yml b/.github/workflows/sync_code-formatting.yml
index 9886c94830..da6bd2592d 100644
--- a/.github/workflows/sync_code-formatting.yml
+++ b/.github/workflows/sync_code-formatting.yml
@@ -20,7 +20,7 @@ jobs:
           fetch-depth: 0
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/sync_release-manifest.yml b/.github/workflows/sync_release-manifest.yml
index 6d02309f8a..62dd7e0c13 100644
--- a/.github/workflows/sync_release-manifest.yml
+++ b/.github/workflows/sync_release-manifest.yml
@@ -19,7 +19,7 @@ jobs:
           ref: v${{ github.event.client_payload.version }}
 
       - name: use node.js 18.x
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 18.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/sync_snyk-github-issues.yml b/.github/workflows/sync_snyk-github-issues.yml
index 1cdc0cb22a..1209545da1 100644
--- a/.github/workflows/sync_snyk-github-issues.yml
+++ b/.github/workflows/sync_snyk-github-issues.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js 18.x
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 18.x
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/verify_accessibility.yml b/.github/workflows/verify_accessibility.yml
index bb46bbd4c1..386306dcb1 100644
--- a/.github/workflows/verify_accessibility.yml
+++ b/.github/workflows/verify_accessibility.yml
@@ -26,7 +26,7 @@ jobs:
 
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Use Node.js 18.x
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 18.x
       - name: yarn install
diff --git a/.github/workflows/verify_e2e-kubernetes.yml b/.github/workflows/verify_e2e-kubernetes.yml
index b7465945ea..4647505cbf 100644
--- a/.github/workflows/verify_e2e-kubernetes.yml
+++ b/.github/workflows/verify_e2e-kubernetes.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/verify_e2e-linux.yml b/.github/workflows/verify_e2e-linux.yml
index d6491f1e3c..fa303ce1c6 100644
--- a/.github/workflows/verify_e2e-linux.yml
+++ b/.github/workflows/verify_e2e-linux.yml
@@ -53,7 +53,7 @@ jobs:
           git config --global user.name 'GitHub e2e user'
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/verify_e2e-windows.yml b/.github/workflows/verify_e2e-windows.yml
index d7575cadf7..bc782c4bd3 100644
--- a/.github/workflows/verify_e2e-windows.yml
+++ b/.github/workflows/verify_e2e-windows.yml
@@ -50,7 +50,7 @@ jobs:
           git config --global user.name 'GitHub e2e user'
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/verify_microsite.yml b/.github/workflows/verify_microsite.yml
index 1a5bc8075b..08dcddde8e 100644
--- a/.github/workflows/verify_microsite.yml
+++ b/.github/workflows/verify_microsite.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js 18.x
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 18.x
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
diff --git a/.github/workflows/verify_microsite_accessibility.yml b/.github/workflows/verify_microsite_accessibility.yml
index c9ed1696cd..220e2633c3 100644
--- a/.github/workflows/verify_microsite_accessibility.yml
+++ b/.github/workflows/verify_microsite_accessibility.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Use Node.js 18.x
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: 18.x
 
diff --git a/.github/workflows/verify_storybook.yml b/.github/workflows/verify_storybook.yml
index 83ddac8429..2f93b67616 100644
--- a/.github/workflows/verify_storybook.yml
+++ b/.github/workflows/verify_storybook.yml
@@ -37,7 +37,7 @@ jobs:
           fetch-depth: 0 # Required to retrieve git history
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
diff --git a/.github/workflows/verify_windows.yml b/.github/workflows/verify_windows.yml
index 736193cad6..109e2ee96e 100644
--- a/.github/workflows/verify_windows.yml
+++ b/.github/workflows/verify_windows.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: use node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth

From 22736b6156e491542b74c5c3ccb0235a5c80a7f0 Mon Sep 17 00:00:00 2001
From: Raghunandan Balachandran <raghunandan@spotify.com>
Date: Wed, 24 Jul 2024 09:36:32 +0200
Subject: [PATCH 193/225] Update project areas and codeowners

Signed-off-by: Raghunandan Balachandran <raghunandan@spotify.com>
---
 .github/CODEOWNERS | 16 +++++++---------
 OWNERS.md          | 18 +++++++++++++++---
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9cd3bc0690..a0c83a42bd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,10 +9,10 @@ yarn.lock                                         @backstage/maintainers @backst
 */yarn.lock                                       @backstage/maintainers @backstage-service
 /.changeset/*.md
 /beps/0001-notifications-system                   @backstage/maintainers @backstage/notifications-maintainers
-/docs/assets/search                               @backstage/discoverability-maintainers
-/docs/features/search                             @backstage/discoverability-maintainers
+/docs/assets/search                               @backstage/search-maintainers
+/docs/features/search                             @backstage/search-maintainers
 /docs/features/techdocs                           @backstage/techdocs-maintainers
-/docs/plugins/integrating-search-into-plugins.md  @backstage/discoverability-maintainers
+/docs/plugins/integrating-search-into-plugins.md  @backstage/search-maintainers
 /packages/cli/src/commands/onboard                @backstage/sharks
 /packages/backend-openapi-utils                   @backstage/maintainers @backstage/reviewers @backstage/openapi-tooling-maintainers
 /packages/techdocs-cli                            @backstage/techdocs-maintainers
@@ -50,8 +50,8 @@ yarn.lock                                         @backstage/maintainers @backst
 /plugins/explore-react                            @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
 /plugins/fossa                                    @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
 /plugins/git-release-manager                      @backstage/maintainers @backstage/reviewers @erikengervall
-/plugins/home                                     @backstage/discoverability-maintainers
-/plugins/home-*                                   @backstage/discoverability-maintainers
+/plugins/home                                     @backstage/home-maintainers
+/plugins/home-*                                   @backstage/home-maintainers
 /plugins/kafka                                    @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/kafka-backend                            @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/kubernetes                               @backstage/kubernetes-maintainers
@@ -70,13 +70,11 @@ yarn.lock                                         @backstage/maintainers @backst
 /plugins/rollbar-backend                          @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/scaffolder                               @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers
 /plugins/scaffolder-*                             @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers
-/plugins/search                                   @backstage/discoverability-maintainers
-/plugins/search-*                                 @backstage/discoverability-maintainers
+/plugins/search                                   @backstage/search-maintainers
+/plugins/search-*                                 @backstage/search-maintainers
 /plugins/signals                                  @backstage/maintainers @backstage/notifications-maintainers
 /plugins/signals-*                                @backstage/maintainers @backstage/notifications-maintainers
 /plugins/sonarqube                                @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
-/plugins/stack-overflow                           @backstage/discoverability-maintainers
-/plugins/stack-overflow-backend                   @backstage/discoverability-maintainers
 /plugins/techdocs                                 @backstage/techdocs-maintainers
 /plugins/techdocs-*                               @backstage/techdocs-maintainers
 /plugins/user-settings-backend                    @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
diff --git a/OWNERS.md b/OWNERS.md
index 5012181d21..53113ac84d 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -32,11 +32,11 @@ Scope: The catalog plugin and catalog model
 | Patrik Oldsberg      | Spotify      | Cubic Belugas | [Rugvip](https://github.com/Rugvip)             | `Rugvip#0019`   |
 | Vincenzo Scamporlino | Spotify      | Cubic Belugas | [vinzscam](http://github.com/vinzscam)          | `vinzscam#6944` |
 
-### Discoverability
+### Home
 
-Team: @backstage/discoverability-maintainers
+Team: @backstage/home-maintainers
 
-Scope: Discoverability within Backstage, including the home page, information architecture, and search
+Scope: The Backstage home page and information architecture
 
 | Name                     | Organization | Team           | GitHub                                   | Discord           |
 | ------------------------ | ------------ | -------------- | ---------------------------------------- | ----------------- |
@@ -46,6 +46,18 @@ Scope: Discoverability within Backstage, including the home page, information ar
 | Raghunandan Balachandran | Spotify      | Infinite Buck$ | [soapraj](http://github.com/soapraj)     | raghunandanb#1114 |
 | Bailey Brooks            | Spotify      | Infinite Buck$ | [bailey](http://github.com/bailey)       | \_bailey4         |
 
+### Search
+
+Team: @backstage/search-maintainers
+
+Scope: The Backstage Search plugin
+
+| Name                     | Organization | Team           | GitHub                                        | Discord           |
+| ------------------------ | ------------ | -------------- | ----------------------------------------------| ----------------- |
+| Emma Indal               | Spotify      | Infinite Buck$ | [emmaindal](http://github.com/emmaindal)      | emmaindal#7503    |
+| Raghunandan Balachandran | Spotify      | Infinite Buck$ | [soapraj](http://github.com/soapraj)          | raghunandanb#1114 |
+| Alex Lorenzi             | Spotify      | ProTean        | [AlexLorenzi](https://github.com/AlexLorenzi) | alexlorenzi       |
+
 ### Helm Charts
 
 Team: @backstage/helm-chart-maintainers

From 518d03fa77197bf15981e99603b892e4046fca68 Mon Sep 17 00:00:00 2001
From: Raghunandan Balachandran <raghunandan@spotify.com>
Date: Wed, 24 Jul 2024 09:36:57 +0200
Subject: [PATCH 194/225] Update github workflows

Signed-off-by: Raghunandan Balachandran <raghunandan@spotify.com>
---
 .github/issue-labeler.yml | 2 +-
 .github/labeler.yml       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml
index 6d74ce8902..c6c6ef115f 100644
--- a/.github/issue-labeler.yml
+++ b/.github/issue-labeler.yml
@@ -1,6 +1,6 @@
 area:techdocs:
   - '/(techdocs|tech-docs|tech docs)/i'
-area:discoverability:
+area:search:
   - '/search/i'
 area:events:
   - '/events/i'
diff --git a/.github/labeler.yml b/.github/labeler.yml
index a58da1d2f7..e6568091b8 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -4,7 +4,11 @@ area:catalog:
           - plugins/catalog/**/*
           - plugins/catalog-*/**/*
           - packages/catalog-*/**/*
-area:discoverability: # search + home
+area:home:
+  - changed-files:
+      - any-glob-to-any-file:
+          - plugins/home/**/*
+area:search:
   - changed-files:
       - any-glob-to-any-file:
           - plugins/search/**/*

From c085f90135657dd9b7d4cba58cb9d19c3af0d1d0 Mon Sep 17 00:00:00 2001
From: Raghunandan Balachandran <raghunandan@spotify.com>
Date: Wed, 24 Jul 2024 09:37:23 +0200
Subject: [PATCH 195/225] Update home plugin ownership

Signed-off-by: Raghunandan Balachandran <raghunandan@spotify.com>
---
 plugins/home-react/catalog-info.yaml | 2 +-
 plugins/home/catalog-info.yaml       | 2 +-
 plugins/home/src/plugin.test.ts      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/home-react/catalog-info.yaml b/plugins/home-react/catalog-info.yaml
index 28109b9ddc..7022206fb9 100644
--- a/plugins/home-react/catalog-info.yaml
+++ b/plugins/home-react/catalog-info.yaml
@@ -9,4 +9,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-web-library
-  owner: discoverability-maintainers
+  owner: home-maintainers
diff --git a/plugins/home/catalog-info.yaml b/plugins/home/catalog-info.yaml
index 1b23d4b83b..eefc114313 100644
--- a/plugins/home/catalog-info.yaml
+++ b/plugins/home/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-frontend-plugin
-  owner: discoverability-maintainers
+  owner: home-maintainers
diff --git a/plugins/home/src/plugin.test.ts b/plugins/home/src/plugin.test.ts
index 1526bd0c61..904481c98e 100644
--- a/plugins/home/src/plugin.test.ts
+++ b/plugins/home/src/plugin.test.ts
@@ -24,7 +24,7 @@ describe('home', () => {
 
   // Temporarily ensure we are installing a working version of the react-grid-layout library
   // For more details, see: https://github.com/react-grid-layout/react-grid-layout/issues/1959
-  // TODO(@backstage/discoverability-maintainers): Delete this once the sub-dependency issue has been resolved.
+  // TODO(@backstage/home-maintainers): Delete this once the sub-dependency issue has been resolved.
   it('should pin react-grid-layout version to 1.3.4', async () => {
     expect(packageJson.dependencies['react-grid-layout']).toBe('1.3.4');
   });

From 8ecb7a5e84128f257b26b5cf9941906f0ad2f734 Mon Sep 17 00:00:00 2001
From: Raghunandan Balachandran <raghunandan@spotify.com>
Date: Wed, 24 Jul 2024 09:37:39 +0200
Subject: [PATCH 196/225] Update search plugin ownership

Signed-off-by: Raghunandan Balachandran <raghunandan@spotify.com>
---
 plugins/search-backend-module-catalog/catalog-info.yaml         | 2 +-
 plugins/search-backend-module-elasticsearch/catalog-info.yaml   | 2 +-
 .../src/engines/ElasticSearchSearchEngine.ts                    | 2 +-
 plugins/search-backend-module-explore/catalog-info.yaml         | 2 +-
 plugins/search-backend-module-pg/catalog-info.yaml              | 2 +-
 .../src/PgSearchEngine/PgSearchEngineIndexer.ts                 | 2 +-
 .../catalog-info.yaml                                           | 2 +-
 plugins/search-backend-module-techdocs/catalog-info.yaml        | 2 +-
 plugins/search-backend-node/catalog-info.yaml                   | 2 +-
 plugins/search-backend/catalog-info.yaml                        | 2 +-
 plugins/search-common/catalog-info.yaml                         | 2 +-
 plugins/search-react/catalog-info.yaml                          | 2 +-
 plugins/search/catalog-info.yaml                                | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/search-backend-module-catalog/catalog-info.yaml b/plugins/search-backend-module-catalog/catalog-info.yaml
index d36627848e..c826ea3edf 100644
--- a/plugins/search-backend-module-catalog/catalog-info.yaml
+++ b/plugins/search-backend-module-catalog/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-elasticsearch/catalog-info.yaml b/plugins/search-backend-module-elasticsearch/catalog-info.yaml
index 300d1034c9..f2ee291f2b 100644
--- a/plugins/search-backend-module-elasticsearch/catalog-info.yaml
+++ b/plugins/search-backend-module-elasticsearch/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index 93312c9fba..0832aaea85 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -313,7 +313,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     });
 
     // Attempt cleanup upon failure.
-    // todo(@backstage/discoverability-maintainers): Consider introducing a more
+    // todo(@backstage/search-maintainers): Consider introducing a more
     // formal mechanism for handling such errors in BatchSearchEngineIndexer and
     // replacing this handler with it. See: #17291
     indexer.on('error', async e => {
diff --git a/plugins/search-backend-module-explore/catalog-info.yaml b/plugins/search-backend-module-explore/catalog-info.yaml
index 237e7a0f98..51ebb70df9 100644
--- a/plugins/search-backend-module-explore/catalog-info.yaml
+++ b/plugins/search-backend-module-explore/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-pg/catalog-info.yaml b/plugins/search-backend-module-pg/catalog-info.yaml
index 47b9717882..eae771518e 100644
--- a/plugins/search-backend-module-pg/catalog-info.yaml
+++ b/plugins/search-backend-module-pg/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
index ab5ae8be54..c460889bd4 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
@@ -104,7 +104,7 @@ export class PgSearchEngineIndexer extends BatchSearchEngineIndexer {
    * therefore an open connection to PG. This handler ensures we close the
    * transaction and associated connection.
    *
-   * todo(@backstage/discoverability-maintainers): Consider introducing a more
+   * todo(@backstage/search-maintainers): Consider introducing a more
    * formal mechanism for handling such errors in BatchSearchEngineIndexer and
    * replacing this method with it. See: #17291
    *
diff --git a/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml b/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml
index ed73bd0eca..9d77a5a00d 100644
--- a/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml
+++ b/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-techdocs/catalog-info.yaml b/plugins/search-backend-module-techdocs/catalog-info.yaml
index a0bbfc5bb7..11a14c8dc3 100644
--- a/plugins/search-backend-module-techdocs/catalog-info.yaml
+++ b/plugins/search-backend-module-techdocs/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-node/catalog-info.yaml b/plugins/search-backend-node/catalog-info.yaml
index 5f6b36256f..7d3629bd20 100644
--- a/plugins/search-backend-node/catalog-info.yaml
+++ b/plugins/search-backend-node/catalog-info.yaml
@@ -9,4 +9,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-node-library
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend/catalog-info.yaml b/plugins/search-backend/catalog-info.yaml
index 2b8c7ee346..977ad12539 100644
--- a/plugins/search-backend/catalog-info.yaml
+++ b/plugins/search-backend/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-backend-plugin
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-common/catalog-info.yaml b/plugins/search-common/catalog-info.yaml
index d7e77a8d10..d1d9c4909c 100644
--- a/plugins/search-common/catalog-info.yaml
+++ b/plugins/search-common/catalog-info.yaml
@@ -9,4 +9,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-common-library
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-react/catalog-info.yaml b/plugins/search-react/catalog-info.yaml
index 799b3d19c3..c6c39dcb0d 100644
--- a/plugins/search-react/catalog-info.yaml
+++ b/plugins/search-react/catalog-info.yaml
@@ -6,4 +6,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-web-library
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search/catalog-info.yaml b/plugins/search/catalog-info.yaml
index e1e4ae21da..cb2d5f3641 100644
--- a/plugins/search/catalog-info.yaml
+++ b/plugins/search/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-frontend-plugin
-  owner: discoverability-maintainers
+  owner: search-maintainers

From 4dfd3c18f5572ec8f657186db0088b829fbcdfa2 Mon Sep 17 00:00:00 2001
From: Raghunandan Balachandran <raghunandan@spotify.com>
Date: Wed, 24 Jul 2024 10:53:58 +0200
Subject: [PATCH 197/225] Add changeset

Signed-off-by: Raghunandan Balachandran <raghunandan@spotify.com>
---
 .changeset/yellow-clocks-fail.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .changeset/yellow-clocks-fail.md

diff --git a/.changeset/yellow-clocks-fail.md b/.changeset/yellow-clocks-fail.md
new file mode 100644
index 0000000000..36e2d4b804
--- /dev/null
+++ b/.changeset/yellow-clocks-fail.md
@@ -0,0 +1,17 @@
+---
+'@backstage/plugin-search-backend-module-stack-overflow-collator': patch
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/plugin-search-backend-module-techdocs': patch
+'@backstage/plugin-search-backend-module-catalog': patch
+'@backstage/plugin-search-backend-module-explore': patch
+'@backstage/plugin-search-backend-module-pg': patch
+'@backstage/plugin-search-backend-node': patch
+'@backstage/plugin-search-backend': patch
+'@backstage/plugin-search-common': patch
+'@backstage/plugin-search-react': patch
+'@backstage/plugin-home-react': patch
+'@backstage/plugin-search': patch
+'@backstage/plugin-home': patch
+---
+
+Update ownership for home and search plugins

From c64c46769a3782b6442db8497eca812dfd92c47f Mon Sep 17 00:00:00 2001
From: Raghunandan Balachandran <raghunandan@spotify.com>
Date: Wed, 24 Jul 2024 14:40:03 +0200
Subject: [PATCH 198/225] Prettier fix

Signed-off-by: Raghunandan Balachandran <raghunandan@spotify.com>
---
 OWNERS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OWNERS.md b/OWNERS.md
index 53113ac84d..b145205539 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -53,7 +53,7 @@ Team: @backstage/search-maintainers
 Scope: The Backstage Search plugin
 
 | Name                     | Organization | Team           | GitHub                                        | Discord           |
-| ------------------------ | ------------ | -------------- | ----------------------------------------------| ----------------- |
+| ------------------------ | ------------ | -------------- | --------------------------------------------- | ----------------- |
 | Emma Indal               | Spotify      | Infinite Buck$ | [emmaindal](http://github.com/emmaindal)      | emmaindal#7503    |
 | Raghunandan Balachandran | Spotify      | Infinite Buck$ | [soapraj](http://github.com/soapraj)          | raghunandanb#1114 |
 | Alex Lorenzi             | Spotify      | ProTean        | [AlexLorenzi](https://github.com/AlexLorenzi) | alexlorenzi       |

From 1383f4c98cb16ed97f1e5064b30beb94b934dcdf Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 10:04:55 +0200
Subject: [PATCH 199/225] Update .changeset/neat-bears-divide.md

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/neat-bears-divide.md | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/.changeset/neat-bears-divide.md b/.changeset/neat-bears-divide.md
index b40db6c7bd..a94b17f74d 100644
--- a/.changeset/neat-bears-divide.md
+++ b/.changeset/neat-bears-divide.md
@@ -1,28 +1,5 @@
 ---
-'@backstage/config-loader': major
+'@backstage/config-loader': patch
 ---
 
-**BREAKING** The `env` property on the `ConfigSourcesDefaultOptions` interface allows for undefined members.
-
-This change makes `ConfigSourcesDefaultOptions.env` consistent with other parts of this package and the wider
-`node` ecosystem. Specifically, with this update `ConfigSourcesDefaultOptions.env`'s types match:
-
-#### EnvConfigSource
-
-- [`EnvConfigSource.constructor`](https://github.com/backstage/backstage/blob/c780320418b7775f18fc0d2cc279ee7db9c7cb25/packages/config-loader/src/sources/EnvConfigSource.ts#L68)
-- [`EnvConfigSourceOptions`](https://github.com/backstage/backstage/blob/c780320418b7775f18fc0d2cc279ee7db9c7cb25/packages/config-loader/src/sources/EnvConfigSource.ts#L31)
-- [`readEnvConfig`](https://github.com/backstage/backstage/blob/c780320418b7775f18fc0d2cc279ee7db9c7cb25/packages/config-loader/src/sources/EnvConfigSource.ts#L114)
-
-#### NodeJS process.env
-
-- [`ProcessEnv`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/aa121ee3a7a3caa16433b66c1103df5904f612ea/types/node/v18/process.d.ts#L137)
-  which extends [`Dict`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/aa121ee3a7a3caa16433b66c1103df5904f612ea/types/node/v18/globals.d.ts#L333-L335)
-
-While this is a somewhat trivial change, it does loosen typings on a public interface, so by definition it's a breaking
-change and a major version bump.
-
-You may meed to update your backstage instance if you have built an implementation of `ConfigSources` or any other
-functionality that relies on `ConfigSourcesDefaultOptions`. This change means you'll have to update that code to account
-for the possibility of `undefined` values inside `ConfigSourcesDefaultOptions.env`, although it is very likely already
-accounted for as the typings for [`process.env`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/aa121ee3a7a3caa16433b66c1103df5904f612ea/types/node/v18/process.d.ts#L137)
-already include the possibility of [`undefined`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/aa121ee3a7a3caa16433b66c1103df5904f612ea/types/node/v18/globals.d.ts#L333-L335).
+The `env` option of `ConfigSources.default` now correctly allows undefined members.

From d21d3079fc5950762b7619667bbb321b524520e4 Mon Sep 17 00:00:00 2001
From: parmar-abhinav <abhinav.parmar@infosys.com>
Date: Fri, 26 Jul 2024 13:38:08 +0530
Subject: [PATCH 200/225] Added examples for github:environment:create action
 and improve its test cases

Signed-off-by: parmar-abhinav <abhinav.parmar@infosys.com>
---
 .changeset/big-eagles-grab.md                 |   5 +
 .../src/actions/gitHubEnvironment.examples.ts | 206 +++++++
 .../githubEnvironment.examples.test.ts        | 518 ++++++++++++++++++
 3 files changed, 729 insertions(+)
 create mode 100644 .changeset/big-eagles-grab.md

diff --git a/.changeset/big-eagles-grab.md b/.changeset/big-eagles-grab.md
new file mode 100644
index 0000000000..9ece8f64df
--- /dev/null
+++ b/.changeset/big-eagles-grab.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-github': patch
+---
+
+Added examples for github:environment:create action and improve its test cases
diff --git a/plugins/scaffolder-backend-module-github/src/actions/gitHubEnvironment.examples.ts b/plugins/scaffolder-backend-module-github/src/actions/gitHubEnvironment.examples.ts
index 606424bef0..7c5f7efa3d 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/gitHubEnvironment.examples.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/gitHubEnvironment.examples.ts
@@ -96,4 +96,210 @@ export const examples: TemplateExample[] = [
       ],
     }),
   },
+  {
+    description: 'Create a GitHub Environment with Custom Tag Policies',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            customTagPolicyNames: ['release/*/*', 'v*.*.*'],
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Create a GitHub Environment with Both Branch and Tag Policies',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            deploymentBranchPolicy: {
+              protected_branches: false,
+              custom_branch_policies: true,
+            },
+            customBranchPolicyNames: ['feature/*', 'hotfix/*'],
+            customTagPolicyNames: ['release/*', 'v*'],
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitHub Environment with Full Configuration',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            deploymentBranchPolicy: {
+              protected_branches: false,
+              custom_branch_policies: true,
+            },
+            customBranchPolicyNames: ['dev/*', 'test/*'],
+            customTagPolicyNames: ['v1.*', 'v2.*'],
+            environmentVariables: {
+              API_KEY: '123456789',
+              NODE_ENV: 'production',
+            },
+            secrets: {
+              DATABASE_URL: 'supersecretdatabaseurl',
+              API_SECRET: 'supersecretapisecret',
+            },
+            token: 'ghp_abcdef1234567890',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitHub Environment with Only Token Authentication',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            token: 'ghp_abcdef1234567890',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitHub Environment with No Deployment Policies',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            deploymentBranchPolicy: null,
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Create a GitHub Environment with Custom Branch and Tag Policies',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            deploymentBranchPolicy: {
+              protected_branches: false,
+              custom_branch_policies: true,
+            },
+            customBranchPolicyNames: ['release/*', 'hotfix/*'],
+            customTagPolicyNames: ['v*', 'release-*'],
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitHub Environment with Environment Variables Only',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            environmentVariables: {
+              VAR1: 'value1',
+              VAR2: 'value2',
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'Create a GitHub Environment with Deployment Secrets Only',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            secrets: {
+              SECRET1: 'secretvalue1',
+              SECRET2: 'secretvalue2',
+            },
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Create a GitHub Environment with Deployment Branch Policy and Token',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            deploymentBranchPolicy: {
+              protected_branches: true,
+              custom_branch_policies: false,
+            },
+            token: 'ghp_abcdef1234567890',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description:
+      'Create a GitHub Environment with Environment Variables, Secrets, and Token',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: 'github:environment:create',
+          name: 'Create Environment',
+          input: {
+            repoUrl: 'github.com?repo=repository&owner=owner',
+            name: 'envname',
+            environmentVariables: {
+              VAR1: 'value1',
+              VAR2: 'value2',
+            },
+            secrets: {
+              SECRET1: 'secretvalue1',
+              SECRET2: 'secretvalue2',
+            },
+            token: 'ghp_abcdef1234567890',
+          },
+        },
+      ],
+    }),
+  },
 ];
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubEnvironment.examples.test.ts b/plugins/scaffolder-backend-module-github/src/actions/githubEnvironment.examples.test.ts
index e41e642ca0..c8b133859b 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubEnvironment.examples.test.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubEnvironment.examples.test.ts
@@ -264,4 +264,522 @@ describe('github:environment:create examples', () => {
       encrypted_value: expect.any(String),
     });
   });
+
+  it(`should ${examples[4].description}`, async () => {
+    const input = yaml.parse(examples[4].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: null,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledTimes(2);
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'release/*/*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'tag',
+    });
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'v*.*.*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'tag',
+    });
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).not.toHaveBeenCalled();
+  });
+
+  it(`should ${examples[5].description}`, async () => {
+    const input = yaml.parse(examples[5].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: {
+        custom_branch_policies: true,
+        protected_branches: false,
+      },
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledTimes(4);
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'release/*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'tag',
+    });
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'feature/*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'branch',
+    });
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).not.toHaveBeenCalled();
+  });
+
+  it(`should ${examples[6].description}`, async () => {
+    const input = yaml.parse(examples[6].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: {
+        custom_branch_policies: true,
+        protected_branches: false,
+      },
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledTimes(4);
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'dev/*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'branch',
+    });
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'test/*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'branch',
+    });
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledTimes(2);
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'API_KEY',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      value: '123456789',
+    });
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'NODE_ENV',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      value: 'production',
+    });
+
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledTimes(2);
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledWith({
+      encrypted_value: expect.any(String),
+      environment_name: 'envname',
+      key_id: 'keyid',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      secret_name: 'API_SECRET',
+    });
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledWith({
+      encrypted_value: expect.any(String),
+      environment_name: 'envname',
+      key_id: 'keyid',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      secret_name: 'DATABASE_URL',
+    });
+  });
+
+  it(`should ${examples[7].description}`, async () => {
+    const input = yaml.parse(examples[7].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: null,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).not.toHaveBeenCalled();
+  });
+
+  it(`should ${examples[8].description}`, async () => {
+    const input = yaml.parse(examples[8].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: null,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).not.toHaveBeenCalled();
+  });
+
+  it(`should ${examples[9].description}`, async () => {
+    const input = yaml.parse(examples[9].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: {
+        custom_branch_policies: true,
+        protected_branches: false,
+      },
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledTimes(4);
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'release/*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'branch',
+    });
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'hotfix/*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'branch',
+    });
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'v*',
+      owner: 'owner',
+      repo: 'repository',
+      type: 'tag',
+    });
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).not.toHaveBeenCalled();
+  });
+
+  it(`should ${examples[10].description}`, async () => {
+    const input = yaml.parse(examples[10].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: null,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledTimes(2);
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'VAR1',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      value: 'value1',
+    });
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'VAR2',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      value: 'value2',
+    });
+
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).not.toHaveBeenCalled();
+  });
+
+  it(`should ${examples[11].description}`, async () => {
+    const input = yaml.parse(examples[11].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: null,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).not.toHaveBeenCalled();
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledTimes(2);
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledWith({
+      encrypted_value: expect.any(String),
+      environment_name: 'envname',
+      key_id: 'keyid',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      secret_name: 'SECRET1',
+    });
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledWith({
+      encrypted_value: expect.any(String),
+      environment_name: 'envname',
+      key_id: 'keyid',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      secret_name: 'SECRET2',
+    });
+  });
+
+  it(`should ${examples[12].description}`, async () => {
+    const input = yaml.parse(examples[12].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: {
+        custom_branch_policies: false,
+        protected_branches: true,
+      },
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).not.toHaveBeenCalled();
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).not.toHaveBeenCalled();
+  });
+
+  it(`should ${examples[13].description}`, async () => {
+    const input = yaml.parse(examples[13].example).steps[0].input;
+
+    await action.handler({
+      ...mockContext,
+      input,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createOrUpdateEnvironment,
+    ).toHaveBeenCalledWith({
+      owner: 'owner',
+      repo: 'repository',
+      environment_name: 'envname',
+      deployment_branch_policy: null,
+    });
+
+    expect(
+      mockOctokit.rest.repos.createDeploymentBranchPolicy,
+    ).not.toHaveBeenCalled();
+
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledTimes(2);
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'VAR1',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      value: 'value1',
+    });
+    expect(
+      mockOctokit.rest.actions.createEnvironmentVariable,
+    ).toHaveBeenCalledWith({
+      environment_name: 'envname',
+      name: 'VAR2',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      value: 'value2',
+    });
+
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledTimes(2);
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledWith({
+      encrypted_value: expect.any(String),
+      environment_name: 'envname',
+      key_id: 'keyid',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      secret_name: 'SECRET1',
+    });
+    expect(
+      mockOctokit.rest.actions.createOrUpdateEnvironmentSecret,
+    ).toHaveBeenCalledWith({
+      encrypted_value: expect.any(String),
+      environment_name: 'envname',
+      key_id: 'keyid',
+      owner: 'owner',
+      repo: 'repository',
+      repository_id: 'repoid',
+      secret_name: 'SECRET2',
+    });
+  });
 });

From 733cc4f85a5be33969d35ce62da36a1e66b11204 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 11:59:04 +0200
Subject: [PATCH 201/225] frontend-plugin-api: add the ability for extension
 data refs to encapsulate values

Co-authored-by: blam <ben@blam.sh>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/createExtensionDataRef.test.ts | 19 +++++-
 .../src/wiring/createExtensionDataRef.ts      | 65 ++++++++++++-------
 2 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.test.ts b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.test.ts
index f979a7def0..4b652298f1 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.test.ts
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import { createExtensionDataRef } from './createExtensionDataRef';
+import {
+  ExtensionDataValue,
+  createExtensionDataRef,
+} from './createExtensionDataRef';
 
 describe('createExtensionDataRef', () => {
   it('can be created and read', () => {
@@ -34,4 +37,18 @@ describe('createExtensionDataRef', () => {
     expect(refOptional.id).toBe('foo');
     expect(String(refOptional)).toBe('ExtensionDataRef{id=foo,optional=true}');
   });
+
+  it('can be used to encapsulate a value', () => {
+    const ref = createExtensionDataRef<string>().with({ id: 'foo' });
+    const val: ExtensionDataValue<string, 'foo'> = ref('hello');
+    expect(val).toEqual({
+      $$type: '@backstage/ExtensionDataValue',
+      id: 'foo',
+      value: 'hello',
+    });
+    // @ts-expect-error
+    ref(3);
+    // @ts-expect-error
+    ref();
+  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
index a1c7b462f2..7e0ff7587e 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
@@ -14,29 +14,37 @@
  * limitations under the License.
  */
 
+/** @public */
+export type ExtensionDataValue<TData, TId extends string> = {
+  readonly $$type: '@backstage/ExtensionDataValue';
+  readonly id: TId;
+  readonly value: TData;
+};
+
 /** @public */
 export type ExtensionDataRef<
   TData,
   TId extends string = string,
   TConfig extends { optional?: true } = {},
 > = {
-  id: TId;
-  T: TData;
-  config: TConfig;
-  $$type: '@backstage/ExtensionDataRef';
+  readonly $$type: '@backstage/ExtensionDataRef';
+  readonly id: TId;
+  readonly T: TData;
+  readonly config: TConfig;
 };
 
 /** @public */
 export interface ConfigurableExtensionDataRef<
-  TId extends string,
   TData,
+  TId extends string,
   TConfig extends { optional?: true } = {},
 > extends ExtensionDataRef<TData, TId, TConfig> {
   optional(): ConfigurableExtensionDataRef<
-    TId,
     TData,
+    TId,
     TData & { optional: true }
   >;
+  (t: TData): ExtensionDataValue<TData, TId>;
 }
 
 /**
@@ -45,36 +53,43 @@ export interface ConfigurableExtensionDataRef<
  */
 export function createExtensionDataRef<TData>(
   id: string,
-): ConfigurableExtensionDataRef<string, TData>;
+): ConfigurableExtensionDataRef<TData, string>;
 /** @public */
 export function createExtensionDataRef<TData>(): {
   with<TId extends string>(options: {
     id: TId;
-  }): ConfigurableExtensionDataRef<TId, TData>;
+  }): ConfigurableExtensionDataRef<TData, TId>;
 };
 export function createExtensionDataRef<TData>(id?: string):
-  | ConfigurableExtensionDataRef<string, TData>
+  | ConfigurableExtensionDataRef<TData, string>
   | {
       with<TId extends string>(options: {
         id: TId;
-      }): ConfigurableExtensionDataRef<TId, TData>;
+      }): ConfigurableExtensionDataRef<TData, TId>;
     } {
   const createRef = <TId extends string>(refId: TId) =>
-    ({
-      id: refId,
-      $$type: '@backstage/ExtensionDataRef',
-      config: {},
-      optional() {
-        return {
-          ...this,
-          config: { ...this.config, optional: true },
-        };
-      },
-      toString() {
-        const optional = Boolean(this.config.optional);
-        return `ExtensionDataRef{id=${refId},optional=${optional}}`;
-      },
-    } as ConfigurableExtensionDataRef<TId, TData, { optional?: true }>);
+    Object.assign(
+      (value: TData): ExtensionDataValue<TData, TId> => ({
+        $$type: '@backstage/ExtensionDataValue',
+        id: refId,
+        value,
+      }),
+      {
+        id: refId,
+        $$type: '@backstage/ExtensionDataRef',
+        config: {},
+        optional() {
+          return {
+            ...this,
+            config: { ...this.config, optional: true },
+          };
+        },
+        toString() {
+          const optional = Boolean(this.config.optional);
+          return `ExtensionDataRef{id=${refId},optional=${optional}}`;
+        },
+      } as ConfigurableExtensionDataRef<TData, TId, { optional?: true }>,
+    );
   if (id) {
     return createRef(id);
   }

From cd9f3a526e34320fb1cd5166bb23ba8f41a10a0f Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 13:56:14 +0200
Subject: [PATCH 202/225] frontend-plugin-api: update createExtensionInput to
 accept an array of refs too + tests

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/createExtensionInput.test.ts   | 181 ++++++++++++++++++
 .../src/wiring/createExtensionInput.ts        |  60 +++++-
 2 files changed, 238 insertions(+), 3 deletions(-)
 create mode 100644 packages/frontend-plugin-api/src/wiring/createExtensionInput.test.ts

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionInput.test.ts b/packages/frontend-plugin-api/src/wiring/createExtensionInput.test.ts
new file mode 100644
index 0000000000..0025789c73
--- /dev/null
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionInput.test.ts
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createExtensionDataRef } from './createExtensionDataRef';
+import { ExtensionInput, createExtensionInput } from './createExtensionInput';
+
+const stringDataRef = createExtensionDataRef<string>().with({ id: 'str' });
+const numberDataRef = createExtensionDataRef<number>().with({ id: 'num' });
+
+function unused(..._any: any[]) {}
+
+describe('createExtensionInput', () => {
+  it('should create a regular input', () => {
+    const input = createExtensionInput([stringDataRef, numberDataRef]);
+    expect(input).toEqual({
+      $$type: '@backstage/ExtensionInput',
+      extensionData: [stringDataRef, numberDataRef],
+      config: { singleton: false, optional: false },
+    });
+
+    const x1: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: false; optional: false }
+    > = input;
+    // @ts-expect-error
+    const x2: ExtensionInput<
+      typeof stringDataRef,
+      never,
+      { singleton: false; optional: false }
+    > = input;
+    // @ts-expect-error
+    const x3: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: true; optional: false }
+    > = input;
+    // @ts-expect-error
+    const x4: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: false; optional: true }
+    > = input;
+
+    unused(x1, x2, x3, x4);
+  });
+
+  it('should create a singleton input', () => {
+    const input = createExtensionInput([stringDataRef, numberDataRef], {
+      singleton: true,
+    });
+    expect(input).toEqual({
+      $$type: '@backstage/ExtensionInput',
+      extensionData: [stringDataRef, numberDataRef],
+      config: { singleton: true, optional: false },
+    });
+
+    const x1: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: true; optional: false }
+    > = input;
+    // @ts-expect-error
+    const x2: ExtensionInput<
+      typeof stringDataRef,
+      never,
+      { singleton: true; optional: false }
+    > = input;
+    // @ts-expect-error
+    const x3: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: false; optional: false }
+    > = input;
+    // @ts-expect-error
+    const x4: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: false; optional: true }
+    > = input;
+
+    unused(x1, x2, x3, x4);
+  });
+
+  it('should create an optional singleton input', () => {
+    const input = createExtensionInput([stringDataRef, numberDataRef], {
+      singleton: true,
+      optional: true,
+    });
+    expect(input).toEqual({
+      $$type: '@backstage/ExtensionInput',
+      extensionData: [stringDataRef, numberDataRef],
+      config: { singleton: true, optional: true },
+    });
+
+    const x1: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: true; optional: true }
+    > = input;
+    // @ts-expect-error
+    const x2: ExtensionInput<
+      typeof stringDataRef,
+      never,
+      { singleton: true; optional: true }
+    > = input;
+    // @ts-expect-error
+    const x3: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: false; optional: false }
+    > = input;
+    // @ts-expect-error
+    const x4: ExtensionInput<
+      typeof stringDataRef | typeof numberDataRef,
+      never,
+      { singleton: false; optional: true }
+    > = input;
+
+    unused(x1, x2, x3, x4);
+  });
+
+  it('should not allow duplicate data refs', () => {
+    expect(() =>
+      createExtensionInput([stringDataRef, stringDataRef], { singleton: true }),
+    ).toThrow("ExtensionInput may not have duplicate data refs: 'str'");
+  });
+
+  describe('old api', () => {
+    it('should create a regular input', () => {
+      const input = createExtensionInput({
+        str: stringDataRef,
+        num: numberDataRef,
+      });
+      expect(input).toEqual({
+        $$type: '@backstage/ExtensionInput',
+        extensionData: { str: stringDataRef, num: numberDataRef },
+        config: { singleton: false, optional: false },
+      });
+
+      const x1: ExtensionInput<
+        never,
+        { str: typeof stringDataRef; num: typeof numberDataRef },
+        { singleton: false; optional: false }
+      > = input;
+      // @ts-expect-error
+      const x2: ExtensionInput<
+        never,
+        { str: typeof numberDataRef; num: typeof stringDataRef }, // switched
+        { singleton: false; optional: false }
+      > = input;
+      // @ts-expect-error
+      const x3: ExtensionInput<
+        never,
+        { str: typeof stringDataRef; num: typeof numberDataRef },
+        { singleton: true; optional: false }
+      > = input;
+      // @ts-expect-error
+      const x4: ExtensionInput<
+        never,
+        { str: typeof stringDataRef; num: typeof numberDataRef },
+        { singleton: false; optional: true }
+      > = input;
+
+      unused(x1, x2, x3, x4);
+    });
+  });
+});
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts b/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
index 1fd8fea972..3c09fcdaeb 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
@@ -15,31 +15,85 @@
  */
 
 import { AnyExtensionDataMap } from './createExtension';
+import { ExtensionDataRef } from './createExtensionDataRef';
 
 /** @public */
 export interface ExtensionInput<
-  TExtensionData extends AnyExtensionDataMap,
+  TExtensionData extends ExtensionDataRef<unknown, string, { optional?: true }>,
+  TExtensionDataMap extends AnyExtensionDataMap,
   TConfig extends { singleton: boolean; optional: boolean },
 > {
   $$type: '@backstage/ExtensionInput';
-  extensionData: TExtensionData;
+  extensionData: TExtensionData | TExtensionDataMap;
   config: TConfig;
 }
 
+/**
+ * @public
+ * @deprecated Use the following form instead: `createExtensionInput([dataRef1, dataRef2])`
+ */
+export function createExtensionInput<
+  TExtensionDataMap extends AnyExtensionDataMap,
+  TConfig extends { singleton?: boolean; optional?: boolean },
+>(
+  extensionData: TExtensionDataMap,
+  config?: TConfig,
+): ExtensionInput<
+  never,
+  TExtensionDataMap,
+  {
+    singleton: TConfig['singleton'] extends true ? true : false;
+    optional: TConfig['optional'] extends true ? true : false;
+  }
+>;
 /** @public */
 export function createExtensionInput<
-  TExtensionData extends AnyExtensionDataMap,
+  UExtensionData extends ExtensionDataRef<unknown, string, { optional?: true }>,
+  TConfig extends { singleton?: boolean; optional?: boolean },
+>(
+  extensionData: Array<UExtensionData>,
+  config?: TConfig,
+): ExtensionInput<
+  UExtensionData,
+  never,
+  {
+    singleton: TConfig['singleton'] extends true ? true : false;
+    optional: TConfig['optional'] extends true ? true : false;
+  }
+>;
+export function createExtensionInput<
+  TExtensionData extends ExtensionDataRef<unknown, string, { optional?: true }>,
+  TExtensionDataMap extends AnyExtensionDataMap,
   TConfig extends { singleton?: boolean; optional?: boolean },
 >(
   extensionData: TExtensionData,
   config?: TConfig,
 ): ExtensionInput<
   TExtensionData,
+  TExtensionDataMap,
   {
     singleton: TConfig['singleton'] extends true ? true : false;
     optional: TConfig['optional'] extends true ? true : false;
   }
 > {
+  if (Array.isArray(extensionData)) {
+    const seen = new Set();
+    const duplicates = [];
+    for (const dataRef of extensionData) {
+      if (seen.has(dataRef.id)) {
+        duplicates.push(dataRef.id);
+      } else {
+        seen.add(dataRef.id);
+      }
+    }
+    if (duplicates.length > 0) {
+      throw new Error(
+        `ExtensionInput may not have duplicate data refs: '${duplicates.join(
+          "', '",
+        )}'`,
+      );
+    }
+  }
   return {
     $$type: '@backstage/ExtensionInput',
     extensionData,

From 0d9c38f1b806e25b3a85bf56f2c14feef8fc8a1c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 15:24:21 +0200
Subject: [PATCH 203/225] frontend-plugin-api: add new version of
 createExtension that avoids data maps

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/createExtension.test.ts        | 113 ++++++++--
 .../src/wiring/createExtension.ts             | 193 ++++++++++++++++--
 .../src/wiring/createExtensionDataRef.ts      |   7 +
 3 files changed, 285 insertions(+), 28 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index 5b737746c2..febc7ec133 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -18,7 +18,8 @@ import { createExtension } from './createExtension';
 import { createExtensionDataRef } from './createExtensionDataRef';
 import { createExtensionInput } from './createExtensionInput';
 
-const stringData = createExtensionDataRef<string>().with({ id: 'string' });
+const stringDataRef = createExtensionDataRef<string>().with({ id: 'string' });
+const numberDataRef = createExtensionDataRef<number>().with({ id: 'number' });
 
 function unused(..._any: any[]) {}
 
@@ -28,7 +29,7 @@ describe('createExtension', () => {
       namespace: 'test',
       attachTo: { id: 'root', input: 'default' },
       output: {
-        foo: stringData,
+        foo: stringDataRef,
       },
     };
     const extension = createExtension({
@@ -42,11 +43,11 @@ describe('createExtension', () => {
     expect(extension.namespace).toBe('test');
 
     // When declared as an error function without a block the TypeScript errors
-    // are a more specific and will point at the property that is problematic.
+    // are a more specific and will often point at the property that is problematic.
+    // @ts-expect-error
     createExtension({
       ...baseConfig,
       factory: () => ({
-        // @ts-expect-error
         foo: 3,
       }),
     });
@@ -166,8 +167,8 @@ describe('createExtension', () => {
       namespace: 'test',
       attachTo: { id: 'root', input: 'default' },
       output: {
-        foo: stringData,
-        bar: stringData.optional(),
+        foo: stringDataRef,
+        bar: stringDataRef.optional(),
       },
     };
     const extension = createExtension({
@@ -185,18 +186,18 @@ describe('createExtension', () => {
         bar: 'baz',
       }),
     });
+    // @ts-expect-error
     createExtension({
       ...baseConfig,
       factory: () => ({
-        // @ts-expect-error
         foo: 3,
       }),
     });
+    // @ts-expect-error
     createExtension({
       ...baseConfig,
       factory: () => ({
         foo: 'bar',
-        // @ts-expect-error
         bar: 3,
       }),
     });
@@ -237,18 +238,18 @@ describe('createExtension', () => {
       attachTo: { id: 'root', input: 'default' },
       inputs: {
         mixed: createExtensionInput({
-          required: stringData,
-          optional: stringData.optional(),
+          required: stringDataRef,
+          optional: stringDataRef.optional(),
         }),
         onlyRequired: createExtensionInput({
-          required: stringData,
+          required: stringDataRef,
         }),
         onlyOptional: createExtensionInput({
-          optional: stringData.optional(),
+          optional: stringDataRef.optional(),
         }),
       },
       output: {
-        foo: stringData,
+        foo: stringDataRef,
       },
       factory({ inputs }) {
         const a1: string = inputs.mixed?.[0].output.required;
@@ -304,7 +305,7 @@ describe('createExtension', () => {
         },
       },
       output: {
-        foo: stringData,
+        foo: stringDataRef,
       },
       factory({ config }) {
         const a1: string = config.foo;
@@ -355,4 +356,88 @@ describe('createExtension', () => {
       return extension.configSchema?.parse({});
     }).toThrow("Missing required value at 'foo'");
   });
+
+  it('should new form of inputs and outputs', () => {
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      inputs: {
+        header: createExtensionInput([stringDataRef.optional()], {
+          optional: true,
+          singleton: true,
+        }),
+        content: createExtensionInput([stringDataRef, numberDataRef], {
+          optional: false,
+          singleton: true,
+        }),
+      },
+      output: [stringDataRef],
+      factory({ inputs }) {
+        const headerStr = inputs.header?.get(stringDataRef);
+        const contentStr = inputs.content.get(stringDataRef);
+        const contentNum = inputs.content.get(numberDataRef);
+
+        // @ts-expect-error
+        inputs.header?.get(numberDataRef);
+
+        // @ts-expect-error
+        const x1: string = headerStr; // string | undefined
+
+        unused(x1);
+
+        return [stringDataRef(contentStr.repeat(contentNum))];
+      },
+    });
+
+    // Double output
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef],
+      // @ts-expect-error
+      factory() {
+        return [stringDataRef('hello'), stringDataRef('hello')];
+      },
+    });
+
+    // Missing output
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef],
+      // @ts-expect-error
+      factory() {
+        return [stringDataRef('hello')];
+      },
+    });
+
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef],
+      factory() {
+        return [stringDataRef('hello'), numberDataRef(4)];
+      },
+    });
+
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef.optional()],
+      factory() {
+        return [stringDataRef('hello'), numberDataRef(4)];
+      },
+    });
+
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef.optional()],
+      factory() {
+        return [stringDataRef('hello')];
+      },
+    });
+
+    expect(true).toBe(true);
+  });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index cc2bec91c9..c514750a84 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -17,17 +17,26 @@
 import { AppNode } from '../apis';
 import { PortableSchema, createSchemaFromZod } from '../schema';
 import { Expand } from '../types';
-import { ExtensionDataRef } from './createExtensionDataRef';
+import {
+  AnyExtensionDataRef,
+  ExtensionDataRef,
+  ExtensionDataValue,
+} from './createExtensionDataRef';
 import { ExtensionInput } from './createExtensionInput';
 import { z } from 'zod';
-/** @public */
+
+/**
+ * @public
+ * @deprecated Extension data maps will be removed.
+ */
 export type AnyExtensionDataMap = {
-  [name in string]: ExtensionDataRef<unknown, string, { optional?: true }>;
+  [name in string]: AnyExtensionDataRef;
 };
 
 /** @public */
 export type AnyExtensionInputMap = {
   [inputName in string]: ExtensionInput<
+    AnyExtensionDataRef,
     AnyExtensionDataMap,
     { optional: boolean; singleton: boolean }
   >;
@@ -36,6 +45,7 @@ export type AnyExtensionInputMap = {
 /**
  * Converts an extension data map into the matching concrete data values type.
  * @public
+ * @deprecated Extension data maps will be removed.
  */
 export type ExtensionDataValues<TExtensionData extends AnyExtensionDataMap> = {
   [DataName in keyof TExtensionData as TExtensionData[DataName]['config'] extends {
@@ -51,22 +61,41 @@ export type ExtensionDataValues<TExtensionData extends AnyExtensionDataMap> = {
     : never]?: TExtensionData[DataName]['T'];
 };
 
+/** @public */
+export type ExtensionDataContainer<UExtensionData extends AnyExtensionDataRef> =
+  {
+    get<TId extends UExtensionData['id']>(
+      ref: ExtensionDataRef<any, TId, any>,
+    ): UExtensionData extends ExtensionDataRef<infer IData, TId, infer IConfig>
+      ? IConfig['optional'] extends true
+        ? IData | undefined
+        : IData
+      : never;
+  };
+
 /**
  * Convert a single extension input into a matching resolved input.
  * @public
  */
-export type ResolvedExtensionInput<TExtensionData extends AnyExtensionDataMap> =
-  {
-    node: AppNode;
-    output: ExtensionDataValues<TExtensionData>;
-  };
+export type ResolvedExtensionInput<
+  TExtensionData extends AnyExtensionDataMap | AnyExtensionDataRef,
+> = [TExtensionData] extends [AnyExtensionDataRef]
+  ? {
+      node: AppNode;
+    } & ExtensionDataContainer<TExtensionData>
+  : TExtensionData extends AnyExtensionDataMap
+  ? {
+      node: AppNode;
+      output: ExtensionDataValues<TExtensionData>;
+    }
+  : never;
 
 /**
  * Converts an extension input map into a matching collection of resolved inputs.
  * @public
  */
 export type ResolvedExtensionInputs<
-  TInputs extends { [name in string]: ExtensionInput<any, any> },
+  TInputs extends { [name in string]: ExtensionInput<any, any, any> },
 > = {
   [InputName in keyof TInputs]: false extends TInputs[InputName]['config']['singleton']
     ? Array<Expand<ResolvedExtensionInput<TInputs[InputName]['extensionData']>>>
@@ -77,8 +106,11 @@ export type ResolvedExtensionInputs<
       >;
 };
 
-/** @public */
-export interface CreateExtensionOptions<
+/**
+ * @public
+ * @deprecated This way of structuring the options is deprecated, this type will be removed in the future
+ */
+export interface LegacyCreateExtensionOptions<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
   TConfig,
@@ -111,6 +143,61 @@ export interface CreateExtensionOptions<
   }): Expand<ExtensionDataValues<TOutput>>;
 }
 
+// TODO(Rugvip): This creates a permutation of all possible output tuples,
+// taking the optionality into account. It's not optimal, since it might hurt
+// performance for large outputs, doesn't provide a very clear error message,
+// and doesn't allow us to refactor to allow for a generator.
+/** @public */
+type ExtensionFactoryOutput<
+  URef extends AnyExtensionDataRef,
+  TPickRef extends AnyExtensionDataRef = URef,
+> = [URef] extends [never]
+  ? []
+  : TPickRef extends ExtensionDataRef<infer IData, infer IId, infer IConfig>
+  ?
+      | (IConfig['optional'] extends true
+          ? ExtensionFactoryOutput<Exclude<URef, TPickRef>>
+          : never)
+      | [
+          ExtensionDataValue<IData, IId>,
+          ...ExtensionFactoryOutput<Exclude<URef, TPickRef>>,
+        ]
+  : never;
+
+/** @public */
+export type CreateExtensionOptions<
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends AnyExtensionInputMap,
+  TConfig,
+  TConfigInput,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
+> = {
+  kind?: string;
+  namespace?: string;
+  name?: string;
+  attachTo: { id: string; input: string };
+  disabled?: boolean;
+  inputs?: TInputs;
+  output: Array<UOutput>;
+  /** @deprecated - use `config.schema` instead */
+  configSchema?: PortableSchema<TConfig, TConfigInput>;
+  config?: {
+    schema: TConfigSchema;
+  };
+  factory(context: {
+    node: AppNode;
+    config: TConfig &
+      (string extends keyof TConfigSchema
+        ? {}
+        : {
+            [key in keyof TConfigSchema]: z.infer<
+              ReturnType<TConfigSchema[key]>
+            >;
+          });
+    inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+  }): ExtensionFactoryOutput<UOutput>;
+};
+
 /** @public */
 export interface ExtensionDefinition<TConfig, TConfigInput = TConfig> {
   $$type: '@backstage/ExtensionDefinition';
@@ -127,12 +214,12 @@ export interface InternalExtensionDefinition<TConfig, TConfigInput>
   extends ExtensionDefinition<TConfig, TConfigInput> {
   readonly version: 'v1';
   readonly inputs: AnyExtensionInputMap;
-  readonly output: AnyExtensionDataMap;
+  readonly output: AnyExtensionDataMap | Array<AnyExtensionDataRef>;
   factory(context: {
     node: AppNode;
     config: TConfig;
     inputs: ResolvedExtensionInputs<any>;
-  }): ExtensionDataValues<any>;
+  }): ExtensionDataValues<any> | Iterable<ExtensionDataValue<any, any>>;
 }
 
 /** @internal */
@@ -157,6 +244,46 @@ export function toInternalExtensionDefinition<TConfig, TConfigInput>(
 }
 
 /** @public */
+export function createExtension<
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      never,
+      { optional: boolean; singleton: boolean }
+    >;
+  },
+  TConfig,
+  TConfigInput,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
+>(
+  options: CreateExtensionOptions<
+    UOutput,
+    TInputs,
+    TConfig,
+    TConfigInput,
+    TConfigSchema
+  >,
+): ExtensionDefinition<
+  TConfig &
+    (string extends keyof TConfigSchema
+      ? {}
+      : {
+          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+        }),
+  TConfigInput &
+    (string extends keyof TConfigSchema
+      ? {}
+      : z.input<
+          z.ZodObject<{
+            [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+          }>
+        >)
+>;
+/**
+ * @public
+ * @deprecated - use the array format of `output` instead, see TODO-doc-link
+ */
 export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
@@ -164,7 +291,7 @@ export function createExtension<
   TConfigInput,
   TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
 >(
-  options: CreateExtensionOptions<
+  options: LegacyCreateExtensionOptions<
     TOutput,
     TInputs,
     TConfig,
@@ -186,6 +313,44 @@ export function createExtension<
             [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
           }>
         >)
+>;
+export function createExtension<
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends AnyExtensionInputMap,
+  TConfig,
+  TConfigInput,
+  TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
+>(
+  options:
+    | CreateExtensionOptions<
+        UOutput,
+        TInputs,
+        TConfig,
+        TConfigInput,
+        TConfigSchema
+      >
+    | LegacyCreateExtensionOptions<
+        AnyExtensionDataMap,
+        TInputs,
+        TConfig,
+        TConfigInput,
+        TConfigSchema
+      >,
+): ExtensionDefinition<
+  TConfig &
+    (string extends keyof TConfigSchema
+      ? {}
+      : {
+          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+        }),
+  TConfigInput &
+    (string extends keyof TConfigSchema
+      ? {}
+      : z.input<
+          z.ZodObject<{
+            [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+          }>
+        >)
 > {
   const newConfigSchema = options.config?.schema;
   if (newConfigSchema && options.configSchema) {
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
index 7e0ff7587e..f4b348ae51 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
@@ -33,6 +33,13 @@ export type ExtensionDataRef<
   readonly config: TConfig;
 };
 
+/** @public */
+export type AnyExtensionDataRef = ExtensionDataRef<
+  unknown,
+  string,
+  { optional?: true }
+>;
+
 /** @public */
 export interface ConfigurableExtensionDataRef<
   TData,

From f4958c9a721221a42de5c1c73793f05c05d52674 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 16:49:54 +0200
Subject: [PATCH 204/225] frontend-plugin-api: update createExtension to use
 union-based verification of factory outputs

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/createExtension.test.ts        | 112 ++++++++++--------
 .../src/wiring/createExtension.ts             |  49 ++++----
 2 files changed, 86 insertions(+), 75 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index febc7ec133..bbf2e539d1 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -357,7 +357,68 @@ describe('createExtension', () => {
     }).toThrow("Missing required value at 'foo'");
   });
 
-  it('should new form of inputs and outputs', () => {
+  it('should support new form of outputs', () => {
+    // @ts-expect-error
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef],
+      factory() {
+        return []; // Missing all outputs
+      },
+    });
+
+    // @ts-expect-error
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef],
+      factory() {
+        return [stringDataRef('hello')]; // Missing number output
+      },
+    });
+
+    // Duplicate output, we won't attempt to handle this a compile time and instead error out at runtime
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef],
+      factory() {
+        return [stringDataRef('hello'), stringDataRef('hello')];
+      },
+    });
+
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef],
+      factory() {
+        return [stringDataRef('hello'), numberDataRef(4)];
+      },
+    });
+
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef.optional()],
+      factory() {
+        return [stringDataRef('hello'), numberDataRef(4)];
+      },
+    });
+
+    createExtension({
+      namespace: 'test',
+      attachTo: { id: 'root', input: 'default' },
+      output: [stringDataRef, numberDataRef.optional()],
+      factory() {
+        return [stringDataRef('hello')]; // Missing number output, but it's optional so that's allowed
+      },
+    });
+
+    expect(true).toBe(true);
+  });
+
+  it('should support new form of inputs', () => {
     createExtension({
       namespace: 'test',
       attachTo: { id: 'root', input: 'default' },
@@ -389,55 +450,6 @@ describe('createExtension', () => {
       },
     });
 
-    // Double output
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef],
-      // @ts-expect-error
-      factory() {
-        return [stringDataRef('hello'), stringDataRef('hello')];
-      },
-    });
-
-    // Missing output
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef],
-      // @ts-expect-error
-      factory() {
-        return [stringDataRef('hello')];
-      },
-    });
-
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef],
-      factory() {
-        return [stringDataRef('hello'), numberDataRef(4)];
-      },
-    });
-
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef.optional()],
-      factory() {
-        return [stringDataRef('hello'), numberDataRef(4)];
-      },
-    });
-
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef.optional()],
-      factory() {
-        return [stringDataRef('hello')];
-      },
-    });
-
     expect(true).toBe(true);
   });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index c514750a84..cfce13d494 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -143,27 +143,6 @@ export interface LegacyCreateExtensionOptions<
   }): Expand<ExtensionDataValues<TOutput>>;
 }
 
-// TODO(Rugvip): This creates a permutation of all possible output tuples,
-// taking the optionality into account. It's not optimal, since it might hurt
-// performance for large outputs, doesn't provide a very clear error message,
-// and doesn't allow us to refactor to allow for a generator.
-/** @public */
-type ExtensionFactoryOutput<
-  URef extends AnyExtensionDataRef,
-  TPickRef extends AnyExtensionDataRef = URef,
-> = [URef] extends [never]
-  ? []
-  : TPickRef extends ExtensionDataRef<infer IData, infer IId, infer IConfig>
-  ?
-      | (IConfig['optional'] extends true
-          ? ExtensionFactoryOutput<Exclude<URef, TPickRef>>
-          : never)
-      | [
-          ExtensionDataValue<IData, IId>,
-          ...ExtensionFactoryOutput<Exclude<URef, TPickRef>>,
-        ]
-  : never;
-
 /** @public */
 export type CreateExtensionOptions<
   UOutput extends AnyExtensionDataRef,
@@ -171,6 +150,7 @@ export type CreateExtensionOptions<
   TConfig,
   TConfigInput,
   TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
+  UFactoryOutput extends ExtensionDataValue<any, any>,
 > = {
   kind?: string;
   namespace?: string;
@@ -195,8 +175,23 @@ export type CreateExtensionOptions<
             >;
           });
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-  }): ExtensionFactoryOutput<UOutput>;
-};
+  }): Iterable<UFactoryOutput>;
+} & ((
+  UOutput extends any
+    ? UOutput['config']['optional'] extends true
+      ? never
+      : UOutput['id']
+    : never
+) extends infer IRequiredOutputIds
+  ? [IRequiredOutputIds] extends [UFactoryOutput['id']]
+    ? {}
+    : {
+        'Error: The extension factory is missing the following outputs': Exclude<
+          IRequiredOutputIds,
+          UFactoryOutput['id']
+        >;
+      }
+  : never);
 
 /** @public */
 export interface ExtensionDefinition<TConfig, TConfigInput = TConfig> {
@@ -256,13 +251,15 @@ export function createExtension<
   TConfig,
   TConfigInput,
   TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
+  UFactoryOutput extends ExtensionDataValue<any, any>,
 >(
   options: CreateExtensionOptions<
     UOutput,
     TInputs,
     TConfig,
     TConfigInput,
-    TConfigSchema
+    TConfigSchema,
+    UFactoryOutput
   >,
 ): ExtensionDefinition<
   TConfig &
@@ -320,6 +317,7 @@ export function createExtension<
   TConfig,
   TConfigInput,
   TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
+  UFactoryOutput extends ExtensionDataValue<any, any>,
 >(
   options:
     | CreateExtensionOptions<
@@ -327,7 +325,8 @@ export function createExtension<
         TInputs,
         TConfig,
         TConfigInput,
-        TConfigSchema
+        TConfigSchema,
+        UFactoryOutput
       >
     | LegacyCreateExtensionOptions<
         AnyExtensionDataMap,

From 760d99b138c916bcb20f1bb372390ff2c4fdd7d5 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 17:03:13 +0200
Subject: [PATCH 205/225] frontend-plugin-api: refactor to use
 LegacyExtensionInput type

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/createExtensionInput.test.ts   | 30 ++++----------
 .../src/wiring/createExtensionInput.ts        | 41 +++++++++++++------
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionInput.test.ts b/packages/frontend-plugin-api/src/wiring/createExtensionInput.test.ts
index 0025789c73..e401adc675 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionInput.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionInput.test.ts
@@ -15,7 +15,11 @@
  */
 
 import { createExtensionDataRef } from './createExtensionDataRef';
-import { ExtensionInput, createExtensionInput } from './createExtensionInput';
+import {
+  ExtensionInput,
+  LegacyExtensionInput,
+  createExtensionInput,
+} from './createExtensionInput';
 
 const stringDataRef = createExtensionDataRef<string>().with({ id: 'str' });
 const numberDataRef = createExtensionDataRef<number>().with({ id: 'num' });
@@ -33,25 +37,21 @@ describe('createExtensionInput', () => {
 
     const x1: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: false; optional: false }
     > = input;
     // @ts-expect-error
     const x2: ExtensionInput<
       typeof stringDataRef,
-      never,
       { singleton: false; optional: false }
     > = input;
     // @ts-expect-error
     const x3: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: true; optional: false }
     > = input;
     // @ts-expect-error
     const x4: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: false; optional: true }
     > = input;
 
@@ -70,25 +70,21 @@ describe('createExtensionInput', () => {
 
     const x1: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: true; optional: false }
     > = input;
     // @ts-expect-error
     const x2: ExtensionInput<
       typeof stringDataRef,
-      never,
       { singleton: true; optional: false }
     > = input;
     // @ts-expect-error
     const x3: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: false; optional: false }
     > = input;
     // @ts-expect-error
     const x4: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: false; optional: true }
     > = input;
 
@@ -108,25 +104,21 @@ describe('createExtensionInput', () => {
 
     const x1: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: true; optional: true }
     > = input;
     // @ts-expect-error
     const x2: ExtensionInput<
       typeof stringDataRef,
-      never,
       { singleton: true; optional: true }
     > = input;
     // @ts-expect-error
     const x3: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: false; optional: false }
     > = input;
     // @ts-expect-error
     const x4: ExtensionInput<
       typeof stringDataRef | typeof numberDataRef,
-      never,
       { singleton: false; optional: true }
     > = input;
 
@@ -151,26 +143,22 @@ describe('createExtensionInput', () => {
         config: { singleton: false, optional: false },
       });
 
-      const x1: ExtensionInput<
-        never,
+      const x1: LegacyExtensionInput<
         { str: typeof stringDataRef; num: typeof numberDataRef },
         { singleton: false; optional: false }
       > = input;
       // @ts-expect-error
-      const x2: ExtensionInput<
-        never,
+      const x2: LegacyExtensionInput<
         { str: typeof numberDataRef; num: typeof stringDataRef }, // switched
         { singleton: false; optional: false }
       > = input;
       // @ts-expect-error
-      const x3: ExtensionInput<
-        never,
+      const x3: LegacyExtensionInput<
         { str: typeof stringDataRef; num: typeof numberDataRef },
         { singleton: true; optional: false }
       > = input;
       // @ts-expect-error
-      const x4: ExtensionInput<
-        never,
+      const x4: LegacyExtensionInput<
         { str: typeof stringDataRef; num: typeof numberDataRef },
         { singleton: false; optional: true }
       > = input;
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts b/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
index 3c09fcdaeb..5627bdecc2 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
@@ -20,11 +20,23 @@ import { ExtensionDataRef } from './createExtensionDataRef';
 /** @public */
 export interface ExtensionInput<
   TExtensionData extends ExtensionDataRef<unknown, string, { optional?: true }>,
+  TConfig extends { singleton: boolean; optional: boolean },
+> {
+  $$type: '@backstage/ExtensionInput';
+  extensionData: TExtensionData;
+  config: TConfig;
+}
+
+/**
+ * @public
+ * @deprecated This type will be removed. Use `ExtensionInput` instead.
+ */
+export interface LegacyExtensionInput<
   TExtensionDataMap extends AnyExtensionDataMap,
   TConfig extends { singleton: boolean; optional: boolean },
 > {
   $$type: '@backstage/ExtensionInput';
-  extensionData: TExtensionData | TExtensionDataMap;
+  extensionData: TExtensionDataMap;
   config: TConfig;
 }
 
@@ -38,8 +50,7 @@ export function createExtensionInput<
 >(
   extensionData: TExtensionDataMap,
   config?: TConfig,
-): ExtensionInput<
-  never,
+): LegacyExtensionInput<
   TExtensionDataMap,
   {
     singleton: TConfig['singleton'] extends true ? true : false;
@@ -55,7 +66,6 @@ export function createExtensionInput<
   config?: TConfig,
 ): ExtensionInput<
   UExtensionData,
-  never,
   {
     singleton: TConfig['singleton'] extends true ? true : false;
     optional: TConfig['optional'] extends true ? true : false;
@@ -68,14 +78,21 @@ export function createExtensionInput<
 >(
   extensionData: TExtensionData,
   config?: TConfig,
-): ExtensionInput<
-  TExtensionData,
-  TExtensionDataMap,
-  {
-    singleton: TConfig['singleton'] extends true ? true : false;
-    optional: TConfig['optional'] extends true ? true : false;
-  }
-> {
+):
+  | LegacyExtensionInput<
+      TExtensionDataMap,
+      {
+        singleton: TConfig['singleton'] extends true ? true : false;
+        optional: TConfig['optional'] extends true ? true : false;
+      }
+    >
+  | ExtensionInput<
+      TExtensionData,
+      {
+        singleton: TConfig['singleton'] extends true ? true : false;
+        optional: TConfig['optional'] extends true ? true : false;
+      }
+    > {
   if (Array.isArray(extensionData)) {
     const seen = new Set();
     const duplicates = [];

From e7a720ac2c19a1b53fa364c160842a0034b8414e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 17:07:28 +0200
Subject: [PATCH 206/225] frontend-plugin-api: refactor to use two disctict
 internal extension definitions

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/createExtension.test.ts        | 178 +++++++++---------
 .../src/wiring/createExtension.ts             |  93 +++++----
 2 files changed, 154 insertions(+), 117 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
index bbf2e539d1..327639af37 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.test.ts
@@ -40,7 +40,7 @@ describe('createExtension', () => {
         };
       },
     });
-    expect(extension.namespace).toBe('test');
+    expect(extension).toMatchObject({ version: 'v1', namespace: 'test' });
 
     // When declared as an error function without a block the TypeScript errors
     // are a more specific and will often point at the property that is problematic.
@@ -177,7 +177,7 @@ describe('createExtension', () => {
         foo: 'bar',
       }),
     });
-    expect(extension.namespace).toBe('test');
+    expect(extension).toMatchObject({ version: 'v1', namespace: 'test' });
 
     createExtension({
       ...baseConfig,
@@ -287,7 +287,7 @@ describe('createExtension', () => {
         };
       },
     });
-    expect(extension.namespace).toBe('test');
+    expect(extension).toMatchObject({ version: 'v1', namespace: 'test' });
     expect(String(extension)).toBe(
       'ExtensionDefinition{namespace=test,attachTo=root@default}',
     );
@@ -325,7 +325,7 @@ describe('createExtension', () => {
         };
       },
     });
-    expect(extension.namespace).toBe('test');
+    expect(extension).toMatchObject({ version: 'v1', namespace: 'test' });
     expect(String(extension)).toBe(
       'ExtensionDefinition{namespace=test,attachTo=root@default}',
     );
@@ -358,98 +358,108 @@ describe('createExtension', () => {
   });
 
   it('should support new form of outputs', () => {
-    // @ts-expect-error
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef],
-      factory() {
-        return []; // Missing all outputs
-      },
-    });
+    expect(
+      // @ts-expect-error
+      createExtension({
+        namespace: 'test',
+        attachTo: { id: 'root', input: 'default' },
+        output: [stringDataRef, numberDataRef],
+        factory() {
+          return []; // Missing all outputs
+        },
+      }),
+    ).toMatchObject({ version: 'v2' });
 
-    // @ts-expect-error
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef],
-      factory() {
-        return [stringDataRef('hello')]; // Missing number output
-      },
-    });
+    expect(
+      // @ts-expect-error
+      createExtension({
+        namespace: 'test',
+        attachTo: { id: 'root', input: 'default' },
+        output: [stringDataRef, numberDataRef],
+        factory() {
+          return [stringDataRef('hello')]; // Missing number output
+        },
+      }),
+    ).toMatchObject({ version: 'v2' });
 
     // Duplicate output, we won't attempt to handle this a compile time and instead error out at runtime
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef],
-      factory() {
-        return [stringDataRef('hello'), stringDataRef('hello')];
-      },
-    });
+    expect(
+      createExtension({
+        namespace: 'test',
+        attachTo: { id: 'root', input: 'default' },
+        output: [stringDataRef],
+        factory() {
+          return [stringDataRef('hello'), stringDataRef('hello')];
+        },
+      }),
+    ).toMatchObject({ version: 'v2' });
 
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef],
-      factory() {
-        return [stringDataRef('hello'), numberDataRef(4)];
-      },
-    });
+    expect(
+      createExtension({
+        namespace: 'test',
+        attachTo: { id: 'root', input: 'default' },
+        output: [stringDataRef, numberDataRef],
+        factory() {
+          return [stringDataRef('hello'), numberDataRef(4)];
+        },
+      }),
+    ).toMatchObject({ version: 'v2' });
 
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef.optional()],
-      factory() {
-        return [stringDataRef('hello'), numberDataRef(4)];
-      },
-    });
+    expect(
+      createExtension({
+        namespace: 'test',
+        attachTo: { id: 'root', input: 'default' },
+        output: [stringDataRef, numberDataRef.optional()],
+        factory() {
+          return [stringDataRef('hello'), numberDataRef(4)];
+        },
+      }),
+    ).toMatchObject({ version: 'v2' });
 
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      output: [stringDataRef, numberDataRef.optional()],
-      factory() {
-        return [stringDataRef('hello')]; // Missing number output, but it's optional so that's allowed
-      },
-    });
-
-    expect(true).toBe(true);
+    expect(
+      createExtension({
+        namespace: 'test',
+        attachTo: { id: 'root', input: 'default' },
+        output: [stringDataRef, numberDataRef.optional()],
+        factory() {
+          return [stringDataRef('hello')]; // Missing number output, but it's optional so that's allowed
+        },
+      }),
+    ).toMatchObject({ version: 'v2' });
   });
 
   it('should support new form of inputs', () => {
-    createExtension({
-      namespace: 'test',
-      attachTo: { id: 'root', input: 'default' },
-      inputs: {
-        header: createExtensionInput([stringDataRef.optional()], {
-          optional: true,
-          singleton: true,
-        }),
-        content: createExtensionInput([stringDataRef, numberDataRef], {
-          optional: false,
-          singleton: true,
-        }),
-      },
-      output: [stringDataRef],
-      factory({ inputs }) {
-        const headerStr = inputs.header?.get(stringDataRef);
-        const contentStr = inputs.content.get(stringDataRef);
-        const contentNum = inputs.content.get(numberDataRef);
+    expect(
+      createExtension({
+        namespace: 'test',
+        attachTo: { id: 'root', input: 'default' },
+        inputs: {
+          header: createExtensionInput([stringDataRef.optional()], {
+            optional: true,
+            singleton: true,
+          }),
+          content: createExtensionInput([stringDataRef, numberDataRef], {
+            optional: false,
+            singleton: true,
+          }),
+        },
+        output: [stringDataRef],
+        factory({ inputs }) {
+          const headerStr = inputs.header?.get(stringDataRef);
+          const contentStr = inputs.content.get(stringDataRef);
+          const contentNum = inputs.content.get(numberDataRef);
 
-        // @ts-expect-error
-        inputs.header?.get(numberDataRef);
+          // @ts-expect-error
+          inputs.header?.get(numberDataRef);
 
-        // @ts-expect-error
-        const x1: string = headerStr; // string | undefined
+          // @ts-expect-error
+          const x1: string = headerStr; // string | undefined
 
-        unused(x1);
+          unused(x1);
 
-        return [stringDataRef(contentStr.repeat(contentNum))];
-      },
-    });
-
-    expect(true).toBe(true);
+          return [stringDataRef(contentStr.repeat(contentNum))];
+        },
+      }),
+    ).toMatchObject({ version: 'v2' });
   });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index cfce13d494..6727a92419 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -22,7 +22,7 @@ import {
   ExtensionDataRef,
   ExtensionDataValue,
 } from './createExtensionDataRef';
-import { ExtensionInput } from './createExtensionInput';
+import { ExtensionInput, LegacyExtensionInput } from './createExtensionInput';
 import { z } from 'zod';
 
 /**
@@ -33,10 +33,12 @@ export type AnyExtensionDataMap = {
   [name in string]: AnyExtensionDataRef;
 };
 
-/** @public */
+/**
+ * @public
+ * @deprecated This type will be removed.
+ */
 export type AnyExtensionInputMap = {
-  [inputName in string]: ExtensionInput<
-    AnyExtensionDataRef,
+  [inputName in string]: LegacyExtensionInput<
     AnyExtensionDataMap,
     { optional: boolean; singleton: boolean }
   >;
@@ -95,7 +97,7 @@ export type ResolvedExtensionInput<
  * @public
  */
 export type ResolvedExtensionInputs<
-  TInputs extends { [name in string]: ExtensionInput<any, any, any> },
+  TInputs extends { [name in string]: ExtensionInput<any, any> },
 > = {
   [InputName in keyof TInputs]: false extends TInputs[InputName]['config']['singleton']
     ? Array<Expand<ResolvedExtensionInput<TInputs[InputName]['extensionData']>>>
@@ -146,7 +148,12 @@ export interface LegacyCreateExtensionOptions<
 /** @public */
 export type CreateExtensionOptions<
   UOutput extends AnyExtensionDataRef,
-  TInputs extends AnyExtensionInputMap,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      { optional: boolean; singleton: boolean }
+    >;
+  },
   TConfig,
   TConfigInput,
   TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
@@ -205,17 +212,40 @@ export interface ExtensionDefinition<TConfig, TConfigInput = TConfig> {
 }
 
 /** @internal */
-export interface InternalExtensionDefinition<TConfig, TConfigInput>
-  extends ExtensionDefinition<TConfig, TConfigInput> {
-  readonly version: 'v1';
-  readonly inputs: AnyExtensionInputMap;
-  readonly output: AnyExtensionDataMap | Array<AnyExtensionDataRef>;
-  factory(context: {
-    node: AppNode;
-    config: TConfig;
-    inputs: ResolvedExtensionInputs<any>;
-  }): ExtensionDataValues<any> | Iterable<ExtensionDataValue<any, any>>;
-}
+export type InternalExtensionDefinition<TConfig, TConfigInput> =
+  ExtensionDefinition<TConfig, TConfigInput> &
+    (
+      | {
+          readonly version: 'v1';
+          readonly inputs: AnyExtensionInputMap;
+          readonly output: AnyExtensionDataMap;
+          factory(context: {
+            node: AppNode;
+            config: TConfig;
+            inputs: ResolvedExtensionInputs<AnyExtensionInputMap>;
+          }): ExtensionDataValues<any>;
+        }
+      | {
+          readonly version: 'v2';
+          readonly inputs: {
+            [inputName in string]: ExtensionInput<
+              AnyExtensionDataRef,
+              { optional: boolean; singleton: boolean }
+            >;
+          };
+          readonly output: Array<AnyExtensionDataRef>;
+          factory(context: {
+            node: AppNode;
+            config: TConfig;
+            inputs: ResolvedExtensionInputs<{
+              [inputName in string]: ExtensionInput<
+                AnyExtensionDataRef,
+                { optional: boolean; singleton: boolean }
+              >;
+            }>;
+          }): Iterable<ExtensionDataValue<any, any>>;
+        }
+    );
 
 /** @internal */
 export function toInternalExtensionDefinition<TConfig, TConfigInput>(
@@ -230,9 +260,10 @@ export function toInternalExtensionDefinition<TConfig, TConfigInput>(
       `Invalid extension definition instance, bad type '${internal.$$type}'`,
     );
   }
-  if (internal.version !== 'v1') {
+  const version = internal.version;
+  if (version !== 'v1' && version !== 'v2') {
     throw new Error(
-      `Invalid extension definition instance, bad version '${internal.version}'`,
+      `Invalid extension definition instance, bad version '${version}'`,
     );
   }
   return internal;
@@ -244,7 +275,6 @@ export function createExtension<
   TInputs extends {
     [inputName in string]: ExtensionInput<
       AnyExtensionDataRef,
-      never,
       { optional: boolean; singleton: boolean }
     >;
   },
@@ -313,7 +343,13 @@ export function createExtension<
 >;
 export function createExtension<
   UOutput extends AnyExtensionDataRef,
-  TInputs extends AnyExtensionInputMap,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      { optional: boolean; singleton: boolean }
+    >;
+  },
+  TLegacyInputs extends AnyExtensionInputMap,
   TConfig,
   TConfigInput,
   TConfigSchema extends { [key: string]: (zImpl: typeof z) => z.ZodType },
@@ -330,7 +366,7 @@ export function createExtension<
       >
     | LegacyCreateExtensionOptions<
         AnyExtensionDataMap,
-        TInputs,
+        TLegacyInputs,
         TConfig,
         TConfigInput,
         TConfigSchema
@@ -367,7 +403,7 @@ export function createExtension<
 
   return {
     $$type: '@backstage/ExtensionDefinition',
-    version: 'v1',
+    version: Symbol.iterator in options.output ? 'v2' : 'v1',
     kind: options.kind,
     namespace: options.namespace,
     name: options.name,
@@ -376,16 +412,7 @@ export function createExtension<
     inputs: options.inputs ?? {},
     output: options.output,
     configSchema,
-    factory({ inputs, config, ...rest }) {
-      // TODO: Simplify this, but TS wouldn't infer the input type for some reason
-      return options.factory({
-        inputs: inputs as Expand<ResolvedExtensionInputs<TInputs>>,
-        config: config as TConfig & {
-          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
-        },
-        ...rest,
-      });
-    },
+    factory: options.factory,
     toString() {
       const parts: string[] = [];
       if (options.kind) {

From ea25c0bf335b623244c01bd51ed1821dbfeac6b7 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 17:17:05 +0200
Subject: [PATCH 207/225] frontend-plugin-api: export new types

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/frontend-plugin-api/src/wiring/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index 6d20368225..baada41ae8 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -17,6 +17,7 @@
 export { coreExtensionData } from './coreExtensionData';
 export {
   createExtension,
+  type ExtensionDataContainer,
   type ExtensionDefinition,
   type CreateExtensionOptions,
   type ExtensionDataValues,
@@ -28,10 +29,13 @@ export {
 export {
   createExtensionInput,
   type ExtensionInput,
+  type LegacyExtensionInput,
 } from './createExtensionInput';
 export {
   createExtensionDataRef,
+  type AnyExtensionDataRef,
   type ExtensionDataRef,
+  type ExtensionDataValue,
   type ConfigurableExtensionDataRef,
 } from './createExtensionDataRef';
 export { createPlugin, type PluginOptions } from './createPlugin';

From b207f69ba1f5fa6c07f2d55d07871da3912c6e31 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Sat, 27 Jul 2024 14:04:22 +0100
Subject: [PATCH 208/225] yarn-plugin: memoize manifest fetching

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/yarn-plugin/package.json             |  1 +
 .../src/resolver/BackstageResolver.test.ts    | 29 +++++++++++++++++++
 packages/yarn-plugin/src/util.ts              |  8 ++++-
 yarn.lock                                     |  1 +
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/packages/yarn-plugin/package.json b/packages/yarn-plugin/package.json
index fd70dc8600..206adeddbe 100644
--- a/packages/yarn-plugin/package.json
+++ b/packages/yarn-plugin/package.json
@@ -35,6 +35,7 @@
     "@yarnpkg/core": "^4.0.3",
     "@yarnpkg/fslib": "^3.0.2",
     "chalk": "^4.0.0",
+    "lodash": "^4.17.21",
     "semver": "^7.6.0"
   },
   "devDependencies": {
diff --git a/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts b/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
index 4cc0c1c9f2..6c7157ebe9 100644
--- a/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
+++ b/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
@@ -16,6 +16,7 @@
 
 import { structUtils } from '@yarnpkg/core';
 import { npath, ppath } from '@yarnpkg/fslib';
+import { getManifestByVersion } from '@backstage/release-manifests';
 import { BackstageResolver } from './BackstageResolver';
 import { createMockDirectory } from '@backstage/backend-test-utils';
 
@@ -31,6 +32,10 @@ jest.mock('@backstage/release-manifests', () => ({
   }),
 }));
 
+const getManifestByVersionMock = getManifestByVersion as jest.MockedFunction<
+  typeof getManifestByVersion
+>;
+
 describe('BackstageResolver', () => {
   const mockDir = createMockDirectory();
   let backstageResolver: BackstageResolver;
@@ -177,5 +182,29 @@ describe('BackstageResolver', () => {
         ),
       ).rejects.toThrow(/invalid backstage version/i);
     });
+
+    it('memoizes manifest retrieval', async () => {
+      const descriptor1 = structUtils.makeDescriptor(
+        structUtils.makeIdent('backstage', 'core'),
+        'backstage:1.23.45',
+      );
+
+      for (let i = 0; i < 5; i++) {
+        await backstageResolver.getCandidates(descriptor1);
+      }
+
+      expect(getManifestByVersionMock).toHaveBeenCalledTimes(1);
+
+      const descriptor2 = structUtils.makeDescriptor(
+        structUtils.makeIdent('backstage', 'core'),
+        'backstage:6.78.90',
+      );
+
+      for (let i = 0; i < 5; i++) {
+        await backstageResolver.getCandidates(descriptor2);
+      }
+
+      expect(getManifestByVersionMock).toHaveBeenCalledTimes(2);
+    });
   });
 });
diff --git a/packages/yarn-plugin/src/util.ts b/packages/yarn-plugin/src/util.ts
index 8431e23cfa..0b613a477c 100644
--- a/packages/yarn-plugin/src/util.ts
+++ b/packages/yarn-plugin/src/util.ts
@@ -16,11 +16,17 @@
 
 import { ppath, xfs } from '@yarnpkg/fslib';
 import { valid as semverValid } from 'semver';
-import { getManifestByVersion } from '@backstage/release-manifests';
+import { memoize } from 'lodash';
+import { getManifestByVersion as getManifestByVersionBase } from '@backstage/release-manifests';
 import { BACKSTAGE_JSON, findPaths } from '@backstage/cli-common';
 import { Descriptor, structUtils } from '@yarnpkg/core';
 import { PROTOCOL } from './constants';
 
+const getManifestByVersion = memoize(
+  getManifestByVersionBase,
+  ({ version }) => version,
+);
+
 export const getCurrentBackstageVersion = () => {
   const workspaceRoot = ppath.resolve(findPaths(ppath.cwd()).targetRoot);
 
diff --git a/yarn.lock b/yarn.lock
index ad55a72897..155c0eeb9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -45239,6 +45239,7 @@ __metadata:
     "@yarnpkg/core": ^4.0.3
     "@yarnpkg/fslib": ^3.0.2
     chalk: ^4.0.0
+    lodash: ^4.17.21
     nodemon: ^3.0.1
     semver: ^7.6.0
   languageName: unknown

From e2e84edf7b500a60e9fa0faf6da852160947cc8c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 26 Jul 2024 17:25:44 +0200
Subject: [PATCH 209/225] frontend-plugin-api: add v2 extension and resolution

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../wiring/resolveExtensionDefinition.test.ts | 54 +++++++++++++---
 .../src/wiring/resolveExtensionDefinition.ts  | 63 ++++++++++++++-----
 2 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.test.ts b/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.test.ts
index 8970cfe168..e1bfcbfc11 100644
--- a/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.test.ts
@@ -17,14 +17,54 @@
 import { ExtensionDefinition } from './createExtension';
 import { resolveExtensionDefinition } from './resolveExtensionDefinition';
 
-const baseDef = {
-  $$type: '@backstage/ExtensionDefinition',
-  version: 'v1',
-  attachTo: { id: '', input: '' },
-  disabled: false,
-};
-
 describe('resolveExtensionDefinition', () => {
+  const baseDef = {
+    $$type: '@backstage/ExtensionDefinition',
+    version: 'v2',
+    attachTo: { id: '', input: '' },
+    disabled: false,
+  };
+
+  it.each([
+    [{ namespace: 'ns' }, 'ns'],
+    [{ namespace: 'n' }, 'n'],
+    [{ namespace: 'ns', name: 'n' }, 'ns/n'],
+    [{ kind: 'k', namespace: 'ns' }, 'k:ns'],
+    [{ kind: 'k', namespace: 'ns', name: 'n' }, 'k:ns/n'],
+  ])(`should resolve extension IDs %s`, (definition, expected) => {
+    const resolved = resolveExtensionDefinition({
+      ...baseDef,
+      ...definition,
+    } as ExtensionDefinition<unknown>);
+    expect(resolved.id).toBe(expected);
+    expect(String(resolved)).toBe(`Extension{id=${expected}}`);
+  });
+
+  it('should fail to resolve extension ID without namespace', () => {
+    expect(() =>
+      resolveExtensionDefinition({
+        ...baseDef,
+        kind: 'k',
+      } as ExtensionDefinition<unknown>),
+    ).toThrow(
+      'Extension must declare an explicit namespace or name as it could not be resolved from context, kind=k namespace=undefined name=undefined',
+    );
+    expect(() =>
+      resolveExtensionDefinition(baseDef as ExtensionDefinition<unknown>),
+    ).toThrow(
+      'Extension must declare an explicit namespace or name as it could not be resolved from context, kind=undefined namespace=undefined name=undefined',
+    );
+  });
+});
+
+describe('old resolveExtensionDefinition', () => {
+  const baseDef = {
+    $$type: '@backstage/ExtensionDefinition',
+    version: 'v1',
+    attachTo: { id: '', input: '' },
+    disabled: false,
+  };
+
   it.each([
     [{ namespace: 'ns' }, 'ns'],
     [{ namespace: 'n' }, 'n'],
diff --git a/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.ts b/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.ts
index eddd923702..18b6f0a653 100644
--- a/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.ts
+++ b/packages/frontend-plugin-api/src/wiring/resolveExtensionDefinition.ts
@@ -24,6 +24,11 @@ import {
   toInternalExtensionDefinition,
 } from './createExtension';
 import { PortableSchema } from '../schema';
+import { ExtensionInput } from './createExtensionInput';
+import {
+  AnyExtensionDataRef,
+  ExtensionDataValue,
+} from './createExtensionDataRef';
 
 /** @public */
 export interface Extension<TConfig, TConfigInput = TConfig> {
@@ -35,17 +40,42 @@ export interface Extension<TConfig, TConfigInput = TConfig> {
 }
 
 /** @internal */
-export interface InternalExtension<TConfig, TConfigInput>
-  extends Extension<TConfig, TConfigInput> {
-  readonly version: 'v1';
-  readonly inputs: AnyExtensionInputMap;
-  readonly output: AnyExtensionDataMap;
-  factory(options: {
-    node: AppNode;
-    config: TConfig;
-    inputs: ResolvedExtensionInputs<any>;
-  }): ExtensionDataValues<any>;
-}
+export type InternalExtension<TConfig, TConfigInput> = Extension<
+  TConfig,
+  TConfigInput
+> &
+  (
+    | {
+        readonly version: 'v1';
+        readonly inputs: AnyExtensionInputMap;
+        readonly output: AnyExtensionDataMap;
+        factory(options: {
+          node: AppNode;
+          config: TConfig;
+          inputs: ResolvedExtensionInputs<AnyExtensionInputMap>;
+        }): ExtensionDataValues<any>;
+      }
+    | {
+        readonly version: 'v2';
+        readonly inputs: {
+          [inputName in string]: ExtensionInput<
+            AnyExtensionDataRef,
+            { optional: boolean; singleton: boolean }
+          >;
+        };
+        readonly output: Array<AnyExtensionDataRef>;
+        factory(options: {
+          node: AppNode;
+          config: TConfig;
+          inputs: ResolvedExtensionInputs<{
+            [inputName in string]: ExtensionInput<
+              AnyExtensionDataRef,
+              { optional: boolean; singleton: boolean }
+            >;
+          }>;
+        }): Iterable<ExtensionDataValue<any, any>>;
+      }
+  );
 
 /** @internal */
 export function toInternalExtension<TConfig, TConfigInput>(
@@ -57,10 +87,9 @@ export function toInternalExtension<TConfig, TConfigInput>(
       `Invalid extension instance, bad type '${internal.$$type}'`,
     );
   }
-  if (internal.version !== 'v1') {
-    throw new Error(
-      `Invalid extension instance, bad version '${internal.version}'`,
-    );
+  const version = internal.version;
+  if (version !== 'v1' && version !== 'v2') {
+    throw new Error(`Invalid extension instance, bad version '${version}'`);
   }
   return internal;
 }
@@ -87,10 +116,10 @@ export function resolveExtensionDefinition<TConfig, TConfigInput>(
   return {
     ...rest,
     $$type: '@backstage/Extension',
-    version: 'v1',
+    version: internalDefinition.version,
     id,
     toString() {
       return `Extension{id=${id}}`;
     },
-  } as Extension<TConfig, TConfigInput>;
+  } as InternalExtension<TConfig, TConfigInput>;
 }

From 0d24c1fa3e3409a10542b37b9b465f2ed977e2e7 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 27 Jul 2024 11:10:53 +0200
Subject: [PATCH 210/225] frontend-plugin-api: more fixes for new extension io
 structure

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/createExtension.ts             | 22 ++++----
 .../wiring/createExtensionBlueprint.test.tsx  |  8 +--
 .../src/wiring/createExtensionInput.ts        | 52 ++++++++++++-------
 3 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 6727a92419..4034ef7238 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -80,15 +80,15 @@ export type ExtensionDataContainer<UExtensionData extends AnyExtensionDataRef> =
  * @public
  */
 export type ResolvedExtensionInput<
-  TExtensionData extends AnyExtensionDataMap | AnyExtensionDataRef,
-> = [TExtensionData] extends [AnyExtensionDataRef]
+  TExtensionInput extends ExtensionInput<any, any>,
+> = TExtensionInput['extensionData'] extends Array<AnyExtensionDataRef>
   ? {
       node: AppNode;
-    } & ExtensionDataContainer<TExtensionData>
-  : TExtensionData extends AnyExtensionDataMap
+    } & ExtensionDataContainer<TExtensionInput['extensionData'][number]>
+  : TExtensionInput['extensionData'] extends AnyExtensionDataMap
   ? {
       node: AppNode;
-      output: ExtensionDataValues<TExtensionData>;
+      output: ExtensionDataValues<TExtensionInput['extensionData']>;
     }
   : never;
 
@@ -97,15 +97,15 @@ export type ResolvedExtensionInput<
  * @public
  */
 export type ResolvedExtensionInputs<
-  TInputs extends { [name in string]: ExtensionInput<any, any> },
+  TInputs extends {
+    [name in string]: ExtensionInput<any, any> | LegacyExtensionInput<any, any>;
+  },
 > = {
   [InputName in keyof TInputs]: false extends TInputs[InputName]['config']['singleton']
-    ? Array<Expand<ResolvedExtensionInput<TInputs[InputName]['extensionData']>>>
+    ? Array<Expand<ResolvedExtensionInput<TInputs[InputName]>>>
     : false extends TInputs[InputName]['config']['optional']
-    ? Expand<ResolvedExtensionInput<TInputs[InputName]['extensionData']>>
-    : Expand<
-        ResolvedExtensionInput<TInputs[InputName]['extensionData']> | undefined
-      >;
+    ? Expand<ResolvedExtensionInput<TInputs[InputName]>>
+    : Expand<ResolvedExtensionInput<TInputs[InputName]> | undefined>;
 };
 
 /**
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index cb8855d892..e4cb9e26f1 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -57,13 +57,7 @@ describe('createExtensionBlueprint', () => {
       name: 'my-extension',
       namespace: undefined,
       output: {
-        element: {
-          $$type: '@backstage/ExtensionDataRef',
-          config: {},
-          id: 'core.reactElement',
-          optional: expect.any(Function),
-          toString: expect.any(Function),
-        },
+        element: coreExtensionData.reactElement,
       },
       factory: expect.any(Function),
       toString: expect.any(Function),
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts b/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
index 5627bdecc2..b7efb13e6e 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionInput.ts
@@ -23,7 +23,7 @@ export interface ExtensionInput<
   TConfig extends { singleton: boolean; optional: boolean },
 > {
   $$type: '@backstage/ExtensionInput';
-  extensionData: TExtensionData;
+  extensionData: Array<TExtensionData>;
   config: TConfig;
 }
 
@@ -76,7 +76,7 @@ export function createExtensionInput<
   TExtensionDataMap extends AnyExtensionDataMap,
   TConfig extends { singleton?: boolean; optional?: boolean },
 >(
-  extensionData: TExtensionData,
+  extensionData: Array<TExtensionData> | TExtensionDataMap,
   config?: TConfig,
 ):
   | LegacyExtensionInput<
@@ -93,22 +93,24 @@ export function createExtensionInput<
         optional: TConfig['optional'] extends true ? true : false;
       }
     > {
-  if (Array.isArray(extensionData)) {
-    const seen = new Set();
-    const duplicates = [];
-    for (const dataRef of extensionData) {
-      if (seen.has(dataRef.id)) {
-        duplicates.push(dataRef.id);
-      } else {
-        seen.add(dataRef.id);
+  if (process.env.NODE_ENV !== 'production') {
+    if (Array.isArray(extensionData)) {
+      const seen = new Set();
+      const duplicates = [];
+      for (const dataRef of extensionData) {
+        if (seen.has(dataRef.id)) {
+          duplicates.push(dataRef.id);
+        } else {
+          seen.add(dataRef.id);
+        }
+      }
+      if (duplicates.length > 0) {
+        throw new Error(
+          `ExtensionInput may not have duplicate data refs: '${duplicates.join(
+            "', '",
+          )}'`,
+        );
       }
-    }
-    if (duplicates.length > 0) {
-      throw new Error(
-        `ExtensionInput may not have duplicate data refs: '${duplicates.join(
-          "', '",
-        )}'`,
-      );
     }
   }
   return {
@@ -122,5 +124,19 @@ export function createExtensionInput<
         ? true
         : false,
     },
-  };
+  } as
+    | LegacyExtensionInput<
+        TExtensionDataMap,
+        {
+          singleton: TConfig['singleton'] extends true ? true : false;
+          optional: TConfig['optional'] extends true ? true : false;
+        }
+      >
+    | ExtensionInput<
+        TExtensionData,
+        {
+          singleton: TConfig['singleton'] extends true ? true : false;
+          optional: TConfig['optional'] extends true ? true : false;
+        }
+      >;
 }

From 3f7029edf0f69fc9c9d1f52fa82208dcce044915 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 27 Jul 2024 17:01:52 +0200
Subject: [PATCH 211/225] frontend-app-api: add support for v2 extensions

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/tree/instantiateAppNodeTree.test.ts   | 1537 ++++++++++++-----
 .../src/tree/instantiateAppNodeTree.ts        |  214 ++-
 2 files changed, 1237 insertions(+), 514 deletions(-)

diff --git a/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts b/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
index a82c8d99ee..b4090185a3 100644
--- a/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
+++ b/packages/frontend-app-api/src/tree/instantiateAppNodeTree.test.ts
@@ -17,6 +17,8 @@
 import {
   AppNode,
   Extension,
+  ExtensionInput,
+  ResolvedExtensionInput,
   createExtension,
   createExtensionDataRef,
   createExtensionInput,
@@ -38,27 +40,6 @@ const inputMirrorDataRef = createExtensionDataRef<unknown>().with({
   id: 'mirror',
 });
 
-const simpleExtension = resolveExtensionDefinition(
-  createExtension({
-    namespace: 'app',
-    name: 'test',
-    attachTo: { id: 'ignored', input: 'ignored' },
-    output: {
-      test: testDataRef,
-      other: otherDataRef.optional(),
-    },
-    configSchema: createSchemaFromZod(z =>
-      z.object({
-        output: z.string().default('test'),
-        other: z.number().optional(),
-      }),
-    ),
-    factory({ config }) {
-      return { test: config.output, other: config.other };
-    },
-  }),
-);
-
 function makeSpec<TConfig, TConfigInput>(
   extension: Extension<TConfig, TConfigInput>,
   spec?: Partial<AppNodeSpec>,
@@ -100,78 +81,54 @@ function makeInstanceWithId<TConfig, TConfigInput>(
 }
 
 describe('instantiateAppNodeTree', () => {
-  it('should instantiate a single node', () => {
-    const tree = resolveAppTree('root-node', [
-      makeSpec(simpleExtension, { id: 'root-node' }),
-    ]);
-    expect(tree.root.instance).not.toBeDefined();
-    instantiateAppNodeTree(tree.root);
-    expect(tree.root.instance).toBeDefined();
-    expect(tree.root.instance?.getData(testDataRef)).toBe('test');
-
-    // Multiple calls should have no effect
-    instantiateAppNodeTree(tree.root);
-    expect(tree.root.instance).toBeDefined();
-  });
-
-  it('should not instantiate disabled nodes', () => {
-    const tree = resolveAppTree('root-node', [
-      makeSpec(simpleExtension, { id: 'root-node', disabled: true }),
-    ]);
-    expect(tree.root.instance).not.toBeDefined();
-    instantiateAppNodeTree(tree.root);
-    expect(tree.root.instance).not.toBeDefined();
-  });
-
-  it('should instantiate a node with attachments', () => {
-    const tree = resolveAppTree('root-node', [
-      makeSpec(
-        resolveExtensionDefinition(
-          createExtension({
-            namespace: 'root-node',
-            attachTo: { id: 'ignored', input: 'ignored' },
-            inputs: {
-              test: createExtensionInput({ test: testDataRef }),
-            },
-            output: {
-              inputMirror: inputMirrorDataRef,
-            },
-            factory({ inputs }) {
-              return { inputMirror: inputs };
-            },
+  describe('v1', () => {
+    const simpleExtension = resolveExtensionDefinition(
+      createExtension({
+        namespace: 'app',
+        name: 'test',
+        attachTo: { id: 'ignored', input: 'ignored' },
+        output: {
+          test: testDataRef,
+          other: otherDataRef.optional(),
+        },
+        configSchema: createSchemaFromZod(z =>
+          z.object({
+            output: z.string().default('test'),
+            other: z.number().optional(),
           }),
         ),
-      ),
-      makeSpec(simpleExtension, {
-        id: 'child-node',
-        attachTo: { id: 'root-node', input: 'test' },
+        factory({ config }) {
+          return { test: config.output, other: config.other };
+        },
       }),
-    ]);
+    );
 
-    const childNode = tree.nodes.get('child-node');
-    expect(childNode).toBeDefined();
+    it('should instantiate a single node', () => {
+      const tree = resolveAppTree('root-node', [
+        makeSpec(simpleExtension, { id: 'root-node' }),
+      ]);
+      expect(tree.root.instance).not.toBeDefined();
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+      expect(tree.root.instance?.getData(testDataRef)).toBe('test');
 
-    expect(tree.root.instance).not.toBeDefined();
-    expect(childNode?.instance).not.toBeDefined();
-    instantiateAppNodeTree(tree.root);
-    expect(tree.root.instance).toBeDefined();
-    expect(childNode?.instance).toBeDefined();
-    expect(tree.root.instance?.getData(inputMirrorDataRef)).toMatchObject({
-      test: [
-        { node: { spec: { id: 'child-node' } }, output: { test: 'test' } },
-      ],
+      // Multiple calls should have no effect
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
     });
 
-    // Multiple calls should have no effect
-    instantiateAppNodeTree(tree.root);
-    expect(tree.root.instance).toBeDefined();
-    expect(childNode?.instance).toBeDefined();
-  });
+    it('should not instantiate disabled nodes', () => {
+      const tree = resolveAppTree('root-node', [
+        makeSpec(simpleExtension, { id: 'root-node', disabled: true }),
+      ]);
+      expect(tree.root.instance).not.toBeDefined();
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).not.toBeDefined();
+    });
 
-  it('should not instantiate disabled attachments', () => {
-    const tree = resolveAppTree('root-node', [
-      {
-        ...makeSpec(
+    it('should instantiate a node with attachments', () => {
+      const tree = resolveAppTree('root-node', [
+        makeSpec(
           resolveExtensionDefinition(
             createExtension({
               namespace: 'root-node',
@@ -188,437 +145,1061 @@ describe('instantiateAppNodeTree', () => {
             }),
           ),
         ),
-      },
-      {
-        ...makeSpec(simpleExtension),
-        id: 'child-node',
-        // Using an invalid input should not be an error when disabled
-        attachTo: { id: 'root-node', input: 'invalid' },
-        disabled: true,
-      },
-    ]);
+        makeSpec(simpleExtension, {
+          id: 'child-node',
+          attachTo: { id: 'root-node', input: 'test' },
+        }),
+      ]);
 
-    const childNode = tree.nodes.get('child-node');
-    expect(childNode).toBeDefined();
+      const childNode = tree.nodes.get('child-node');
+      expect(childNode).toBeDefined();
 
-    expect(tree.root.instance).not.toBeDefined();
-    expect(childNode?.instance).not.toBeDefined();
-    instantiateAppNodeTree(tree.root);
-    expect(tree.root.instance).toBeDefined();
-    expect(childNode?.instance).not.toBeDefined();
-    expect(tree.root.instance?.getData(inputMirrorDataRef)).toEqual({
-      test: [],
-    });
-  });
-});
+      expect(tree.root.instance).not.toBeDefined();
+      expect(childNode?.instance).not.toBeDefined();
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+      expect(childNode?.instance).toBeDefined();
+      expect(tree.root.instance?.getData(inputMirrorDataRef)).toMatchObject({
+        test: [
+          { node: { spec: { id: 'child-node' } }, output: { test: 'test' } },
+        ],
+      });
 
-describe('createAppNodeInstance', () => {
-  it('should create a simple extension instance', () => {
-    const attachments = new Map();
-    const instance = createAppNodeInstance({
-      node: makeNode(simpleExtension),
-      attachments,
+      // Multiple calls should have no effect
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+      expect(childNode?.instance).toBeDefined();
     });
 
-    expect(Array.from(instance.getDataRefs())).toEqual([
-      testDataRef,
-      otherDataRef.optional(),
-    ]);
-    expect(instance.getData(testDataRef)).toEqual('test');
-  });
-
-  it('should create an extension with different kind of inputs', () => {
-    const attachments = new Map([
-      [
-        'optionalSingletonPresent',
-        [
-          makeInstanceWithId(simpleExtension, {
-            output: 'optionalSingletonPresent',
-          }),
-        ],
-      ],
-      [
-        'singleton',
-        [
-          makeInstanceWithId(simpleExtension, {
-            output: 'singleton',
-            other: 2,
-          }),
-        ],
-      ],
-      [
-        'many',
-        [
-          makeInstanceWithId(simpleExtension, { output: 'many1' }),
-          makeInstanceWithId(simpleExtension, { output: 'many2', other: 3 }),
-        ],
-      ],
-    ]);
-    const instance = createAppNodeInstance({
-      attachments,
-      node: makeNode(
-        resolveExtensionDefinition(
-          createExtension({
-            namespace: 'app',
-            name: 'test',
-            attachTo: { id: 'ignored', input: 'ignored' },
-            inputs: {
-              optionalSingletonPresent: createExtensionInput(
-                {
-                  test: testDataRef,
-                  other: otherDataRef.optional(),
-                },
-                { singleton: true, optional: true },
-              ),
-              optionalSingletonMissing: createExtensionInput(
-                {
-                  test: testDataRef,
-                  other: otherDataRef.optional(),
-                },
-                { singleton: true, optional: true },
-              ),
-              singleton: createExtensionInput(
-                {
-                  test: testDataRef,
-                  other: otherDataRef.optional(),
-                },
-                { singleton: true },
-              ),
-              many: createExtensionInput({
-                test: testDataRef,
-                other: otherDataRef.optional(),
-              }),
-            },
-            output: {
-              inputMirror: inputMirrorDataRef,
-            },
-            factory({ inputs }) {
-              return { inputMirror: inputs };
-            },
-          }),
-        ),
-      ),
-    });
-
-    expect(Array.from(instance.getDataRefs())).toEqual([inputMirrorDataRef]);
-    expect(instance.getData(inputMirrorDataRef)).toMatchObject({
-      optionalSingletonPresent: {
-        node: { spec: { id: 'app/test' } },
-        output: { test: 'optionalSingletonPresent' },
-      },
-      singleton: {
-        node: { spec: { id: 'app/test' } },
-        output: { test: 'singleton', other: 2 },
-      },
-      many: [
-        { node: { spec: { id: 'app/test' } }, output: { test: 'many1' } },
+    it('should not instantiate disabled attachments', () => {
+      const tree = resolveAppTree('root-node', [
         {
-          node: { spec: { id: 'app/test' } },
-          output: { test: 'many2', other: 3 },
+          ...makeSpec(
+            resolveExtensionDefinition(
+              createExtension({
+                namespace: 'root-node',
+                attachTo: { id: 'ignored', input: 'ignored' },
+                inputs: {
+                  test: createExtensionInput({ test: testDataRef }),
+                },
+                output: {
+                  inputMirror: inputMirrorDataRef,
+                },
+                factory({ inputs }) {
+                  return { inputMirror: inputs };
+                },
+              }),
+            ),
+          ),
         },
-      ],
+        {
+          ...makeSpec(simpleExtension),
+          id: 'child-node',
+          // Using an invalid input should not be an error when disabled
+          attachTo: { id: 'root-node', input: 'invalid' },
+          disabled: true,
+        },
+      ]);
+
+      const childNode = tree.nodes.get('child-node');
+      expect(childNode).toBeDefined();
+
+      expect(tree.root.instance).not.toBeDefined();
+      expect(childNode?.instance).not.toBeDefined();
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+      expect(childNode?.instance).not.toBeDefined();
+      expect(tree.root.instance?.getData(inputMirrorDataRef)).toEqual({
+        test: [],
+      });
+    });
+
+    describe('createAppNodeInstance', () => {
+      it('should create a simple extension instance', () => {
+        const attachments = new Map();
+        const instance = createAppNodeInstance({
+          node: makeNode(simpleExtension),
+          attachments,
+        });
+
+        expect(Array.from(instance.getDataRefs())).toEqual([
+          testDataRef,
+          otherDataRef.optional(),
+        ]);
+        expect(instance.getData(testDataRef)).toEqual('test');
+      });
+
+      it('should create an extension with different kind of inputs', () => {
+        const attachments = new Map([
+          [
+            'optionalSingletonPresent',
+            [
+              makeInstanceWithId(simpleExtension, {
+                output: 'optionalSingletonPresent',
+              }),
+            ],
+          ],
+          [
+            'singleton',
+            [
+              makeInstanceWithId(simpleExtension, {
+                output: 'singleton',
+                other: 2,
+              }),
+            ],
+          ],
+          [
+            'many',
+            [
+              makeInstanceWithId(simpleExtension, { output: 'many1' }),
+              makeInstanceWithId(simpleExtension, {
+                output: 'many2',
+                other: 3,
+              }),
+            ],
+          ],
+        ]);
+        const instance = createAppNodeInstance({
+          attachments,
+          node: makeNode(
+            resolveExtensionDefinition(
+              createExtension({
+                namespace: 'app',
+                name: 'test',
+                attachTo: { id: 'ignored', input: 'ignored' },
+                inputs: {
+                  optionalSingletonPresent: createExtensionInput(
+                    {
+                      test: testDataRef,
+                      other: otherDataRef.optional(),
+                    },
+                    { singleton: true, optional: true },
+                  ),
+                  optionalSingletonMissing: createExtensionInput(
+                    {
+                      test: testDataRef,
+                      other: otherDataRef.optional(),
+                    },
+                    { singleton: true, optional: true },
+                  ),
+                  singleton: createExtensionInput(
+                    {
+                      test: testDataRef,
+                      other: otherDataRef.optional(),
+                    },
+                    { singleton: true },
+                  ),
+                  many: createExtensionInput({
+                    test: testDataRef,
+                    other: otherDataRef.optional(),
+                  }),
+                },
+                output: {
+                  inputMirror: inputMirrorDataRef,
+                },
+                factory({ inputs }) {
+                  return { inputMirror: inputs };
+                },
+              }),
+            ),
+          ),
+        });
+
+        expect(Array.from(instance.getDataRefs())).toEqual([
+          inputMirrorDataRef,
+        ]);
+        expect(instance.getData(inputMirrorDataRef)).toMatchObject({
+          optionalSingletonPresent: {
+            node: { spec: { id: 'app/test' } },
+            output: { test: 'optionalSingletonPresent' },
+          },
+          singleton: {
+            node: { spec: { id: 'app/test' } },
+            output: { test: 'singleton', other: 2 },
+          },
+          many: [
+            { node: { spec: { id: 'app/test' } }, output: { test: 'many1' } },
+            {
+              node: { spec: { id: 'app/test' } },
+              output: { test: 'many2', other: 3 },
+            },
+          ],
+        });
+      });
+
+      it('should refuse to create an extension with invalid config', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(simpleExtension, {
+              config: { other: 'not-a-number' },
+            }),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Invalid configuration for extension 'app/test'; caused by Error: Expected number, received string at 'other'",
+        );
+      });
+
+      it('should forward extension factory errors', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: {},
+                  factory() {
+                    const error = new Error('NOPE');
+                    error.name = 'NopeError';
+                    throw error;
+                  },
+                }),
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test'; caused by NopeError: NOPE",
+        );
+      });
+
+      it('should refuse to create an instance with duplicate output', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: {
+                    test1: testDataRef,
+                    test2: testDataRef,
+                  },
+                  factory({}) {
+                    return { test1: 'test', test2: 'test2' };
+                  },
+                }),
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', duplicate extension data 'test' received via output 'test2'",
+        );
+      });
+
+      it('should refuse to create an instance with disconnected output data', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: {
+                    test: testDataRef,
+                  },
+                  factory({}) {
+                    return { nonexistent: 'test' } as any;
+                  },
+                }),
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', unknown output provided via 'nonexistent'",
+        );
+      });
+
+      it('should refuse to create an instance with missing required input', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    singleton: createExtensionInput(
+                      {
+                        test: testDataRef,
+                      },
+                      { singleton: true },
+                    ),
+                  },
+                  output: {},
+                  factory: () => ({}),
+                }),
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', input 'singleton' is required but was not received",
+        );
+      });
+
+      it('should warn when creating an instance with undeclared inputs', () => {
+        const { warn } = withLogCollector(['warn'], () =>
+          createAppNodeInstance({
+            attachments: new Map([
+              [
+                'declared',
+                [
+                  makeInstanceWithId(simpleExtension, {
+                    output: 'many1',
+                  }),
+                ],
+              ],
+              [
+                'undeclared',
+                [
+                  makeInstanceWithId(simpleExtension, {
+                    output: 'many1',
+                  }),
+                ],
+              ],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'parent',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    declared: createExtensionInput({
+                      test: testDataRef,
+                    }),
+                  },
+                  output: {},
+                  factory: () => ({}),
+                }),
+              ),
+            ),
+          }),
+        );
+
+        expect(warn).toEqual([
+          "The extension 'app/test' is attached to the input 'undeclared' of the extension 'app/parent', but it has no such input (candidates are 'declared')",
+        ]);
+      });
+
+      it('should refuse to create an instance with multiple undeclared inputs', () => {
+        const { warn } = withLogCollector(['warn'], () =>
+          createAppNodeInstance({
+            attachments: new Map([
+              [
+                'undeclared1',
+                [makeInstanceWithId(simpleExtension, { output: 'many1' })],
+              ],
+              [
+                'undeclared2',
+                [
+                  makeInstanceWithId(simpleExtension, { output: 'many1' }),
+                  makeInstanceWithId(simpleExtension, { output: 'many1' }),
+                ],
+              ],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'parent',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: {},
+                  factory: () => ({}),
+                }),
+              ),
+            ),
+          }),
+        );
+
+        expect(warn).toEqual([
+          "The extension 'app/test' is attached to the input 'undeclared1' of the extension 'app/parent', but it has no inputs",
+          "The extensions 'app/test', 'app/test' are attached to the input 'undeclared2' of the extension 'app/parent', but it has no inputs",
+        ]);
+      });
+
+      it('should refuse to create an instance with multiple inputs for required singleton', () => {
+        expect(() =>
+          createAppNodeInstance({
+            attachments: new Map([
+              [
+                'singleton',
+                [
+                  makeInstanceWithId(simpleExtension, { output: 'many1' }),
+                  makeInstanceWithId(simpleExtension, { output: 'many2' }),
+                ],
+              ],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    singleton: createExtensionInput(
+                      {
+                        test: testDataRef,
+                      },
+                      { singleton: true },
+                    ),
+                  },
+                  output: {},
+                  factory: () => ({}),
+                }),
+              ),
+            ),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', expected exactly one 'singleton' input but received multiple: 'app/test', 'app/test'",
+        );
+      });
+
+      it('should refuse to create an instance with multiple inputs for optional singleton', () => {
+        expect(() =>
+          createAppNodeInstance({
+            attachments: new Map([
+              [
+                'singleton',
+                [
+                  makeInstanceWithId(simpleExtension, { output: 'many1' }),
+                  makeInstanceWithId(simpleExtension, { output: 'many2' }),
+                ],
+              ],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    singleton: createExtensionInput(
+                      {
+                        test: testDataRef,
+                      },
+                      { singleton: true, optional: true },
+                    ),
+                  },
+                  output: {},
+                  factory: () => ({}),
+                }),
+              ),
+            ),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', expected at most one 'singleton' input but received multiple: 'app/test', 'app/test'",
+        );
+      });
+
+      it('should refuse to create an instance with multiple inputs that did not provide required data', () => {
+        expect(() =>
+          createAppNodeInstance({
+            attachments: new Map([
+              ['singleton', [makeInstanceWithId(simpleExtension, undefined)]],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    singleton: createExtensionInput(
+                      {
+                        other: otherDataRef,
+                      },
+                      { singleton: true },
+                    ),
+                  },
+                  output: {},
+                  factory: () => ({}),
+                }),
+              ),
+            ),
+          }),
+        ).toThrowErrorMatchingInlineSnapshot(
+          `"Failed to instantiate extension 'app/test', extension 'app/test' could not be attached because its output data ('test', 'other') does not match what the input 'singleton' requires ('other')"`,
+        );
+      });
     });
   });
 
-  it('should refuse to create an extension with invalid config', () => {
-    expect(() =>
-      createAppNodeInstance({
-        node: makeNode(simpleExtension, { config: { other: 'not-a-number' } }),
-        attachments: new Map(),
-      }),
-    ).toThrow(
-      "Invalid configuration for extension 'app/test'; caused by Error: Expected number, received string at 'other'",
-    );
-  });
-
-  it('should forward extension factory errors', () => {
-    expect(() =>
-      createAppNodeInstance({
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'test',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              output: {},
-              factory() {
-                const error = new Error('NOPE');
-                error.name = 'NopeError';
-                throw error;
-              },
-            }),
-          ),
+  describe('v2', () => {
+    const simpleExtension = resolveExtensionDefinition(
+      createExtension({
+        namespace: 'app',
+        name: 'test',
+        attachTo: { id: 'ignored', input: 'ignored' },
+        output: [testDataRef, otherDataRef.optional()],
+        configSchema: createSchemaFromZod(z =>
+          z.object({
+            output: z.string().default('test'),
+            other: z.number().optional(),
+          }),
         ),
-        attachments: new Map(),
+        factory({ config }) {
+          return [
+            testDataRef(config.output),
+            ...(config.other ? [otherDataRef(config.other)] : []),
+          ];
+        },
       }),
-    ).toThrow(
-      "Failed to instantiate extension 'app/test'; caused by NopeError: NOPE",
     );
-  });
 
-  it('should refuse to create an instance with duplicate output', () => {
-    expect(() =>
-      createAppNodeInstance({
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'test',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              output: {
-                test1: testDataRef,
-                test2: testDataRef,
-              },
-              factory({}) {
-                return { test1: 'test', test2: 'test2' };
-              },
-            }),
-          ),
-        ),
-        attachments: new Map(),
-      }),
-    ).toThrow(
-      "Failed to instantiate extension 'app/test', duplicate extension data 'test' received via output 'test2'",
-    );
-  });
-
-  it('should refuse to create an instance with disconnected output data', () => {
-    expect(() =>
-      createAppNodeInstance({
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'test',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              output: {
-                test: testDataRef,
-              },
-              factory({}) {
-                return { nonexistent: 'test' } as any;
-              },
-            }),
-          ),
-        ),
-        attachments: new Map(),
-      }),
-    ).toThrow(
-      "Failed to instantiate extension 'app/test', unknown output provided via 'nonexistent'",
-    );
-  });
-
-  it('should refuse to create an instance with missing required input', () => {
-    expect(() =>
-      createAppNodeInstance({
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'test',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              inputs: {
-                singleton: createExtensionInput(
-                  {
-                    test: testDataRef,
+    function mirrorInputs(ctx: {
+      inputs: {
+        [name in string]:
+          | undefined
+          | ResolvedExtensionInput<
+              ExtensionInput<any, { singleton: boolean; optional: boolean }>
+            >
+          | Array<
+              ResolvedExtensionInput<
+                ExtensionInput<any, { singleton: boolean; optional: boolean }>
+              >
+            >;
+      };
+    }) {
+      return [
+        inputMirrorDataRef(
+          Object.fromEntries(
+            Object.entries(ctx.inputs).map(([k, v]) => [
+              k,
+              Array.isArray(v)
+                ? v.map(vi => ({
+                    node: vi.node,
+                    test: vi.get(testDataRef),
+                    other: vi.get(otherDataRef),
+                  }))
+                : {
+                    node: v?.node,
+                    test: v?.get(testDataRef),
+                    other: v?.get(otherDataRef),
                   },
-                  { singleton: true },
-                ),
+            ]),
+          ),
+        ),
+      ];
+    }
+
+    it('should instantiate a single node', () => {
+      const tree = resolveAppTree('root-node', [
+        makeSpec(simpleExtension, { id: 'root-node' }),
+      ]);
+      expect(tree.root.instance).not.toBeDefined();
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+      expect(tree.root.instance?.getData(testDataRef)).toBe('test');
+
+      // Multiple calls should have no effect
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+    });
+
+    it('should not instantiate disabled nodes', () => {
+      const tree = resolveAppTree('root-node', [
+        makeSpec(simpleExtension, { id: 'root-node', disabled: true }),
+      ]);
+      expect(tree.root.instance).not.toBeDefined();
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).not.toBeDefined();
+    });
+
+    it('should instantiate a node with attachments', () => {
+      const tree = resolveAppTree('root-node', [
+        makeSpec(
+          resolveExtensionDefinition(
+            createExtension({
+              namespace: 'root-node',
+              attachTo: { id: 'ignored', input: 'ignored' },
+              inputs: {
+                test: createExtensionInput([testDataRef]),
               },
-              output: {},
-              factory: () => ({}),
+              output: [inputMirrorDataRef],
+              factory: mirrorInputs,
             }),
           ),
         ),
-        attachments: new Map(),
-      }),
-    ).toThrow(
-      "Failed to instantiate extension 'app/test', input 'singleton' is required but was not received",
-    );
-  });
+        makeSpec(simpleExtension, {
+          id: 'child-node',
+          attachTo: { id: 'root-node', input: 'test' },
+        }),
+      ]);
 
-  it('should warn when creating an instance with undeclared inputs', () => {
-    const { warn } = withLogCollector(['warn'], () =>
-      createAppNodeInstance({
-        attachments: new Map([
+      const childNode = tree.nodes.get('child-node');
+      expect(childNode).toBeDefined();
+
+      expect(tree.root.instance).not.toBeDefined();
+      expect(childNode?.instance).not.toBeDefined();
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+      expect(childNode?.instance).toBeDefined();
+      expect(tree.root.instance?.getData(inputMirrorDataRef)).toMatchObject({
+        test: [{ node: { spec: { id: 'child-node' } }, test: 'test' }],
+      });
+
+      // Multiple calls should have no effect
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+      expect(childNode?.instance).toBeDefined();
+    });
+
+    it('should not instantiate disabled attachments', () => {
+      const tree = resolveAppTree('root-node', [
+        {
+          ...makeSpec(
+            resolveExtensionDefinition(
+              createExtension({
+                namespace: 'root-node',
+                attachTo: { id: 'ignored', input: 'ignored' },
+                inputs: {
+                  test: createExtensionInput([testDataRef]),
+                },
+                output: [inputMirrorDataRef],
+                factory: mirrorInputs,
+              }),
+            ),
+          ),
+        },
+        {
+          ...makeSpec(simpleExtension),
+          id: 'child-node',
+          // Using an invalid input should not be an error when disabled
+          attachTo: { id: 'root-node', input: 'invalid' },
+          disabled: true,
+        },
+      ]);
+
+      const childNode = tree.nodes.get('child-node');
+      expect(childNode).toBeDefined();
+
+      expect(tree.root.instance).not.toBeDefined();
+      expect(childNode?.instance).not.toBeDefined();
+      instantiateAppNodeTree(tree.root);
+      expect(tree.root.instance).toBeDefined();
+      expect(childNode?.instance).not.toBeDefined();
+      expect(tree.root.instance?.getData(inputMirrorDataRef)).toEqual({
+        test: [],
+      });
+    });
+
+    describe('createAppNodeInstance', () => {
+      it('should create a simple extension instance', () => {
+        const attachments = new Map();
+        const instance = createAppNodeInstance({
+          node: makeNode(simpleExtension),
+          attachments,
+        });
+
+        expect(Array.from(instance.getDataRefs())).toEqual([testDataRef]);
+        expect(instance.getData(testDataRef)).toEqual('test');
+      });
+
+      it('should create an extension with different kind of inputs', () => {
+        const attachments = new Map([
           [
-            'declared',
+            'optionalSingletonPresent',
             [
               makeInstanceWithId(simpleExtension, {
-                output: 'many1',
+                output: 'optionalSingletonPresent',
               }),
             ],
           ],
           [
-            'undeclared',
+            'singleton',
             [
               makeInstanceWithId(simpleExtension, {
-                output: 'many1',
+                output: 'singleton',
+                other: 2,
               }),
             ],
           ],
-        ]),
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'parent',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              inputs: {
-                declared: createExtensionInput({
-                  test: testDataRef,
+          [
+            'many',
+            [
+              makeInstanceWithId(simpleExtension, { output: 'many1' }),
+              makeInstanceWithId(simpleExtension, {
+                output: 'many2',
+                other: 3,
+              }),
+            ],
+          ],
+        ]);
+
+        const instance = createAppNodeInstance({
+          attachments,
+          node: makeNode(
+            resolveExtensionDefinition(
+              createExtension({
+                namespace: 'app',
+                name: 'test',
+                attachTo: { id: 'ignored', input: 'ignored' },
+                inputs: {
+                  optionalSingletonPresent: createExtensionInput(
+                    [testDataRef, otherDataRef.optional()],
+                    { singleton: true, optional: true },
+                  ),
+                  optionalSingletonMissing: createExtensionInput(
+                    [testDataRef, otherDataRef.optional()],
+                    { singleton: true, optional: true },
+                  ),
+                  singleton: createExtensionInput(
+                    [testDataRef, otherDataRef.optional()],
+                    { singleton: true },
+                  ),
+                  many: createExtensionInput([
+                    testDataRef,
+                    otherDataRef.optional(),
+                  ]),
+                },
+                output: [inputMirrorDataRef],
+                factory: mirrorInputs,
+              }),
+            ),
+          ),
+        });
+
+        expect(Array.from(instance.getDataRefs())).toEqual([
+          inputMirrorDataRef,
+        ]);
+        expect(instance.getData(inputMirrorDataRef)).toMatchObject({
+          optionalSingletonPresent: {
+            node: { spec: { id: 'app/test' } },
+            test: 'optionalSingletonPresent',
+          },
+          singleton: {
+            node: { spec: { id: 'app/test' } },
+            test: 'singleton',
+            other: 2,
+          },
+          many: [
+            { node: { spec: { id: 'app/test' } }, test: 'many1' },
+            {
+              node: { spec: { id: 'app/test' } },
+              test: 'many2',
+              other: 3,
+            },
+          ],
+        });
+      });
+
+      it('should refuse to create an extension with invalid config', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(simpleExtension, {
+              config: { other: 'not-a-number' },
+            }),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Invalid configuration for extension 'app/test'; caused by Error: Expected number, received string at 'other'",
+        );
+      });
+
+      it('should forward extension factory errors', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: [],
+                  factory() {
+                    const error = new Error('NOPE');
+                    error.name = 'NopeError';
+                    throw error;
+                  },
                 }),
-              },
-              output: {},
-              factory: () => ({}),
-            }),
-          ),
-        ),
-      }),
-    );
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test'; caused by NopeError: NOPE",
+        );
+      });
 
-    expect(warn).toEqual([
-      "The extension 'app/test' is attached to the input 'undeclared' of the extension 'app/parent', but it has no such input (candidates are 'declared')",
-    ]);
-  });
-
-  it('should refuse to create an instance with multiple undeclared inputs', () => {
-    const { warn } = withLogCollector(['warn'], () =>
-      createAppNodeInstance({
-        attachments: new Map([
-          [
-            'undeclared1',
-            [makeInstanceWithId(simpleExtension, { output: 'many1' })],
-          ],
-          [
-            'undeclared2',
-            [
-              makeInstanceWithId(simpleExtension, { output: 'many1' }),
-              makeInstanceWithId(simpleExtension, { output: 'many1' }),
-            ],
-          ],
-        ]),
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'parent',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              output: {},
-              factory: () => ({}),
-            }),
-          ),
-        ),
-      }),
-    );
-
-    expect(warn).toEqual([
-      "The extension 'app/test' is attached to the input 'undeclared1' of the extension 'app/parent', but it has no inputs",
-      "The extensions 'app/test', 'app/test' are attached to the input 'undeclared2' of the extension 'app/parent', but it has no inputs",
-    ]);
-  });
-
-  it('should refuse to create an instance with multiple inputs for required singleton', () => {
-    expect(() =>
-      createAppNodeInstance({
-        attachments: new Map([
-          [
-            'singleton',
-            [
-              makeInstanceWithId(simpleExtension, { output: 'many1' }),
-              makeInstanceWithId(simpleExtension, { output: 'many2' }),
-            ],
-          ],
-        ]),
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'test',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              inputs: {
-                singleton: createExtensionInput(
-                  {
-                    test: testDataRef,
+      it('should refuse to create an instance with duplicate output', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: [testDataRef, testDataRef],
+                  factory({}) {
+                    return [testDataRef('test'), testDataRef('test2')];
                   },
-                  { singleton: true },
-                ),
-              },
-              output: {},
-              factory: () => ({}),
-            }),
-          ),
-        ),
-      }),
-    ).toThrow(
-      "Failed to instantiate extension 'app/test', expected exactly one 'singleton' input but received multiple: 'app/test', 'app/test'",
-    );
-  });
+                }),
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', duplicate extension data output 'test'",
+        );
+      });
 
-  it('should refuse to create an instance with multiple inputs for optional singleton', () => {
-    expect(() =>
-      createAppNodeInstance({
-        attachments: new Map([
-          [
-            'singleton',
-            [
-              makeInstanceWithId(simpleExtension, { output: 'many1' }),
-              makeInstanceWithId(simpleExtension, { output: 'many2' }),
-            ],
-          ],
-        ]),
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'test',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              inputs: {
-                singleton: createExtensionInput(
-                  {
-                    test: testDataRef,
+      it('should refuse to create an instance without required', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: [testDataRef],
+                  factory({}) {
+                    return [] as any;
                   },
-                  { singleton: true, optional: true },
-                ),
-              },
-              output: {},
-              factory: () => ({}),
-            }),
-          ),
-        ),
-      }),
-    ).toThrow(
-      "Failed to instantiate extension 'app/test', expected at most one 'singleton' input but received multiple: 'app/test', 'app/test'",
-    );
-  });
+                }),
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', missing required extension data output 'test'",
+        );
+      });
 
-  it('should refuse to create an instance with multiple inputs that did not provide required data', () => {
-    expect(() =>
-      createAppNodeInstance({
-        attachments: new Map([
-          ['singleton', [makeInstanceWithId(simpleExtension, undefined)]],
-        ]),
-        node: makeNode(
-          resolveExtensionDefinition(
-            createExtension({
-              namespace: 'app',
-              name: 'test',
-              attachTo: { id: 'ignored', input: 'ignored' },
-              inputs: {
-                singleton: createExtensionInput(
-                  {
-                    other: otherDataRef,
+      it('should refuse to create an instance with unknown output data', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: [],
+                  factory({}) {
+                    return [testDataRef('test')] as any;
                   },
-                  { singleton: true },
-                ),
-              },
-              output: {},
-              factory: () => ({}),
-            }),
-          ),
-        ),
-      }),
-    ).toThrowErrorMatchingInlineSnapshot(
-      `"Failed to instantiate extension 'app/test', extension 'app/test' could not be attached because its output data ('test', 'other') does not match what the input 'singleton' requires ('other')"`,
-    );
+                }),
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', unexpected output 'test'",
+        );
+      });
+
+      it('should refuse to create an instance with missing required input', () => {
+        expect(() =>
+          createAppNodeInstance({
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    singleton: createExtensionInput([testDataRef], {
+                      singleton: true,
+                    }),
+                  },
+                  output: [],
+                  factory: () => [],
+                }),
+              ),
+            ),
+            attachments: new Map(),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', input 'singleton' is required but was not received",
+        );
+      });
+
+      it('should warn when creating an instance with undeclared inputs', () => {
+        const { warn } = withLogCollector(['warn'], () =>
+          createAppNodeInstance({
+            attachments: new Map([
+              [
+                'declared',
+                [
+                  makeInstanceWithId(simpleExtension, {
+                    output: 'many1',
+                  }),
+                ],
+              ],
+              [
+                'undeclared',
+                [
+                  makeInstanceWithId(simpleExtension, {
+                    output: 'many1',
+                  }),
+                ],
+              ],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'parent',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    declared: createExtensionInput([testDataRef]),
+                  },
+                  output: [],
+                  factory: () => [],
+                }),
+              ),
+            ),
+          }),
+        );
+
+        expect(warn).toEqual([
+          "The extension 'app/test' is attached to the input 'undeclared' of the extension 'app/parent', but it has no such input (candidates are 'declared')",
+        ]);
+      });
+
+      it('should refuse to create an instance with multiple undeclared inputs', () => {
+        const { warn } = withLogCollector(['warn'], () =>
+          createAppNodeInstance({
+            attachments: new Map([
+              [
+                'undeclared1',
+                [makeInstanceWithId(simpleExtension, { output: 'many1' })],
+              ],
+              [
+                'undeclared2',
+                [
+                  makeInstanceWithId(simpleExtension, { output: 'many1' }),
+                  makeInstanceWithId(simpleExtension, { output: 'many1' }),
+                ],
+              ],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'parent',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  output: [],
+                  factory: () => [],
+                }),
+              ),
+            ),
+          }),
+        );
+
+        expect(warn).toEqual([
+          "The extension 'app/test' is attached to the input 'undeclared1' of the extension 'app/parent', but it has no inputs",
+          "The extensions 'app/test', 'app/test' are attached to the input 'undeclared2' of the extension 'app/parent', but it has no inputs",
+        ]);
+      });
+
+      it('should refuse to create an instance with multiple inputs for required singleton', () => {
+        expect(() =>
+          createAppNodeInstance({
+            attachments: new Map([
+              [
+                'singleton',
+                [
+                  makeInstanceWithId(simpleExtension, { output: 'many1' }),
+                  makeInstanceWithId(simpleExtension, { output: 'many2' }),
+                ],
+              ],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    singleton: createExtensionInput([testDataRef], {
+                      singleton: true,
+                    }),
+                  },
+                  output: [],
+                  factory: () => [],
+                }),
+              ),
+            ),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', expected exactly one 'singleton' input but received multiple: 'app/test', 'app/test'",
+        );
+      });
+
+      it('should refuse to create an instance with multiple inputs for optional singleton', () => {
+        expect(() =>
+          createAppNodeInstance({
+            attachments: new Map([
+              [
+                'singleton',
+                [
+                  makeInstanceWithId(simpleExtension, { output: 'many1' }),
+                  makeInstanceWithId(simpleExtension, { output: 'many2' }),
+                ],
+              ],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    singleton: createExtensionInput([testDataRef], {
+                      singleton: true,
+                      optional: true,
+                    }),
+                  },
+                  output: [],
+                  factory: () => [],
+                }),
+              ),
+            ),
+          }),
+        ).toThrow(
+          "Failed to instantiate extension 'app/test', expected at most one 'singleton' input but received multiple: 'app/test', 'app/test'",
+        );
+      });
+
+      it('should refuse to create an instance with multiple inputs that did not provide required data', () => {
+        expect(() =>
+          createAppNodeInstance({
+            attachments: new Map([
+              ['singleton', [makeInstanceWithId(simpleExtension, undefined)]],
+            ]),
+            node: makeNode(
+              resolveExtensionDefinition(
+                createExtension({
+                  namespace: 'app',
+                  name: 'test',
+                  attachTo: { id: 'ignored', input: 'ignored' },
+                  inputs: {
+                    singleton: createExtensionInput([otherDataRef], {
+                      singleton: true,
+                    }),
+                  },
+                  output: [],
+                  factory: () => [],
+                }),
+              ),
+            ),
+          }),
+        ).toThrowErrorMatchingInlineSnapshot(
+          `"Failed to instantiate extension 'app/test', extension 'app/test' could not be attached because its output data ('test') does not match what the input 'singleton' requires ('other')"`,
+        );
+      });
+    });
   });
 });
diff --git a/packages/frontend-app-api/src/tree/instantiateAppNodeTree.ts b/packages/frontend-app-api/src/tree/instantiateAppNodeTree.ts
index 63eca749b7..65626e0be1 100644
--- a/packages/frontend-app-api/src/tree/instantiateAppNodeTree.ts
+++ b/packages/frontend-app-api/src/tree/instantiateAppNodeTree.ts
@@ -16,8 +16,11 @@
 
 import {
   AnyExtensionDataMap,
+  AnyExtensionDataRef,
   AnyExtensionInputMap,
+  ExtensionDataContainer,
   ExtensionDataRef,
+  ExtensionInput,
   ResolvedExtensionInputs,
 } from '@backstage/frontend-plugin-api';
 import mapValues from 'lodash/mapValues';
@@ -29,7 +32,7 @@ type Mutable<T> = {
   -readonly [P in keyof T]: T[P];
 };
 
-function resolveInputData(
+function resolveInputDataMap(
   dataMap: AnyExtensionDataMap,
   attachment: AppNode,
   inputName: string,
@@ -54,35 +57,76 @@ function resolveInputData(
   });
 }
 
-function resolveInputs(
+function resolveInputDataContainer(
+  extensionData: Array<AnyExtensionDataRef>,
+  attachment: AppNode,
+  inputName: string,
+): { node: AppNode } & ExtensionDataContainer<AnyExtensionDataRef> {
+  const dataMap = new Map<string, unknown>();
+
+  for (const ref of extensionData) {
+    if (dataMap.has(ref.id)) {
+      throw new Error(`Unexpected duplicate input data '${ref.id}'`);
+    }
+    const value = attachment.instance?.getData(ref);
+    if (value === undefined && !ref.config.optional) {
+      const expected = extensionData
+        .filter(r => !r.config.optional)
+        .map(r => `'${r.id}'`)
+        .join(', ');
+
+      const provided = [...(attachment.instance?.getDataRefs() ?? [])]
+        .map(r => `'${r.id}'`)
+        .join(', ');
+
+      throw new Error(
+        `extension '${attachment.spec.id}' could not be attached because its output data (${provided}) does not match what the input '${inputName}' requires (${expected})`,
+      );
+    }
+
+    dataMap.set(ref.id, value);
+  }
+
+  return {
+    node: attachment,
+    get(ref) {
+      return dataMap.get(ref.id);
+    },
+  } as { node: AppNode } & ExtensionDataContainer<AnyExtensionDataRef>;
+}
+
+function reportUndeclaredAttachments(
   id: string,
-  inputMap: AnyExtensionInputMap,
+  inputMap: { [name in string]: unknown },
   attachments: ReadonlyMap<string, AppNode[]>,
-): ResolvedExtensionInputs<AnyExtensionInputMap> {
+) {
   const undeclaredAttachments = Array.from(attachments.entries()).filter(
     ([inputName]) => inputMap[inputName] === undefined,
   );
 
-  if (process.env.NODE_ENV !== 'production') {
-    const inputNames = Object.keys(inputMap);
+  const inputNames = Object.keys(inputMap);
 
-    for (const [name, nodes] of undeclaredAttachments) {
-      const pl = nodes.length > 1;
-      // eslint-disable-next-line no-console
-      console.warn(
-        [
-          `The extension${pl ? 's' : ''} '${nodes
-            .map(n => n.spec.id)
-            .join("', '")}' ${pl ? 'are' : 'is'}`,
-          `attached to the input '${name}' of the extension '${id}', but it`,
-          inputNames.length === 0
-            ? 'has no inputs'
-            : `has no such input (candidates are '${inputNames.join("', '")}')`,
-        ].join(' '),
-      );
-    }
+  for (const [name, nodes] of undeclaredAttachments) {
+    const pl = nodes.length > 1;
+    // eslint-disable-next-line no-console
+    console.warn(
+      [
+        `The extension${pl ? 's' : ''} '${nodes
+          .map(n => n.spec.id)
+          .join("', '")}' ${pl ? 'are' : 'is'}`,
+        `attached to the input '${name}' of the extension '${id}', but it`,
+        inputNames.length === 0
+          ? 'has no inputs'
+          : `has no such input (candidates are '${inputNames.join("', '")}')`,
+      ].join(' '),
+    );
   }
+}
 
+function resolveV1Inputs(
+  inputMap: AnyExtensionInputMap,
+  attachments: ReadonlyMap<string, AppNode[]>,
+): ResolvedExtensionInputs<AnyExtensionInputMap> {
   return mapValues(inputMap, (input, inputName) => {
     const attachedNodes = attachments.get(inputName) ?? [];
 
@@ -104,7 +148,7 @@ function resolveInputs(
       }
       return {
         node: attachedNodes[0],
-        output: resolveInputData(
+        output: resolveInputDataMap(
           input.extensionData,
           attachedNodes[0],
           inputName,
@@ -114,11 +158,62 @@ function resolveInputs(
 
     return attachedNodes.map(attachment => ({
       node: attachment,
-      output: resolveInputData(input.extensionData, attachment, inputName),
+      output: resolveInputDataMap(input.extensionData, attachment, inputName),
     }));
   }) as ResolvedExtensionInputs<AnyExtensionInputMap>;
 }
 
+function resolveV2Inputs(
+  inputMap: {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      { optional: boolean; singleton: boolean }
+    >;
+  },
+  attachments: ReadonlyMap<string, AppNode[]>,
+): ResolvedExtensionInputs<{
+  [inputName in string]: ExtensionInput<
+    AnyExtensionDataRef,
+    { optional: boolean; singleton: boolean }
+  >;
+}> {
+  return mapValues(inputMap, (input, inputName) => {
+    const attachedNodes = attachments.get(inputName) ?? [];
+
+    if (input.config.singleton) {
+      if (attachedNodes.length > 1) {
+        const attachedNodeIds = attachedNodes.map(e => e.spec.id);
+        throw Error(
+          `expected ${
+            input.config.optional ? 'at most' : 'exactly'
+          } one '${inputName}' input but received multiple: '${attachedNodeIds.join(
+            "', '",
+          )}'`,
+        );
+      } else if (attachedNodes.length === 0) {
+        if (input.config.optional) {
+          return undefined;
+        }
+        throw Error(`input '${inputName}' is required but was not received`);
+      }
+      return resolveInputDataContainer(
+        input.extensionData,
+        attachedNodes[0],
+        inputName,
+      );
+    }
+
+    return attachedNodes.map(attachment =>
+      resolveInputDataContainer(input.extensionData, attachment, inputName),
+    );
+  }) as ResolvedExtensionInputs<{
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      { optional: boolean; singleton: boolean }
+    >;
+  }>;
+}
+
 /** @internal */
 export function createAppNodeInstance(options: {
   node: AppNode;
@@ -141,24 +236,71 @@ export function createAppNodeInstance(options: {
   try {
     const internalExtension = toInternalExtension(extension);
 
-    const namedOutputs = internalExtension.factory({
-      node,
-      config: parsedConfig,
-      inputs: resolveInputs(id, internalExtension.inputs, attachments),
-    });
+    if (process.env.NODE_ENV !== 'production') {
+      reportUndeclaredAttachments(id, internalExtension.inputs, attachments);
+    }
 
-    for (const [name, output] of Object.entries(namedOutputs)) {
-      const ref = internalExtension.output[name];
-      if (!ref) {
-        throw new Error(`unknown output provided via '${name}'`);
+    if (internalExtension.version === 'v1') {
+      const namedOutputs = internalExtension.factory({
+        node,
+        config: parsedConfig,
+        inputs: resolveV1Inputs(internalExtension.inputs, attachments),
+      });
+
+      for (const [name, output] of Object.entries(namedOutputs)) {
+        const ref = internalExtension.output[name];
+        if (!ref) {
+          throw new Error(`unknown output provided via '${name}'`);
+        }
+        if (extensionData.has(ref.id)) {
+          throw new Error(
+            `duplicate extension data '${ref.id}' received via output '${name}'`,
+          );
+        }
+        extensionData.set(ref.id, output);
+        extensionDataRefs.add(ref);
       }
-      if (extensionData.has(ref.id)) {
+    } else if (internalExtension.version === 'v2') {
+      const outputDataValues = internalExtension.factory({
+        node,
+        config: parsedConfig,
+        inputs: resolveV2Inputs(internalExtension.inputs, attachments),
+      });
+
+      const outputDataMap = new Map<string, unknown>();
+      for (const value of outputDataValues) {
+        if (outputDataMap.has(value.id)) {
+          throw new Error(`duplicate extension data output '${value.id}'`);
+        }
+        outputDataMap.set(value.id, value.value);
+      }
+
+      for (const ref of internalExtension.output) {
+        const value = outputDataMap.get(ref.id);
+        outputDataMap.delete(ref.id);
+        if (value === undefined) {
+          if (!ref.config.optional) {
+            throw new Error(
+              `missing required extension data output '${ref.id}'`,
+            );
+          }
+        } else {
+          extensionData.set(ref.id, value);
+          extensionDataRefs.add(ref);
+        }
+      }
+
+      if (outputDataMap.size > 0) {
         throw new Error(
-          `duplicate extension data '${ref.id}' received via output '${name}'`,
+          `unexpected output '${Array.from(outputDataMap.keys()).join(
+            "', '",
+          )}'`,
         );
       }
-      extensionData.set(ref.id, output);
-      extensionDataRefs.add(ref);
+    } else {
+      throw new Error(
+        `unexpected extension version '${(internalExtension as any).version}'`,
+      );
     }
   } catch (e) {
     throw new Error(

From a93fa18a1e1751fc3f0a7dc875930649ae7e3c11 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 27 Jul 2024 17:02:32 +0200
Subject: [PATCH 212/225] frontend-test-utils: update to support v2 extensions

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/app/createExtensionTester.tsx         | 56 ++++++++++++++-----
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/packages/frontend-test-utils/src/app/createExtensionTester.tsx b/packages/frontend-test-utils/src/app/createExtensionTester.tsx
index 69c4b09d06..81b74c9fce 100644
--- a/packages/frontend-test-utils/src/app/createExtensionTester.tsx
+++ b/packages/frontend-test-utils/src/app/createExtensionTester.tsx
@@ -19,6 +19,7 @@ import { MemoryRouter, Link } from 'react-router-dom';
 import { RenderResult, render } from '@testing-library/react';
 import { createSpecializedApp } from '@backstage/frontend-app-api';
 import {
+  ExtensionDataValue,
   ExtensionDefinition,
   IconComponent,
   RouteRef,
@@ -93,21 +94,48 @@ export class ExtensionTester {
     options?: { config?: TConfigInput },
   ): ExtensionTester {
     const tester = new ExtensionTester();
-    const { output, factory, ...rest } = toInternalExtensionDefinition(subject);
+    const internal = toInternalExtensionDefinition(subject);
+
     // attaching to app/routes to render as index route
-    const extension = createExtension({
-      ...rest,
-      attachTo: { id: 'app/routes', input: 'routes' },
-      output: {
-        ...output,
-        path: coreExtensionData.routePath,
-      },
-      factory: params => ({
-        ...factory(params),
-        path: '/',
-      }),
-    });
-    tester.add(extension, options as TConfigInput & {});
+    if (internal.version === 'v1') {
+      tester.add(
+        createExtension({
+          ...internal,
+          attachTo: { id: 'app/routes', input: 'routes' },
+          output: {
+            ...internal.output,
+            path: coreExtensionData.routePath,
+          },
+          factory: params => ({
+            ...internal.factory(params as any),
+            path: '/',
+          }),
+        }),
+        options as TConfigInput & {},
+      );
+    } else if (internal.version === 'v2') {
+      tester.add(
+        createExtension({
+          ...internal,
+          attachTo: { id: 'app/routes', input: 'routes' },
+          output: internal.output.find(
+            ref => ref.id === coreExtensionData.routePath.id,
+          )
+            ? internal.output
+            : [...internal.output, coreExtensionData.routePath],
+          factory: params => {
+            const parentOutput = Array.from(
+              internal.factory(params) as Iterable<
+                ExtensionDataValue<any, any>
+              >,
+            ).filter(val => val.id !== coreExtensionData.routePath.id);
+
+            return [...parentOutput, coreExtensionData.routePath('/')];
+          },
+        }),
+        options as TConfigInput & {},
+      );
+    }
     return tester;
   }
 

From 2ba97666dd41c065d20cfb0ee2ba9e1fc77d48eb Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 27 Jul 2024 17:09:44 +0200
Subject: [PATCH 213/225] update API reports for extension v2

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/frontend-plugin-api/api-report.md    | 329 ++++++++++++++----
 .../frontend-plugin-api/src/wiring/index.ts   |   1 +
 plugins/catalog-react/api-report-alpha.md     |   6 +-
 plugins/home/api-report-alpha.md              |   2 +-
 plugins/search-react/api-report-alpha.md      |   2 +-
 5 files changed, 261 insertions(+), 79 deletions(-)

diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 2c92f863e8..96c7675c0d 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -147,20 +147,23 @@ export { AnyApiFactory };
 
 export { AnyApiRef };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export type AnyExtensionDataMap = {
-  [name in string]: ExtensionDataRef<
-    unknown,
-    string,
-    {
-      optional?: true;
-    }
-  >;
+  [name in string]: AnyExtensionDataRef;
 };
 
 // @public (undocumented)
+export type AnyExtensionDataRef = ExtensionDataRef<
+  unknown,
+  string,
+  {
+    optional?: true;
+  }
+>;
+
+// @public @deprecated (undocumented)
 export type AnyExtensionInputMap = {
-  [inputName in string]: ExtensionInput<
+  [inputName in string]: LegacyExtensionInput<
     AnyExtensionDataMap,
     {
       optional: boolean;
@@ -318,16 +321,18 @@ export { configApiRef };
 
 // @public (undocumented)
 export interface ConfigurableExtensionDataRef<
-  TId extends string,
   TData,
+  TId extends string,
   TConfig extends {
     optional?: true;
   } = {},
 > extends ExtensionDataRef<TData, TId, TConfig> {
+  // (undocumented)
+  (t: TData): ExtensionDataValue<TData, TId>;
   // (undocumented)
   optional(): ConfigurableExtensionDataRef<
-    TId,
     TData,
+    TId,
     TData & {
       optional: true;
     }
@@ -351,14 +356,14 @@ export type CoreErrorBoundaryFallbackProps = {
 // @public (undocumented)
 export const coreExtensionData: {
   reactElement: ConfigurableExtensionDataRef<
-    'core.reactElement',
     JSX_2.Element,
+    'core.reactElement',
     {}
   >;
-  routePath: ConfigurableExtensionDataRef<'core.routing.path', string, {}>;
+  routePath: ConfigurableExtensionDataRef<string, 'core.routing.path', {}>;
   routeRef: ConfigurableExtensionDataRef<
-    'core.routing.ref',
     RouteRef<AnyRouteRefParams>,
+    'core.routing.ref',
     {}
   >;
 };
@@ -397,8 +402,8 @@ export function createApiExtension<
 export namespace createApiExtension {
   const // (undocumented)
     factoryDataRef: ConfigurableExtensionDataRef<
-      'core.api.factory',
       AnyApiFactory,
+      'core.api.factory',
       {}
     >;
 }
@@ -455,10 +460,10 @@ export function createAppRootWrapperExtension<
 export namespace createAppRootWrapperExtension {
   const // (undocumented)
     componentDataRef: ConfigurableExtensionDataRef<
-      'app.root.wrapper',
       React_2.ComponentType<{
         children?: React_2.ReactNode;
       }>,
+      'app.root.wrapper',
       {}
     >;
 }
@@ -493,11 +498,11 @@ export function createComponentExtension<
 export namespace createComponentExtension {
   const // (undocumented)
     componentDataRef: ConfigurableExtensionDataRef<
-      'core.component.component',
       {
         ref: ComponentRef;
         impl: ComponentType;
       },
+      'core.component.component',
       {}
     >;
 }
@@ -508,6 +513,50 @@ export function createComponentRef<T extends {} = {}>(options: {
 }): ComponentRef<T>;
 
 // @public (undocumented)
+export function createExtension<
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      {
+        optional: boolean;
+        singleton: boolean;
+      }
+    >;
+  },
+  TConfig,
+  TConfigInput,
+  TConfigSchema extends {
+    [key: string]: (zImpl: typeof z) => z.ZodType;
+  },
+  UFactoryOutput extends ExtensionDataValue<any, any>,
+>(
+  options: CreateExtensionOptions<
+    UOutput,
+    TInputs,
+    TConfig,
+    TConfigInput,
+    TConfigSchema,
+    UFactoryOutput
+  >,
+): ExtensionDefinition<
+  TConfig &
+    (string extends keyof TConfigSchema
+      ? {}
+      : {
+          [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+        }),
+  TConfigInput &
+    (string extends keyof TConfigSchema
+      ? {}
+      : z.input<
+          z.ZodObject<{
+            [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+          }>
+        >)
+>;
+
+// @public @deprecated (undocumented)
 export function createExtension<
   TOutput extends AnyExtensionDataMap,
   TInputs extends AnyExtensionInputMap,
@@ -517,7 +566,7 @@ export function createExtension<
     [key: string]: (zImpl: typeof z) => z.ZodType;
   },
 >(
-  options: CreateExtensionOptions<
+  options: LegacyCreateExtensionOptions<
     TOutput,
     TInputs,
     TConfig,
@@ -624,27 +673,27 @@ export interface CreateExtensionBlueprintOptions<
 // @public @deprecated (undocumented)
 export function createExtensionDataRef<TData>(
   id: string,
-): ConfigurableExtensionDataRef<string, TData>;
+): ConfigurableExtensionDataRef<TData, string>;
 
 // @public (undocumented)
 export function createExtensionDataRef<TData>(): {
   with<TId extends string>(options: {
     id: TId;
-  }): ConfigurableExtensionDataRef<TId, TData>;
+  }): ConfigurableExtensionDataRef<TData, TId>;
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export function createExtensionInput<
-  TExtensionData extends AnyExtensionDataMap,
+  TExtensionDataMap extends AnyExtensionDataMap,
   TConfig extends {
     singleton?: boolean;
     optional?: boolean;
   },
 >(
-  extensionData: TExtensionData,
+  extensionData: TExtensionDataMap,
   config?: TConfig,
-): ExtensionInput<
-  TExtensionData,
+): LegacyExtensionInput<
+  TExtensionDataMap,
   {
     singleton: TConfig['singleton'] extends true ? true : false;
     optional: TConfig['optional'] extends true ? true : false;
@@ -652,29 +701,62 @@ export function createExtensionInput<
 >;
 
 // @public (undocumented)
-export interface CreateExtensionOptions<
-  TOutput extends AnyExtensionDataMap,
-  TInputs extends AnyExtensionInputMap,
+export function createExtensionInput<
+  UExtensionData extends ExtensionDataRef<
+    unknown,
+    string,
+    {
+      optional?: true;
+    }
+  >,
+  TConfig extends {
+    singleton?: boolean;
+    optional?: boolean;
+  },
+>(
+  extensionData: Array<UExtensionData>,
+  config?: TConfig,
+): ExtensionInput<
+  UExtensionData,
+  {
+    singleton: TConfig['singleton'] extends true ? true : false;
+    optional: TConfig['optional'] extends true ? true : false;
+  }
+>;
+
+// @public (undocumented)
+export type CreateExtensionOptions<
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      {
+        optional: boolean;
+        singleton: boolean;
+      }
+    >;
+  },
   TConfig,
   TConfigInput,
   TConfigSchema extends {
     [key: string]: (zImpl: typeof z) => z.ZodType;
   },
-> {
-  // (undocumented)
+  UFactoryOutput extends ExtensionDataValue<any, any>,
+> = {
+  kind?: string;
+  namespace?: string;
+  name?: string;
   attachTo: {
     id: string;
     input: string;
   };
-  // (undocumented)
+  disabled?: boolean;
+  inputs?: TInputs;
+  output: Array<UOutput>;
+  configSchema?: PortableSchema<TConfig, TConfigInput>;
   config?: {
     schema: TConfigSchema;
   };
-  // @deprecated (undocumented)
-  configSchema?: PortableSchema<TConfig, TConfigInput>;
-  // (undocumented)
-  disabled?: boolean;
-  // (undocumented)
   factory(context: {
     node: AppNode;
     config: TConfig &
@@ -686,18 +768,23 @@ export interface CreateExtensionOptions<
             >;
           });
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
-  }): Expand<ExtensionDataValues<TOutput>>;
-  // (undocumented)
-  inputs?: TInputs;
-  // (undocumented)
-  kind?: string;
-  // (undocumented)
-  name?: string;
-  // (undocumented)
-  namespace?: string;
-  // (undocumented)
-  output: TOutput;
-}
+  }): Iterable<UFactoryOutput>;
+} & ((
+  UOutput extends any
+    ? UOutput['config']['optional'] extends true
+      ? never
+      : UOutput['id']
+    : never
+) extends infer IRequiredOutputIds
+  ? [IRequiredOutputIds] extends [UFactoryOutput['id']]
+    ? {}
+    : {
+        'Error: The extension factory is missing the following outputs': Exclude<
+          IRequiredOutputIds,
+          UFactoryOutput['id']
+        >;
+      }
+  : never);
 
 // @public (undocumented)
 export function createExtensionOverrides(
@@ -750,12 +837,12 @@ export function createNavItemExtension(options: {
 export namespace createNavItemExtension {
   const // (undocumented)
     targetDataRef: ConfigurableExtensionDataRef<
-      'core.nav-item.target',
       {
         title: string;
         icon: IconComponent_2;
         routeRef: RouteRef<undefined>;
       },
+      'core.nav-item.target',
       {}
     >;
 }
@@ -772,11 +859,11 @@ export function createNavLogoExtension(options: {
 export namespace createNavLogoExtension {
   const // (undocumented)
     logoElementsDataRef: ConfigurableExtensionDataRef<
-      'core.nav-logo.logo-elements',
       {
         logoIcon?: JSX.Element | undefined;
         logoFull?: JSX.Element | undefined;
       },
+      'core.nav-logo.logo-elements',
       {}
     >;
 }
@@ -866,10 +953,10 @@ export function createRouterExtension<
 export namespace createRouterExtension {
   const // (undocumented)
     componentDataRef: ConfigurableExtensionDataRef<
-      'app.router.wrapper',
       React_2.ComponentType<{
         children?: React_2.ReactNode;
       }>,
+      'app.router.wrapper',
       {}
     >;
 }
@@ -903,8 +990,8 @@ export function createSignInPageExtension<
 export namespace createSignInPageExtension {
   const // (undocumented)
     componentDataRef: ConfigurableExtensionDataRef<
-      'core.sign-in-page.component',
       React_2.ComponentType<SignInPageProps>,
+      'core.sign-in-page.component',
       {}
     >;
 }
@@ -927,8 +1014,8 @@ export function createThemeExtension(
 export namespace createThemeExtension {
   const // (undocumented)
     themeDataRef: ConfigurableExtensionDataRef<
-      'core.theme.theme',
       AppTheme,
+      'core.theme.theme',
       {}
     >;
 }
@@ -943,7 +1030,6 @@ export function createTranslationExtension(options: {
 export namespace createTranslationExtension {
   const // (undocumented)
     translationDataRef: ConfigurableExtensionDataRef<
-      'core.translation.translation',
       | TranslationResource<string>
       | TranslationMessages<
           string,
@@ -952,6 +1038,7 @@ export namespace createTranslationExtension {
           },
           boolean
         >,
+      'core.translation.translation',
       {}
     >;
 }
@@ -1083,6 +1170,18 @@ export interface ExtensionBoundaryProps {
   routable?: boolean;
 }
 
+// @public (undocumented)
+export type ExtensionDataContainer<UExtensionData extends AnyExtensionDataRef> =
+  {
+    get<TId extends UExtensionData['id']>(
+      ref: ExtensionDataRef<any, TId, any>,
+    ): UExtensionData extends ExtensionDataRef<infer IData, TId, infer IConfig>
+      ? IConfig['optional'] extends true
+        ? IData | undefined
+        : IData
+      : never;
+  };
+
 // @public (undocumented)
 export type ExtensionDataRef<
   TData,
@@ -1091,13 +1190,20 @@ export type ExtensionDataRef<
     optional?: true;
   } = {},
 > = {
-  id: TId;
-  T: TData;
-  config: TConfig;
-  $$type: '@backstage/ExtensionDataRef';
+  readonly $$type: '@backstage/ExtensionDataRef';
+  readonly id: TId;
+  readonly T: TData;
+  readonly config: TConfig;
 };
 
-// @public
+// @public (undocumented)
+export type ExtensionDataValue<TData, TId extends string> = {
+  readonly $$type: '@backstage/ExtensionDataValue';
+  readonly id: TId;
+  readonly value: TData;
+};
+
+// @public @deprecated
 export type ExtensionDataValues<TExtensionData extends AnyExtensionDataMap> = {
   [DataName in keyof TExtensionData as TExtensionData[DataName]['config'] extends {
     optional: true;
@@ -1135,7 +1241,13 @@ export interface ExtensionDefinition<TConfig, TConfigInput = TConfig> {
 
 // @public (undocumented)
 export interface ExtensionInput<
-  TExtensionData extends AnyExtensionDataMap,
+  TExtensionData extends ExtensionDataRef<
+    unknown,
+    string,
+    {
+      optional?: true;
+    }
+  >,
   TConfig extends {
     singleton: boolean;
     optional: boolean;
@@ -1146,7 +1258,7 @@ export interface ExtensionInput<
   // (undocumented)
   config: TConfig;
   // (undocumented)
-  extensionData: TExtensionData;
+  extensionData: Array<TExtensionData>;
 }
 
 // @public (undocumented)
@@ -1214,10 +1326,10 @@ export const IconBundleBlueprint: ExtensionBlueprint<
   AnyExtensionInputMap,
   {
     icons: ConfigurableExtensionDataRef<
-      'core.icons',
       {
         [x: string]: IconComponent;
       },
+      'core.icons',
       {}
     >;
   },
@@ -1231,10 +1343,10 @@ export const IconBundleBlueprint: ExtensionBlueprint<
   },
   {
     icons: ConfigurableExtensionDataRef<
-      'core.icons',
       {
         [x: string]: IconComponent;
       },
+      'core.icons',
       {}
     >;
   }
@@ -1265,6 +1377,70 @@ export { IdentityApi };
 
 export { identityApiRef };
 
+// @public @deprecated (undocumented)
+export interface LegacyCreateExtensionOptions<
+  TOutput extends AnyExtensionDataMap,
+  TInputs extends AnyExtensionInputMap,
+  TConfig,
+  TConfigInput,
+  TConfigSchema extends {
+    [key: string]: (zImpl: typeof z) => z.ZodType;
+  },
+> {
+  // (undocumented)
+  attachTo: {
+    id: string;
+    input: string;
+  };
+  // (undocumented)
+  config?: {
+    schema: TConfigSchema;
+  };
+  // @deprecated (undocumented)
+  configSchema?: PortableSchema<TConfig, TConfigInput>;
+  // (undocumented)
+  disabled?: boolean;
+  // (undocumented)
+  factory(context: {
+    node: AppNode;
+    config: TConfig &
+      (string extends keyof TConfigSchema
+        ? {}
+        : {
+            [key in keyof TConfigSchema]: z.infer<
+              ReturnType<TConfigSchema[key]>
+            >;
+          });
+    inputs: Expand<ResolvedExtensionInputs<TInputs>>;
+  }): Expand<ExtensionDataValues<TOutput>>;
+  // (undocumented)
+  inputs?: TInputs;
+  // (undocumented)
+  kind?: string;
+  // (undocumented)
+  name?: string;
+  // (undocumented)
+  namespace?: string;
+  // (undocumented)
+  output: TOutput;
+}
+
+// @public @deprecated (undocumented)
+export interface LegacyExtensionInput<
+  TExtensionDataMap extends AnyExtensionDataMap,
+  TConfig extends {
+    singleton: boolean;
+    optional: boolean;
+  },
+> {
+  // (undocumented)
+  $$type: '@backstage/ExtensionInput';
+  // (undocumented)
+  config: TConfig;
+  // (undocumented)
+  extensionData: TExtensionDataMap;
+}
+
 export { microsoftAuthApiRef };
 
 export { OAuthApi };
@@ -1315,25 +1491,30 @@ export { ProfileInfo };
 export { ProfileInfoApi };
 
 // @public
-export type ResolvedExtensionInput<TExtensionData extends AnyExtensionDataMap> =
-  {
-    node: AppNode;
-    output: ExtensionDataValues<TExtensionData>;
-  };
+export type ResolvedExtensionInput<
+  TExtensionInput extends ExtensionInput<any, any>,
+> = TExtensionInput['extensionData'] extends Array<AnyExtensionDataRef>
+  ? {
+      node: AppNode;
+    } & ExtensionDataContainer<TExtensionInput['extensionData'][number]>
+  : TExtensionInput['extensionData'] extends AnyExtensionDataMap
+  ? {
+      node: AppNode;
+      output: ExtensionDataValues<TExtensionInput['extensionData']>;
+    }
+  : never;
 
 // @public
 export type ResolvedExtensionInputs<
   TInputs extends {
-    [name in string]: ExtensionInput<any, any>;
+    [name in string]: ExtensionInput<any, any> | LegacyExtensionInput<any, any>;
   },
 > = {
   [InputName in keyof TInputs]: false extends TInputs[InputName]['config']['singleton']
-    ? Array<Expand<ResolvedExtensionInput<TInputs[InputName]['extensionData']>>>
+    ? Array<Expand<ResolvedExtensionInput<TInputs[InputName]>>>
     : false extends TInputs[InputName]['config']['optional']
-    ? Expand<ResolvedExtensionInput<TInputs[InputName]['extensionData']>>
-    : Expand<
-        ResolvedExtensionInput<TInputs[InputName]['extensionData']> | undefined
-      >;
+    ? Expand<ResolvedExtensionInput<TInputs[InputName]>>
+    : Expand<ResolvedExtensionInput<TInputs[InputName]> | undefined>;
 };
 
 // @public
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index baada41ae8..4b99ba8ebc 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -23,6 +23,7 @@ export {
   type ExtensionDataValues,
   type ResolvedExtensionInput,
   type ResolvedExtensionInputs,
+  type LegacyCreateExtensionOptions,
   type AnyExtensionInputMap,
   type AnyExtensionDataMap,
 } from './createExtension';
diff --git a/plugins/catalog-react/api-report-alpha.md b/plugins/catalog-react/api-report-alpha.md
index 1ffa67068f..206c0160e2 100644
--- a/plugins/catalog-react/api-report-alpha.md
+++ b/plugins/catalog-react/api-report-alpha.md
@@ -18,18 +18,18 @@ import { TranslationRef } from '@backstage/core-plugin-api/alpha';
 // @alpha (undocumented)
 export const catalogExtensionData: {
   entityContentTitle: ConfigurableExtensionDataRef<
-    'catalog.entity-content-title',
     string,
+    'catalog.entity-content-title',
     {}
   >;
   entityFilterFunction: ConfigurableExtensionDataRef<
-    'catalog.entity-filter-function',
     (entity: Entity) => boolean,
+    'catalog.entity-filter-function',
     {}
   >;
   entityFilterExpression: ConfigurableExtensionDataRef<
-    'catalog.entity-filter-expression',
     string,
+    'catalog.entity-filter-expression',
     {}
   >;
 };
diff --git a/plugins/home/api-report-alpha.md b/plugins/home/api-report-alpha.md
index 1dd3da96be..eb693a8e6f 100644
--- a/plugins/home/api-report-alpha.md
+++ b/plugins/home/api-report-alpha.md
@@ -12,8 +12,8 @@ export default _default;
 
 // @alpha (undocumented)
 export const titleExtensionDataRef: ConfigurableExtensionDataRef<
-  'title',
   string,
+  'title',
   {}
 >;
 
diff --git a/plugins/search-react/api-report-alpha.md b/plugins/search-react/api-report-alpha.md
index 3da9ac23a4..c6e011fe41 100644
--- a/plugins/search-react/api-report-alpha.md
+++ b/plugins/search-react/api-report-alpha.md
@@ -31,11 +31,11 @@ export function createSearchResultListItemExtension<
 export namespace createSearchResultListItemExtension {
   const // (undocumented)
     itemDataRef: ConfigurableExtensionDataRef<
-      'search.search-result-list-item.item',
       {
         predicate?: SearchResultItemExtensionPredicate | undefined;
         component: SearchResultItemExtensionComponent;
       },
+      'search.search-result-list-item.item',
       {}
     >;
 }

From f011d1b28e60a078cc699b7ec220824770454abc Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Sun, 28 Jul 2024 06:48:06 -0600
Subject: [PATCH 214/225] docs: fix typos

Signed-off-by: Kurt King <kurtaking@gmail.com>
---
 .changeset/tall-snakes-fix.md                               | 5 +++++
 docs/backend-system/building-backends/08-migrating.md       | 6 +++---
 .../src/services/definitions/AuthService.ts                 | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/tall-snakes-fix.md

diff --git a/.changeset/tall-snakes-fix.md b/.changeset/tall-snakes-fix.md
new file mode 100644
index 0000000000..68ab55bf9d
--- /dev/null
+++ b/.changeset/tall-snakes-fix.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-plugin-api': patch
+---
+
+fix typo in getPluginRequestToken comments
diff --git a/docs/backend-system/building-backends/08-migrating.md b/docs/backend-system/building-backends/08-migrating.md
index c6db44078e..67104c7ba9 100644
--- a/docs/backend-system/building-backends/08-migrating.md
+++ b/docs/backend-system/building-backends/08-migrating.md
@@ -497,7 +497,7 @@ catalog:
   providers:
     githubOrg:
       - id: production
-        githubUrl: 'https://github.com',
+        githubUrl: 'https://github.com'
         orgs: ['backstage']
         schedule:
           frequency: PT30M
@@ -536,8 +536,8 @@ catalog:
   providers:
     githubOrg:
       - id: production
-        githubUrl: 'https://github.com',
-        orgs: ['org-a', 'org-b'],
+        githubUrl: 'https://github.com'
+        orgs: ['org-a', 'org-b']
         schedule:
           frequency: PT30M
           timeout: PT15M
diff --git a/packages/backend-plugin-api/src/services/definitions/AuthService.ts b/packages/backend-plugin-api/src/services/definitions/AuthService.ts
index dce5e9be3b..1e0cf6e56b 100644
--- a/packages/backend-plugin-api/src/services/definitions/AuthService.ts
+++ b/packages/backend-plugin-api/src/services/definitions/AuthService.ts
@@ -208,7 +208,7 @@ export interface AuthService {
    *
    * @remarks
    *
-   * This method should be called before each request. Do not cold on to the
+   * This method should be called before each request. Do not hold on to the
    * issued token and reuse it for future calls.
    */
   getPluginRequestToken(options: {

From 6c1081c9cba8c4be6e9acc3f4437c2c3b9b3c96a Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@spotify.com>
Date: Sun, 28 Jul 2024 13:03:59 -0500
Subject: [PATCH 215/225] Updated various Docker items

Signed-off-by: Andre Wanlin <awanlin@spotify.com>
---
 .changeset/seven-eggs-admire.md               |  5 ++++
 docs/deployment/docker.md                     | 25 +++++++++++--------
 .../software-catalog/configuration.md         | 14 +++++++++++
 .../default-app/app-config.production.yaml    | 20 +++++++++++++--
 .../default-app/packages/backend/Dockerfile   |  3 +++
 5 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/seven-eggs-admire.md

diff --git a/.changeset/seven-eggs-admire.md b/.changeset/seven-eggs-admire.md
new file mode 100644
index 0000000000..d68b38e2d7
--- /dev/null
+++ b/.changeset/seven-eggs-admire.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Updated dockerfile and `app-config.production.yaml` to make it easier to get started with example data
diff --git a/docs/deployment/docker.md b/docs/deployment/docker.md
index 154f68c7d1..d47cb248f8 100644
--- a/docs/deployment/docker.md
+++ b/docs/deployment/docker.md
@@ -92,11 +92,14 @@ RUN tar xzf skeleton.tar.gz && rm skeleton.tar.gz
 RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \
     yarn install --frozen-lockfile --production --network-timeout 300000
 
+# This will include the examples, if you don't need these simply remove this line
+COPY --chown=node:node examples ./examples
+
 # Then copy the rest of the backend bundle, along with any other files we might want.
 COPY --chown=node:node packages/backend/dist/bundle.tar.gz app-config*.yaml ./
 RUN tar xzf bundle.tar.gz && rm bundle.tar.gz
 
-CMD ["node", "packages/backend", "--config", "app-config.yaml"]
+CMD ["node", "packages/backend", "--config", "app-config.yaml", "--config", "app-config.production.yaml"]
 ```
 
 For more details on how the `backend:bundle` command and the `skeleton.tar.gz`
@@ -251,12 +254,15 @@ RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid
 COPY --from=build --chown=node:node /app/packages/backend/dist/bundle/ ./
 
 # Copy any other files that we need at runtime
-COPY --chown=node:node app-config.yaml ./
+COPY --chown=node:node app-config*.yaml ./
+
+# This will include the examples, if you don't need these simply remove this line
+COPY --chown=node:node examples ./examples
 
 # This switches many Node.js dependencies to production mode.
 ENV NODE_ENV production
 
-CMD ["node", "packages/backend", "--config", "app-config.yaml"]
+CMD ["node", "packages/backend", "--config", "app-config.yaml", "--config", "app-config.production.yaml"]
 ```
 
 Note that a newly created Backstage app will typically not have a `plugins/`
@@ -277,6 +283,7 @@ packages/*/dist
 packages/*/node_modules
 plugins/*/dist
 plugins/*/node_modules
+*.local.yaml
 ```
 
 Once you have added both the `Dockerfile` and `.dockerignore` to the root of
@@ -312,14 +319,12 @@ first step in doing so is to remove the `app-backend` plugin from the backend
 package, which is done as follows:
 
 1. Delete `packages/backend/src/plugins/app.ts`
-2. Remove the following lines from `packages/backend/src/index.ts`:
-   ```tsx
-   import app from './plugins/app';
-   // ...
-     const appEnv = useHotMemoize(module, () => createEnv('app'));
-   // ...
-       .addRouter('', await app(appEnv));
+2. Remove the following line from `packages/backend/src/index.ts`:
+
+   ```ts
+   backend.add(import('@backstage/plugin-app-backend/alpha'));
    ```
+
 3. Remove the `@backstage/plugin-app-backend` and the app package dependency
    (e.g. `app`) from `packages/backend/package.json`. If you don't remove the
    app package dependency the app will still be built and bundled with the
diff --git a/docs/features/software-catalog/configuration.md b/docs/features/software-catalog/configuration.md
index 17d5f49205..67382aa6ce 100644
--- a/docs/features/software-catalog/configuration.md
+++ b/docs/features/software-catalog/configuration.md
@@ -58,6 +58,20 @@ catalog:
       target: ../../examples/all.yaml
 ```
 
+:::note
+There might be cases where you need to test some `file` configurations in a Docker container. In a case like this, as the backend is serving the frontend in a default setup, the path would be from the root. Also, you need to **make sure to copy your files into your container**.
+
+Using the example above that would look like this:
+
+```yaml
+catalog:
+  locations:
+    - type: file
+      target: ./examples/all.yaml
+```
+
+:::
+
 ### Integration Processors
 
 Integrations may simply provide a mechanism to handle `url` location type for an
diff --git a/packages/create-app/templates/default-app/app-config.production.yaml b/packages/create-app/templates/default-app/app-config.production.yaml
index 5532d9067e..5d426f5392 100644
--- a/packages/create-app/templates/default-app/app-config.production.yaml
+++ b/packages/create-app/templates/default-app/app-config.production.yaml
@@ -30,10 +30,26 @@ backend:
 
 auth:
   providers:
-    guest: null
+    guest: {}
 
 catalog:
   # Overrides the default list locations from app-config.yaml as these contain example data.
   # See https://backstage.io/docs/features/software-catalog/#adding-components-to-the-catalog for more details
   # on how to get entities into the catalog.
-  locations: []
+  locations:
+    # Local example data, replace this with your production config, these are intended for demo use only.
+    # File locations are relative to the backend process, typically in a deployed context, such as in a Docker container, this will be the root
+    - type: file
+      target: ./examples/entities.yaml
+
+    # Local example template
+    - type: file
+      target: ./examples/template/template.yaml
+      rules:
+        - allow: [Template]
+
+    # Local example organizational data
+    - type: file
+      target: ./examples/org.yaml
+      rules:
+        - allow: [User, Group]
diff --git a/packages/create-app/templates/default-app/packages/backend/Dockerfile b/packages/create-app/templates/default-app/packages/backend/Dockerfile
index 18548e9337..bef67b5ce7 100644
--- a/packages/create-app/templates/default-app/packages/backend/Dockerfile
+++ b/packages/create-app/templates/default-app/packages/backend/Dockerfile
@@ -45,6 +45,9 @@ RUN tar xzf skeleton.tar.gz && rm skeleton.tar.gz
 RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \
     yarn install --frozen-lockfile --production --network-timeout 300000
 
+# This will include the examples, if you don't need these simply remove this line
+COPY --chown=node:node examples ./examples
+
 # Then copy the rest of the backend bundle, along with any other files we might want.
 COPY --chown=node:node packages/backend/dist/bundle.tar.gz app-config*.yaml ./
 RUN tar xzf bundle.tar.gz && rm bundle.tar.gz

From 47bc4046c57c7bdd10e7f20c2463fd447f505750 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 28 Jul 2024 21:24:03 +0200
Subject: [PATCH 216/225] frontend-plugin-api: add initial support for v2
 extensions for blueprints

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/dry-squids-tap.md                  |   8 +-
 packages/frontend-plugin-api/api-report.md    | 143 +++++++++++-------
 .../src/extensions/IconBundleBlueprint.ts     |   8 +-
 .../src/wiring/createExtension.ts             |  38 +++--
 .../wiring/createExtensionBlueprint.test.tsx  |  54 ++-----
 .../src/wiring/createExtensionBlueprint.ts    | 137 ++++++++++++-----
 .../src/wiring/createExtensionDataRef.ts      |   6 +
 .../frontend-plugin-api/src/wiring/index.ts   |   1 +
 8 files changed, 235 insertions(+), 160 deletions(-)

diff --git a/.changeset/dry-squids-tap.md b/.changeset/dry-squids-tap.md
index 613ec4b7cb..0a95332eed 100644
--- a/.changeset/dry-squids-tap.md
+++ b/.changeset/dry-squids-tap.md
@@ -11,13 +11,9 @@ This allows the creation of extension instances with the following pattern:
 const EntityCardBlueprint = createExtensionBlueprint({
   kind: 'entity-card',
   attachTo: { id: 'test', input: 'default' },
-  output: {
-    element: coreExtensionData.reactElement,
-  },
+  output: [coreExtensionData.reactElement],
   factory(params: { text: string }) {
-    return {
-      element: <h1>{params.text}</h1>,
-    };
+    return [coreExtensionData.reactElement(<h1>{params.text}</h1>)];
   },
 });
 
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index 96c7675c0d..d37f0a3a56 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -593,24 +593,38 @@ export function createExtension<
 // @public
 export function createExtensionBlueprint<
   TParams,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      {
+        optional: boolean;
+        singleton: boolean;
+      }
+    >;
+  },
+  UExtraOutput extends AnyExtensionDataRef,
   TConfigSchema extends {
     [key in string]: (zImpl: typeof z) => z.ZodType;
   },
-  TDataRefs extends AnyExtensionDataMap = never,
+  UFactoryOutput extends ExtensionDataValue<any, any>,
+  TDataRefs extends {
+    [name in string]: AnyExtensionDataRef;
+  } = never,
 >(
   options: CreateExtensionBlueprintOptions<
     TParams,
+    UOutput,
     TInputs,
-    TOutput,
     TConfigSchema,
+    UFactoryOutput,
     TDataRefs
   >,
 ): ExtensionBlueprint<
   TParams,
+  UOutput,
   TInputs,
-  TOutput,
+  UExtraOutput,
   string extends keyof TConfigSchema
     ? {}
     : {
@@ -627,29 +641,38 @@ export function createExtensionBlueprint<
 >;
 
 // @public (undocumented)
-export interface CreateExtensionBlueprintOptions<
+export type CreateExtensionBlueprintOptions<
   TParams,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      {
+        optional: boolean;
+        singleton: boolean;
+      }
+    >;
+  },
   TConfigSchema extends {
     [key in string]: (zImpl: typeof z) => z.ZodType;
   },
-  TDataRefs extends AnyExtensionDataMap,
-> {
-  // (undocumented)
+  UFactoryOutput extends ExtensionDataValue<any, any>,
+  TDataRefs extends {
+    [name in string]: AnyExtensionDataRef;
+  },
+> = {
+  kind: string;
+  namespace?: string;
   attachTo: {
     id: string;
     input: string;
   };
-  // (undocumented)
+  disabled?: boolean;
+  inputs?: TInputs;
+  output: Array<UOutput>;
   config?: {
     schema: TConfigSchema;
   };
-  // (undocumented)
-  dataRefs?: TDataRefs;
-  // (undocumented)
-  disabled?: boolean;
-  // (undocumented)
   factory(
     params: TParams,
     context: {
@@ -659,16 +682,9 @@ export interface CreateExtensionBlueprintOptions<
       };
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
-  ): Expand<ExtensionDataValues<TOutput>>;
-  // (undocumented)
-  inputs?: TInputs;
-  // (undocumented)
-  kind: string;
-  // (undocumented)
-  namespace?: string;
-  // (undocumented)
-  output: TOutput;
-}
+  ): Iterable<UFactoryOutput>;
+  dataRefs?: TDataRefs;
+} & VerifyExtensionFactoryOutput<UOutput, UFactoryOutput>;
 
 // @public @deprecated (undocumented)
 export function createExtensionDataRef<TData>(
@@ -769,22 +785,7 @@ export type CreateExtensionOptions<
           });
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }): Iterable<UFactoryOutput>;
-} & ((
-  UOutput extends any
-    ? UOutput['config']['optional'] extends true
-      ? never
-      : UOutput['id']
-    : never
-) extends infer IRequiredOutputIds
-  ? [IRequiredOutputIds] extends [UFactoryOutput['id']]
-    ? {}
-    : {
-        'Error: The extension factory is missing the following outputs': Exclude<
-          IRequiredOutputIds,
-          UFactoryOutput['id']
-        >;
-      }
-  : never);
+} & VerifyExtensionFactoryOutput<UOutput, UFactoryOutput>;
 
 // @public (undocumented)
 export function createExtensionOverrides(
@@ -1081,15 +1082,26 @@ export interface Extension<TConfig, TConfigInput = TConfig> {
 // @public (undocumented)
 export interface ExtensionBlueprint<
   TParams,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      {
+        optional: boolean;
+        singleton: boolean;
+      }
+    >;
+  },
+  UExtraOutput extends AnyExtensionDataRef,
   TConfig extends {
     [key in string]: unknown;
   },
   TConfigInput extends {
     [key in string]: unknown;
   },
-  TDataRefs extends AnyExtensionDataMap,
+  TDataRefs extends {
+    [name in string]: AnyExtensionDataRef;
+  },
 > {
   // (undocumented)
   dataRefs: TDataRefs;
@@ -1097,6 +1109,7 @@ export interface ExtensionBlueprint<
     TExtensionConfigSchema extends {
       [key in string]: (zImpl: typeof z) => z.ZodType;
     },
+    UFactoryOutput extends ExtensionDataValue<any, any>,
   >(
     args: {
       namespace?: string;
@@ -1107,7 +1120,7 @@ export interface ExtensionBlueprint<
       };
       disabled?: boolean;
       inputs?: TInputs;
-      output?: TOutput;
+      output?: Array<UExtraOutput>;
       config?: {
         schema: TExtensionConfigSchema & {
           [KName in keyof TConfig]?: `Error: Config key '${KName &
@@ -1115,7 +1128,7 @@ export interface ExtensionBlueprint<
         };
       };
     } & (
-      | {
+      | ({
           factory(
             originalFactory: (
               params: TParams,
@@ -1123,7 +1136,7 @@ export interface ExtensionBlueprint<
                 config?: TConfig;
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
-            ) => Expand<ExtensionDataValues<TOutput>>,
+            ) => Iterable<ExtensionDataRefToValue<UOutput>>,
             context: {
               node: AppNode;
               config: TConfig & {
@@ -1133,8 +1146,11 @@ export interface ExtensionBlueprint<
               };
               inputs: Expand<ResolvedExtensionInputs<TInputs>>;
             },
-          ): Expand<ExtensionDataValues<TOutput>>;
-        }
+          ): Iterable<UFactoryOutput>;
+        } & VerifyExtensionFactoryOutput<
+          UOutput & UExtraOutput,
+          UFactoryOutput
+        >)
       | {
           params: TParams;
         }
@@ -1196,6 +1212,12 @@ export type ExtensionDataRef<
   readonly config: TConfig;
 };
 
+// @public (undocumented)
+export type ExtensionDataRefToValue<TDataRef extends AnyExtensionDataRef> =
+  TDataRef extends ExtensionDataRef<infer IData, infer IId, any>
+    ? ExtensionDataValue<IData, IId>
+    : never;
+
 // @public (undocumented)
 export type ExtensionDataValue<TData, TId extends string> = {
   readonly $$type: '@backstage/ExtensionDataValue';
@@ -1323,16 +1345,23 @@ export const IconBundleBlueprint: ExtensionBlueprint<
       [x: string]: IconComponent;
     };
   },
-  AnyExtensionInputMap,
+  ConfigurableExtensionDataRef<
+    {
+      [x: string]: IconComponent;
+    },
+    'core.icons',
+    {}
+  >,
   {
-    icons: ConfigurableExtensionDataRef<
+    [x: string]: ExtensionInput<
+      AnyExtensionDataRef,
       {
-        [x: string]: IconComponent;
-      },
-      'core.icons',
-      {}
+        optional: boolean;
+        singleton: boolean;
+      }
     >;
   },
+  AnyExtensionDataRef,
   {
     icons: string;
     test: string;
diff --git a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
index 438da09b4a..deeabdb44c 100644
--- a/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
+++ b/packages/frontend-plugin-api/src/extensions/IconBundleBlueprint.ts
@@ -25,16 +25,16 @@ export const IconBundleBlueprint = createExtensionBlueprint({
   kind: 'icon-bundle',
   namespace: 'app',
   attachTo: { id: 'app', input: 'icons' },
-  output: {
-    icons: iconsDataRef,
-  },
+  output: [iconsDataRef],
   config: {
     schema: {
       icons: z => z.string().default('blob'),
       test: z => z.string(),
     },
   },
-  factory: (params: { icons: { [key in string]: IconComponent } }) => params,
+  factory: (params: { icons: { [key in string]: IconComponent } }) => [
+    iconsDataRef(params.icons),
+  ],
   dataRefs: {
     icons: iconsDataRef,
   },
diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts
index 4034ef7238..4d31982ed3 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtension.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts
@@ -145,6 +145,27 @@ export interface LegacyCreateExtensionOptions<
   }): Expand<ExtensionDataValues<TOutput>>;
 }
 
+/** @ignore */
+export type VerifyExtensionFactoryOutput<
+  UDeclaredOutput extends AnyExtensionDataRef,
+  UFactoryOutput extends ExtensionDataValue<any, any>,
+> = (
+  UDeclaredOutput extends any
+    ? UDeclaredOutput['config']['optional'] extends true
+      ? never
+      : UDeclaredOutput['id']
+    : never
+) extends infer IRequiredOutputIds
+  ? [IRequiredOutputIds] extends [UFactoryOutput['id']]
+    ? {}
+    : {
+        'Error: The extension factory is missing the following outputs': Exclude<
+          IRequiredOutputIds,
+          UFactoryOutput['id']
+        >;
+      }
+  : never;
+
 /** @public */
 export type CreateExtensionOptions<
   UOutput extends AnyExtensionDataRef,
@@ -183,22 +204,7 @@ export type CreateExtensionOptions<
           });
     inputs: Expand<ResolvedExtensionInputs<TInputs>>;
   }): Iterable<UFactoryOutput>;
-} & ((
-  UOutput extends any
-    ? UOutput['config']['optional'] extends true
-      ? never
-      : UOutput['id']
-    : never
-) extends infer IRequiredOutputIds
-  ? [IRequiredOutputIds] extends [UFactoryOutput['id']]
-    ? {}
-    : {
-        'Error: The extension factory is missing the following outputs': Exclude<
-          IRequiredOutputIds,
-          UFactoryOutput['id']
-        >;
-      }
-  : never);
+} & VerifyExtensionFactoryOutput<UOutput, UFactoryOutput>;
 
 /** @public */
 export interface ExtensionDefinition<TConfig, TConfigInput = TConfig> {
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
index e4cb9e26f1..8b364f33c1 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.test.tsx
@@ -27,13 +27,9 @@ describe('createExtensionBlueprint', () => {
     const TestExtensionBlueprint = createExtensionBlueprint({
       kind: 'test-extension',
       attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
+      output: [coreExtensionData.reactElement],
       factory(params: { text: string }) {
-        return {
-          element: <h1>{params.text}</h1>,
-        };
+        return [coreExtensionData.reactElement(<h1>{params.text}</h1>)];
       },
     });
 
@@ -56,12 +52,10 @@ describe('createExtensionBlueprint', () => {
       kind: 'test-extension',
       name: 'my-extension',
       namespace: undefined,
-      output: {
-        element: coreExtensionData.reactElement,
-      },
+      output: [coreExtensionData.reactElement],
       factory: expect.any(Function),
       toString: expect.any(Function),
-      version: 'v1',
+      version: 'v2',
     });
 
     const { container } = createExtensionTester(extension).render();
@@ -72,13 +66,9 @@ describe('createExtensionBlueprint', () => {
     const TestExtensionBlueprint = createExtensionBlueprint({
       kind: 'test-extension',
       attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
+      output: [coreExtensionData.reactElement],
       factory(params: { text: string }) {
-        return {
-          element: <h1>{params.text}</h1>,
-        };
+        return [coreExtensionData.reactElement(<h1>{params.text}</h1>)];
       },
     });
 
@@ -103,16 +93,12 @@ describe('createExtensionBlueprint', () => {
     const TestExtensionBlueprint = createExtensionBlueprint({
       kind: 'test-extension',
       attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
+      output: [coreExtensionData.reactElement],
       dataRefs: {
         data: dataRef,
       },
       factory(params: { text: string }) {
-        return {
-          element: <h1>{params.text}</h1>,
-        };
+        return [coreExtensionData.reactElement(<h1>{params.text}</h1>)];
       },
     });
 
@@ -125,9 +111,7 @@ describe('createExtensionBlueprint', () => {
     const TestExtensionBlueprint = createExtensionBlueprint({
       kind: 'test-extension',
       attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
+      output: [coreExtensionData.reactElement],
       config: {
         schema: {
           text: z => z.string(),
@@ -142,9 +126,7 @@ describe('createExtensionBlueprint', () => {
 
         expect(config.text).toBe('Hello, world!');
 
-        return {
-          element: <h1>{config.text}</h1>,
-        };
+        return [coreExtensionData.reactElement(<h1>{config.text}</h1>)];
       },
     });
 
@@ -188,18 +170,14 @@ describe('createExtensionBlueprint', () => {
     const TestExtensionBlueprint = createExtensionBlueprint({
       kind: 'test-extension',
       attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
+      output: [coreExtensionData.reactElement],
       config: {
         schema: {
           text: z => z.string(),
         },
       },
       factory(params: { text: string }) {
-        return {
-          element: <div>{params.text}</div>,
-        };
+        return [coreExtensionData.reactElement(<div>{params.text}</div>)];
       },
     });
 
@@ -224,16 +202,12 @@ describe('createExtensionBlueprint', () => {
     const TestExtensionBlueprint = createExtensionBlueprint({
       kind: 'test-extension',
       attachTo: { id: 'test', input: 'default' },
-      output: {
-        element: coreExtensionData.reactElement,
-      },
+      output: [coreExtensionData.reactElement],
       factory(_, { config }) {
         // @ts-expect-error
         const b = config.something;
 
-        return {
-          element: <div />,
-        };
+        return [coreExtensionData.reactElement(<div />)];
       },
     });
 
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
index 7393ca233e..b579cc207a 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts
@@ -17,31 +17,42 @@
 import { AppNode } from '../apis';
 import { Expand } from '../types';
 import {
-  AnyExtensionDataMap,
-  AnyExtensionInputMap,
-  ExtensionDataValues,
+  CreateExtensionOptions,
   ExtensionDefinition,
   ResolvedExtensionInputs,
+  VerifyExtensionFactoryOutput,
   createExtension,
 } from './createExtension';
 import { z } from 'zod';
+import { ExtensionInput } from './createExtensionInput';
+import {
+  AnyExtensionDataRef,
+  ExtensionDataRefToValue,
+  ExtensionDataValue,
+} from './createExtensionDataRef';
 
 /**
  * @public
  */
-export interface CreateExtensionBlueprintOptions<
+export type CreateExtensionBlueprintOptions<
   TParams,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      { optional: boolean; singleton: boolean }
+    >;
+  },
   TConfigSchema extends { [key in string]: (zImpl: typeof z) => z.ZodType },
-  TDataRefs extends AnyExtensionDataMap,
-> {
+  UFactoryOutput extends ExtensionDataValue<any, any>,
+  TDataRefs extends { [name in string]: AnyExtensionDataRef },
+> = {
   kind: string;
   namespace?: string;
   attachTo: { id: string; input: string };
   disabled?: boolean;
   inputs?: TInputs;
-  output: TOutput;
+  output: Array<UOutput>;
   config?: {
     schema: TConfigSchema;
   };
@@ -54,21 +65,27 @@ export interface CreateExtensionBlueprintOptions<
       };
       inputs: Expand<ResolvedExtensionInputs<TInputs>>;
     },
-  ): Expand<ExtensionDataValues<TOutput>>;
+  ): Iterable<UFactoryOutput>;
 
   dataRefs?: TDataRefs;
-}
+} & VerifyExtensionFactoryOutput<UOutput, UFactoryOutput>;
 
 /**
  * @public
  */
 export interface ExtensionBlueprint<
   TParams,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      { optional: boolean; singleton: boolean }
+    >;
+  },
+  UExtraOutput extends AnyExtensionDataRef,
   TConfig extends { [key in string]: unknown },
   TConfigInput extends { [key in string]: unknown },
-  TDataRefs extends AnyExtensionDataMap,
+  TDataRefs extends { [name in string]: AnyExtensionDataRef },
 > {
   dataRefs: TDataRefs;
 
@@ -82,6 +99,7 @@ export interface ExtensionBlueprint<
     TExtensionConfigSchema extends {
       [key in string]: (zImpl: typeof z) => z.ZodType;
     },
+    UFactoryOutput extends ExtensionDataValue<any, any>,
   >(
     args: {
       namespace?: string;
@@ -89,7 +107,7 @@ export interface ExtensionBlueprint<
       attachTo?: { id: string; input: string };
       disabled?: boolean;
       inputs?: TInputs;
-      output?: TOutput;
+      output?: Array<UExtraOutput>;
       config?: {
         schema: TExtensionConfigSchema & {
           [KName in keyof TConfig]?: `Error: Config key '${KName &
@@ -97,7 +115,7 @@ export interface ExtensionBlueprint<
         };
       };
     } & (
-      | {
+      | ({
           factory(
             originalFactory: (
               params: TParams,
@@ -105,7 +123,7 @@ export interface ExtensionBlueprint<
                 config?: TConfig;
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
-            ) => Expand<ExtensionDataValues<TOutput>>,
+            ) => Iterable<ExtensionDataRefToValue<UOutput>>,
             context: {
               node: AppNode;
               config: TConfig & {
@@ -115,8 +133,11 @@ export interface ExtensionBlueprint<
               };
               inputs: Expand<ResolvedExtensionInputs<TInputs>>;
             },
-          ): Expand<ExtensionDataValues<TOutput>>;
-        }
+          ): Iterable<UFactoryOutput>;
+        } & VerifyExtensionFactoryOutput<
+          UOutput & UExtraOutput,
+          UFactoryOutput
+        >)
       | {
           params: TParams;
         }
@@ -143,17 +164,24 @@ export interface ExtensionBlueprint<
  */
 class ExtensionBlueprintImpl<
   TParams,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      { optional: boolean; singleton: boolean }
+    >;
+  },
+  UExtraOutput extends AnyExtensionDataRef,
   TConfigSchema extends { [key in string]: (zImpl: typeof z) => z.ZodType },
-  TDataRefs extends AnyExtensionDataMap,
+  TDataRefs extends { [name in string]: AnyExtensionDataRef },
 > {
   constructor(
     private readonly options: CreateExtensionBlueprintOptions<
       TParams,
+      UOutput,
       TInputs,
-      TOutput,
       TConfigSchema,
+      any,
       TDataRefs
     >,
   ) {
@@ -166,13 +194,14 @@ class ExtensionBlueprintImpl<
     TExtensionConfigSchema extends {
       [key in string]: (zImpl: typeof z) => z.ZodType;
     },
+    UFactoryOutput extends ExtensionDataValue<any, any>,
   >(args: {
     namespace?: string;
     name?: string;
     attachTo?: { id: string; input: string };
     disabled?: boolean;
     inputs?: TInputs;
-    output?: TOutput;
+    output?: Array<UExtraOutput>;
     params?: TParams;
     config?: {
       schema: TExtensionConfigSchema;
@@ -188,7 +217,7 @@ class ExtensionBlueprintImpl<
           };
           inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
         },
-      ) => Expand<ExtensionDataValues<TOutput>>,
+      ) => Iterable<ExtensionDataRefToValue<UOutput>>,
       context: {
         node: AppNode;
         config: {
@@ -200,7 +229,7 @@ class ExtensionBlueprintImpl<
         };
         inputs: Expand<ResolvedExtensionInputs<TInputs>>;
       },
-    ): Expand<ExtensionDataValues<TOutput>>;
+    ): Iterable<UFactoryOutput>;
   }): ExtensionDefinition<
     {
       [key in keyof TExtensionConfigSchema]: z.infer<
@@ -232,7 +261,7 @@ class ExtensionBlueprintImpl<
       attachTo: args.attachTo ?? this.options.attachTo,
       disabled: args.disabled ?? this.options.disabled,
       inputs: args.inputs ?? this.options.inputs,
-      output: args.output ?? this.options.output,
+      output: [...(args.output ?? []), ...this.options.output],
       config: Object.keys(schema).length === 0 ? undefined : { schema },
       factory: ({ node, config, inputs }) => {
         if (args.factory) {
@@ -247,12 +276,13 @@ class ExtensionBlueprintImpl<
                 };
                 inputs?: Expand<ResolvedExtensionInputs<TInputs>>;
               },
-            ) =>
-              this.options.factory(innerParams, {
+            ): Iterable<ExtensionDataRefToValue<UOutput>> => {
+              return this.options.factory(innerParams, {
                 node,
                 config: innerContext?.config ?? config,
                 inputs: innerContext?.inputs ?? inputs,
-              }),
+              });
+            },
             {
               node,
               config,
@@ -268,7 +298,30 @@ class ExtensionBlueprintImpl<
         }
         throw new Error('Either params or factory must be provided');
       },
-    });
+    } as CreateExtensionOptions<
+      UOutput,
+      TInputs,
+      {
+        [key in keyof TExtensionConfigSchema]: z.infer<
+          ReturnType<TExtensionConfigSchema[key]>
+        >;
+      } & {
+        [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>>;
+      },
+      z.input<
+        z.ZodObject<
+          {
+            [key in keyof TExtensionConfigSchema]: ReturnType<
+              TExtensionConfigSchema[key]
+            >;
+          } & {
+            [key in keyof TConfigSchema]: ReturnType<TConfigSchema[key]>;
+          }
+        >
+      >,
+      TConfigSchema,
+      UFactoryOutput
+    >);
   }
 }
 
@@ -280,22 +333,31 @@ class ExtensionBlueprintImpl<
  */
 export function createExtensionBlueprint<
   TParams,
-  TInputs extends AnyExtensionInputMap,
-  TOutput extends AnyExtensionDataMap,
+  UOutput extends AnyExtensionDataRef,
+  TInputs extends {
+    [inputName in string]: ExtensionInput<
+      AnyExtensionDataRef,
+      { optional: boolean; singleton: boolean }
+    >;
+  },
+  UExtraOutput extends AnyExtensionDataRef,
   TConfigSchema extends { [key in string]: (zImpl: typeof z) => z.ZodType },
-  TDataRefs extends AnyExtensionDataMap = never,
+  UFactoryOutput extends ExtensionDataValue<any, any>,
+  TDataRefs extends { [name in string]: AnyExtensionDataRef } = never,
 >(
   options: CreateExtensionBlueprintOptions<
     TParams,
+    UOutput,
     TInputs,
-    TOutput,
     TConfigSchema,
+    UFactoryOutput,
     TDataRefs
   >,
 ): ExtensionBlueprint<
   TParams,
+  UOutput,
   TInputs,
-  TOutput,
+  UExtraOutput,
   string extends keyof TConfigSchema
     ? {}
     : { [key in keyof TConfigSchema]: z.infer<ReturnType<TConfigSchema[key]>> },
@@ -310,8 +372,9 @@ export function createExtensionBlueprint<
 > {
   return new ExtensionBlueprintImpl(options) as ExtensionBlueprint<
     TParams,
+    UOutput,
     TInputs,
-    TOutput,
+    UExtraOutput,
     string extends keyof TConfigSchema
       ? {}
       : {
diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
index f4b348ae51..c77aa8c394 100644
--- a/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
+++ b/packages/frontend-plugin-api/src/wiring/createExtensionDataRef.ts
@@ -33,6 +33,12 @@ export type ExtensionDataRef<
   readonly config: TConfig;
 };
 
+/** @public */
+export type ExtensionDataRefToValue<TDataRef extends AnyExtensionDataRef> =
+  TDataRef extends ExtensionDataRef<infer IData, infer IId, any>
+    ? ExtensionDataValue<IData, IId>
+    : never;
+
 /** @public */
 export type AnyExtensionDataRef = ExtensionDataRef<
   unknown,
diff --git a/packages/frontend-plugin-api/src/wiring/index.ts b/packages/frontend-plugin-api/src/wiring/index.ts
index 4b99ba8ebc..a17dfedc16 100644
--- a/packages/frontend-plugin-api/src/wiring/index.ts
+++ b/packages/frontend-plugin-api/src/wiring/index.ts
@@ -36,6 +36,7 @@ export {
   createExtensionDataRef,
   type AnyExtensionDataRef,
   type ExtensionDataRef,
+  type ExtensionDataRefToValue,
   type ExtensionDataValue,
   type ConfigurableExtensionDataRef,
 } from './createExtensionDataRef';

From feb0734e021a16050689f6acdd61564016e818d9 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@spotify.com>
Date: Sun, 28 Jul 2024 15:39:40 -0500
Subject: [PATCH 217/225] Updated intro title

Signed-off-by: Andre Wanlin <awanlin@spotify.com>
---
 docs/getting-started/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
index 99fdb3d8ed..8bb30d1db8 100644
--- a/docs/getting-started/index.md
+++ b/docs/getting-started/index.md
@@ -1,6 +1,6 @@
 ---
 id: index
-title: Installing a standalone server
+title: Creating your Backstage App
 sidebar_label: Introduction
 description: How to install Backstage for your own use.
 ---

From 120e195aca449ba1972827a987d59587bb9f1308 Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@spotify.com>
Date: Sun, 28 Jul 2024 18:26:07 -0500
Subject: [PATCH 218/225] Updated mkdocs

Signed-off-by: Andre Wanlin <awanlin@spotify.com>
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index f163005377..8527d68c28 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -20,7 +20,7 @@ nav:
       - Support and community: 'overview/support.md'
       - Logo assets: 'overview/logos.md'
   - Getting Started:
-      - Installing a standalone server: 'getting-started/index.md'
+      - Creating your Backstage App: 'getting-started/index.md'
       - Configuring Backstage:
           - Database: 'getting-started/config/database.md'
           - Authentication: 'getting-started/config/authentication.md'

From 3be9aeb1dd94a849d88d02fd859f12f3ed80ab5a Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 29 Jul 2024 09:46:00 +0200
Subject: [PATCH 219/225] changesets: add changeset for v2 extensions

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/green-planets-reflect.md |  6 +++
 .changeset/rare-foxes-compete.md    | 57 +++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 .changeset/green-planets-reflect.md
 create mode 100644 .changeset/rare-foxes-compete.md

diff --git a/.changeset/green-planets-reflect.md b/.changeset/green-planets-reflect.md
new file mode 100644
index 0000000000..513f0480a5
--- /dev/null
+++ b/.changeset/green-planets-reflect.md
@@ -0,0 +1,6 @@
+---
+'@backstage/frontend-test-utils': patch
+'@backstage/frontend-app-api': patch
+---
+
+Added support for v2 extensions, which declare their inputs and outputs without using a data map.
diff --git a/.changeset/rare-foxes-compete.md b/.changeset/rare-foxes-compete.md
new file mode 100644
index 0000000000..64dd9b557e
--- /dev/null
+++ b/.changeset/rare-foxes-compete.md
@@ -0,0 +1,57 @@
+---
+'@backstage/frontend-plugin-api': patch
+---
+
+Extensions have been changed to be declared with an array of inputs and outputs, rather than a map of named data refs. This change was made to reduce confusion around the role of the input and output names, as well as enable more powerful APIs for overriding extensions.
+
+An extension that was previously declared like this:
+
+```tsx
+const exampleExtension = createExtension({
+  name: 'example',
+  inputs: {
+    items: createExtensionInput({
+      element: coreExtensionData.reactElement,
+    }),
+  },
+  output: {
+    element: coreExtensionData.reactElement,
+  },
+  factory({ inputs }) {
+    return {
+      element: (
+        <div>
+          Example
+          {inputs.items.map(item => {
+            return <div>{item.output.element}</div>;
+          })}
+        </div>
+      ),
+    };
+  },
+});
+```
+
+Should be migrated to the following:
+
+```tsx
+const exampleExtension = createExtension({
+  name: 'example',
+  inputs: {
+    items: createExtensionInput([coreExtensionData.reactElement]),
+  },
+  output: [coreExtensionData.reactElement],
+  factory({ inputs }) {
+    return [
+      coreExtensionData.reactElement(
+        <div>
+          Example
+          {inputs.items.map(item => {
+            return <div>{item.get(coreExtensionData.reactElement)}</div>;
+          })}
+        </div>,
+      ),
+    ];
+  },
+});
+```

From fa7c1807798402bb399ffb6fb000feb8fff93272 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 07:46:51 +0000
Subject: [PATCH 220/225] chore(deps): update snyk/actions digest to 6312a53

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/sync_snyk-github-issues.yml | 2 +-
 .github/workflows/sync_snyk-monitor.yml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sync_snyk-github-issues.yml b/.github/workflows/sync_snyk-github-issues.yml
index 1209545da1..af2e4da251 100644
--- a/.github/workflows/sync_snyk-github-issues.yml
+++ b/.github/workflows/sync_snyk-github-issues.yml
@@ -29,7 +29,7 @@ jobs:
           cache-prefix: ${{ runner.os }}-v18.x
 
       - name: Create Snyk report
-        uses: snyk/actions/node@640e31719aac3e44867d239dc86c20c3e34c8e4f # master
+        uses: snyk/actions/node@6312a53377a551c0258438bf25fb8f378afbc977 # master
         continue-on-error: true # Snyk CLI exits with error when vulnerabilities are found
         with:
           args: >
diff --git a/.github/workflows/sync_snyk-monitor.yml b/.github/workflows/sync_snyk-monitor.yml
index 44699964a6..1bdf0d30cf 100644
--- a/.github/workflows/sync_snyk-monitor.yml
+++ b/.github/workflows/sync_snyk-monitor.yml
@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Monitor and Synchronize Snyk Policies
-        uses: snyk/actions/node@640e31719aac3e44867d239dc86c20c3e34c8e4f # master
+        uses: snyk/actions/node@6312a53377a551c0258438bf25fb8f378afbc977 # master
         with:
           command: monitor
           args: >
@@ -46,7 +46,7 @@ jobs:
       # Above we run the `monitor` command, this runs the `test` command which is
       # the one that generates the SARIF report that we can upload to GitHub.
       - name: Create Snyk report
-        uses: snyk/actions/node@640e31719aac3e44867d239dc86c20c3e34c8e4f # master
+        uses: snyk/actions/node@6312a53377a551c0258438bf25fb8f378afbc977 # master
         continue-on-error: true # To make sure that SARIF upload gets called
         with:
           args: >

From 069f452521877b739b5ba8df336a7047530455d4 Mon Sep 17 00:00:00 2001
From: Ben Lambert <blam@spotify.com>
Date: Mon, 29 Jul 2024 10:06:10 +0200
Subject: [PATCH 221/225] Update tall-snakes-fix.md

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

diff --git a/.changeset/tall-snakes-fix.md b/.changeset/tall-snakes-fix.md
index 68ab55bf9d..351c781375 100644
--- a/.changeset/tall-snakes-fix.md
+++ b/.changeset/tall-snakes-fix.md
@@ -2,4 +2,4 @@
 '@backstage/backend-plugin-api': patch
 ---
 
-fix typo in getPluginRequestToken comments
+fix typo in `getPluginRequestToken` comments

From 725f470575edb11e26201548da903a88458ee82b Mon Sep 17 00:00:00 2001
From: Ben Lambert <ben@blam.sh>
Date: Mon, 29 Jul 2024 10:08:32 +0200
Subject: [PATCH 222/225] Update thick-hotels-know.md

Signed-off-by: Ben Lambert <ben@blam.sh>
---
 .changeset/thick-hotels-know.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/thick-hotels-know.md b/.changeset/thick-hotels-know.md
index a2331b6df2..f0c7129256 100644
--- a/.changeset/thick-hotels-know.md
+++ b/.changeset/thick-hotels-know.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-backend': patch
 ---
 
-Fix scaffolder action catalog:write to work in nested folders.
+Fix scaffolder action `catalog:write` to write to directories that don't already exist

From c7b14edcaf4512067cb37f95d08184476775ad10 Mon Sep 17 00:00:00 2001
From: Dane Elwell <dane.elwell@ans.co.uk>
Date: Fri, 26 Jul 2024 13:11:13 +0100
Subject: [PATCH 223/225] Add new excludeRepos option to the Gitlab provider

Signed-off-by: Dane Elwell <dane.elwell@ans.co.uk>
---
 .changeset/red-radios-promise.md              |  5 ++
 docs/integrations/gitlab/discovery.md         |  1 +
 .../api-report.md                             |  1 +
 .../catalog-backend-module-gitlab/config.d.ts |  5 ++
 .../src/__testUtils__/mocks.ts                | 27 +++++++++++
 .../src/lib/types.ts                          |  5 ++
 .../GitlabDiscoveryEntityProvider.test.ts     | 33 +++++++++++++
 .../GitlabDiscoveryEntityProvider.ts          |  7 +++
 .../src/providers/config.test.ts              | 46 +++++++++++++++++++
 .../src/providers/config.ts                   |  3 ++
 10 files changed, 133 insertions(+)
 create mode 100644 .changeset/red-radios-promise.md

diff --git a/.changeset/red-radios-promise.md b/.changeset/red-radios-promise.md
new file mode 100644
index 0000000000..66ee1cc614
--- /dev/null
+++ b/.changeset/red-radios-promise.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-gitlab': patch
+---
+
+Adds new optional excludeRepos configuration option to the Gitlab catalog provider.
diff --git a/docs/integrations/gitlab/discovery.md b/docs/integrations/gitlab/discovery.md
index 13ffd79801..70f12f181e 100644
--- a/docs/integrations/gitlab/discovery.md
+++ b/docs/integrations/gitlab/discovery.md
@@ -153,6 +153,7 @@ catalog:
         group: example-group # Optional. Group and subgroup (if needed) to look for repositories. If not present the whole instance will be scanned
         entityFilename: catalog-info.yaml # Optional. Defaults to `catalog-info.yaml`
         projectPattern: '[\s\S]*' # Optional. Filters found projects based on provided patter. Defaults to `[\s\S]*`, which means to not filter anything
+        excludeRepos: [] # Optional. A list of project paths that should be excluded from discovery, e.g. group/subgroup/repo. Should not start or end with a slash.
         schedule: # Same options as in TaskScheduleDefinition. Optional for the Legacy Backend System
           # supports cron, ISO duration, "human duration" as used in code
           frequency: { minutes: 30 }
diff --git a/plugins/catalog-backend-module-gitlab/api-report.md b/plugins/catalog-backend-module-gitlab/api-report.md
index 2b78c67205..0a1e4b7d36 100644
--- a/plugins/catalog-backend-module-gitlab/api-report.md
+++ b/plugins/catalog-backend-module-gitlab/api-report.md
@@ -110,6 +110,7 @@ export type GitlabProviderConfig = {
   orgEnabled?: boolean;
   schedule?: TaskScheduleDefinition;
   skipForkedRepos?: boolean;
+  excludeRepos?: string[];
 };
 
 // @public
diff --git a/plugins/catalog-backend-module-gitlab/config.d.ts b/plugins/catalog-backend-module-gitlab/config.d.ts
index 7d183b6e58..9f009ee478 100644
--- a/plugins/catalog-backend-module-gitlab/config.d.ts
+++ b/plugins/catalog-backend-module-gitlab/config.d.ts
@@ -63,6 +63,11 @@ export interface Config {
            * (Optional) Skip forked repository
            */
           skipForkedRepos?: boolean;
+          /**
+           * (Optional) A list of strings containing the paths of the repositories to skip
+           * Should be in the format group/subgroup/repo, with no leading or trailing slashes.
+           */
+          excludeRepos?: string[];
         };
       };
     };
diff --git a/plugins/catalog-backend-module-gitlab/src/__testUtils__/mocks.ts b/plugins/catalog-backend-module-gitlab/src/__testUtils__/mocks.ts
index 798df32695..4a173c6b50 100644
--- a/plugins/catalog-backend-module-gitlab/src/__testUtils__/mocks.ts
+++ b/plugins/catalog-backend-module-gitlab/src/__testUtils__/mocks.ts
@@ -299,6 +299,33 @@ export const config_single_integration_skip_forks: MockObject = {
   },
 };
 
+export const config_single_integration_exclude_repos: MockObject = {
+  integrations: {
+    gitlab: [
+      {
+        host: 'example.com',
+        apiBaseUrl: 'https://example.com/api/v4',
+        token: '1234',
+      },
+    ],
+  },
+  catalog: {
+    providers: {
+      gitlab: {
+        'test-id': {
+          host: 'example.com',
+          group: 'group1',
+          excludeRepos: ['group1/test-repo1'],
+          schedule: {
+            frequency: 'PT30M',
+            timeout: 'PT3M',
+          },
+        },
+      },
+    },
+  },
+};
+
 export const config_no_schedule: MockObject = {
   integrations: {
     gitlab: [
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/types.ts b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
index 0b9ea6a868..69c8ed5f92 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/types.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
@@ -201,6 +201,11 @@ export type GitlabProviderConfig = {
    * If the project is a fork, skip repository
    */
   skipForkedRepos?: boolean;
+  /**
+   * List of repositories to exclude from discovery, should be the full path to the repository, e.g. `group/project`
+   * Paths should not start or end with a slash.
+   */
+  excludeRepos?: string[];
 };
 
 /**
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts
index 473e547a57..f5e167e564 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.test.ts
@@ -130,6 +130,7 @@ describe('GitlabDiscoveryEntityProvider - configuration', () => {
     );
   });
 });
+
 describe('GitlabDiscoveryEntityProvider - refresh', () => {
   it('should apply full update on scheduled execution', async () => {
     const config = new ConfigReader(mock.config_no_org_integration);
@@ -231,6 +232,38 @@ describe('GitlabDiscoveryEntityProvider - refresh', () => {
     });
   });
 
+  it('should filter repositories that are excluded', async () => {
+    const config = new ConfigReader(
+      mock.config_single_integration_exclude_repos,
+    );
+    const schedule = new PersistingTaskRunner();
+    const entityProviderConnection: EntityProviderConnection = {
+      applyMutation: jest.fn(),
+      refresh: jest.fn(),
+    };
+    const provider = GitlabDiscoveryEntityProvider.fromConfig(config, {
+      logger,
+      schedule,
+    })[0];
+
+    await provider.connect(entityProviderConnection);
+
+    await provider.refresh(logger);
+
+    expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
+      type: 'full',
+      entities: mock.expected_location_entities_default_branch.filter(
+        entity =>
+          !entity.entity.metadata.annotations[
+            'backstage.io/managed-by-location'
+          ].includes('test-repo1') &&
+          !entity.entity.metadata.annotations[
+            'backstage.io/managed-by-location'
+          ].includes('awesome'),
+      ),
+    });
+  });
+
   // branch and fallback branch are undefined in the config
   it('should ingest catalog from project default branch only', async () => {
     const config = new ConfigReader(mock.config_single_integration);
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
index b2ef475d9d..bbd90795be 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
@@ -470,6 +470,13 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
       return false;
     }
 
+    if (this.config.excludeRepos?.includes(project.path_with_namespace ?? '')) {
+      this.logger.debug(
+        `Skipping project ${project.path_with_namespace} as it is excluded.`,
+      );
+      return false;
+    }
+
     const project_branch =
       this.config.branch ??
       project.default_branch ??
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
index 4418dba50b..28df8c88b7 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
@@ -60,6 +60,7 @@ describe('config', () => {
         allowInherited: false,
         schedule: undefined,
         skipForkedRepos: false,
+        excludeRepos: [],
         restrictUsersToGroup: false,
       }),
     );
@@ -99,6 +100,7 @@ describe('config', () => {
         allowInherited: false,
         schedule: undefined,
         skipForkedRepos: false,
+        excludeRepos: [],
         restrictUsersToGroup: false,
       }),
     );
@@ -139,11 +141,54 @@ describe('config', () => {
         allowInherited: false,
         schedule: undefined,
         restrictUsersToGroup: false,
+        excludeRepos: [],
         skipForkedRepos: true,
       }),
     );
   });
 
+  it('valid config with excludeRepos', () => {
+    const config = new ConfigReader({
+      catalog: {
+        providers: {
+          gitlab: {
+            test: {
+              group: 'group',
+              host: 'host',
+              branch: 'not-master',
+              fallbackBranch: 'main',
+              entityFilename: 'custom-file.yaml',
+              skipForkedRepos: false,
+              excludeRepos: ['foo/bar', 'quz/qux'],
+            },
+          },
+        },
+      },
+    });
+
+    const result = readGitlabConfigs(config);
+    expect(result).toHaveLength(1);
+    result.forEach(r =>
+      expect(r).toStrictEqual({
+        id: 'test',
+        group: 'group',
+        branch: 'not-master',
+        fallbackBranch: 'main',
+        host: 'host',
+        catalogFile: 'custom-file.yaml',
+        projectPattern: /[\s\S]*/,
+        groupPattern: /[\s\S]*/,
+        userPattern: /[\s\S]*/,
+        orgEnabled: false,
+        allowInherited: false,
+        schedule: undefined,
+        restrictUsersToGroup: false,
+        skipForkedRepos: false,
+        excludeRepos: ['foo/bar', 'quz/qux'],
+      }),
+    );
+  });
+
   it('valid config with schedule', () => {
     const config = new ConfigReader({
       catalog: {
@@ -181,6 +226,7 @@ describe('config', () => {
         allowInherited: false,
         skipForkedRepos: false,
         restrictUsersToGroup: false,
+        excludeRepos: [],
         schedule: {
           frequency: { minutes: 30 },
           timeout: {
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/config.ts b/plugins/catalog-backend-module-gitlab/src/providers/config.ts
index 68eba7165a..d26cba5328 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/config.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/config.ts
@@ -47,6 +47,8 @@ function readGitlabConfig(id: string, config: Config): GitlabProviderConfig {
     config.getOptionalBoolean('allowInherited') ?? false;
   const skipForkedRepos: boolean =
     config.getOptionalBoolean('skipForkedRepos') ?? false;
+  const excludeRepos: string[] =
+    config.getOptionalStringArray('excludeRepos') ?? [];
 
   const schedule = config.has('schedule')
     ? readTaskScheduleDefinitionFromConfig(config.getConfig('schedule'))
@@ -68,6 +70,7 @@ function readGitlabConfig(id: string, config: Config): GitlabProviderConfig {
     orgEnabled,
     allowInherited,
     skipForkedRepos,
+    excludeRepos,
     restrictUsersToGroup,
   };
 }

From edc977dd9647122f5d7203860ae1f68f9cfa0c04 Mon Sep 17 00:00:00 2001
From: Ben Lambert <blam@spotify.com>
Date: Mon, 29 Jul 2024 13:36:06 +0200
Subject: [PATCH 224/225] Delete .changeset/yellow-clocks-fail.md

Signed-off-by: Ben Lambert <blam@spotify.com>
---
 .changeset/yellow-clocks-fail.md | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .changeset/yellow-clocks-fail.md

diff --git a/.changeset/yellow-clocks-fail.md b/.changeset/yellow-clocks-fail.md
deleted file mode 100644
index 36e2d4b804..0000000000
--- a/.changeset/yellow-clocks-fail.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-'@backstage/plugin-search-backend-module-stack-overflow-collator': patch
-'@backstage/plugin-search-backend-module-elasticsearch': patch
-'@backstage/plugin-search-backend-module-techdocs': patch
-'@backstage/plugin-search-backend-module-catalog': patch
-'@backstage/plugin-search-backend-module-explore': patch
-'@backstage/plugin-search-backend-module-pg': patch
-'@backstage/plugin-search-backend-node': patch
-'@backstage/plugin-search-backend': patch
-'@backstage/plugin-search-common': patch
-'@backstage/plugin-search-react': patch
-'@backstage/plugin-home-react': patch
-'@backstage/plugin-search': patch
-'@backstage/plugin-home': patch
----
-
-Update ownership for home and search plugins

From 3479c956b71d4693350e3188f3ed79ff4561ffae Mon Sep 17 00:00:00 2001
From: Ben Lambert <ben@blam.sh>
Date: Mon, 29 Jul 2024 13:50:52 +0200
Subject: [PATCH 225/225] Update red-radios-promise.md

Signed-off-by: Ben Lambert <ben@blam.sh>
---
 .changeset/red-radios-promise.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/red-radios-promise.md b/.changeset/red-radios-promise.md
index 66ee1cc614..ea876c3480 100644
--- a/.changeset/red-radios-promise.md
+++ b/.changeset/red-radios-promise.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-catalog-backend-module-gitlab': patch
 ---
 
-Adds new optional excludeRepos configuration option to the Gitlab catalog provider.
+Adds new optional `excludeRepos` configuration option to the Gitlab catalog provider.