From 149064e812425daf8beb5b0288eb198a5f705fcf Mon Sep 17 00:00:00 2001
From: Shamil Ganiev <ganiev@pm.me>
Date: Wed, 12 Mar 2025 13:56:46 +0200
Subject: [PATCH 01/23] feat: Add Plata to Adopters list

Signed-off-by: Shamil Ganiev <ganiev@pm.me>
---
 ADOPTERS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ADOPTERS.md b/ADOPTERS.md
index 3d6ef63267..d80a488030 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -283,3 +283,4 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
 | [KnowBe4](https://www.knowbe4.com) | [Brandon Vicinus](https://www.linkedin.com/in/bvicinus/) | Internal Developer Portal managed by the Developer Experience Team. IDP hosts many different internal tools as plugins created by multiple teams, many of which are directly integrated with the Service Catalog. |
 | [Scalepoint](https://scalepoint.com) | [Yuriy Ostapenko](https://github.com/yuriyostapenko), [Dmytro Pasko](https://github.com/dimapasko), [Yuri Sedykh ](https://github.com/yuiri-sedykh), [Bartosz Wisniewski](https://github.com/Epgor) | Internal Developer Portal: Software Catalog with infrastructure resources and dependencies, Software Templates, TechDocs, Tech Radar, Kubernetes and Observability, as well as custom CI/CD components |
 | [VR](https://www.vr.com.br) | [Felipe Gomes](https://www.linkedin.com/in/felipe-gomes-da-silva), [Tiago Garcia](https://www.linkedin.com/in/tiago-garcia-6301a925) | Internal portal for development squads, service catalog, documentation hub, and application mapping for the entire company ecosystem, simplifying cloud infrastructure construction through templates. |
+| [Plata](https://platacard.mx/en) | [Shamil Ganiev](https://github.com/ganievs) | Internal Developer Portal for the whole engineering team |

From 2c5598cb6d60cd89ff1b03b63267f7ea7eb38152 Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 3 Apr 2025 12:07:02 +0100
Subject: [PATCH 02/23] adds function documentation for catalog extension
 points

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .changeset/cruel-animals-sink.md       |  5 +++++
 plugins/catalog-node/src/extensions.ts | 28 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 .changeset/cruel-animals-sink.md

diff --git a/.changeset/cruel-animals-sink.md b/.changeset/cruel-animals-sink.md
new file mode 100644
index 0000000000..3ac44c1319
--- /dev/null
+++ b/.changeset/cruel-animals-sink.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-node': patch
+---
+
+Adds documentation for the CatalogProcessingExtensionPoint functions.
diff --git a/plugins/catalog-node/src/extensions.ts b/plugins/catalog-node/src/extensions.ts
index b52835b1a9..91ff9eb414 100644
--- a/plugins/catalog-node/src/extensions.ts
+++ b/plugins/catalog-node/src/extensions.ts
@@ -54,13 +54,41 @@ export const catalogLocationsExtensionPoint =
  * @alpha
  */
 export interface CatalogProcessingExtensionPoint {
+  /**
+   * Adds entity processors. These are responsible for reading, parsing, and
+   * processing entities before they are persisted in the catalog.
+   *
+   * This function also can replace a Default processor if the provided processor
+   * matches the process name.
+   *
+   * @param processors - One or more processors
+   */
   addProcessor(
     ...processors: Array<CatalogProcessor | Array<CatalogProcessor>>
   ): void;
+
+  /**
+   * Adds or replaces entity providers. These are responsible for bootstrapping
+   * the list of entities out of original data sources. For example, there is
+   * one entity source for the config locations, and one for the database
+   * stored locations. If you ingest entities out of a third party system, you
+   * may want to implement that in terms of an entity provider as well.
+   *
+   * @param providers - One or more entity providers
+   */
   addEntityProvider(
     ...providers: Array<EntityProvider | Array<EntityProvider>>
   ): void;
+
+  /**
+   * Adds, or overwrites, a handler for placeholders (e.g. $file) in entity
+   * definition files.
+   *
+   * @param key - The key that identifies the placeholder, e.g. "file"
+   * @param resolver - The resolver that gets values for this placeholder
+   */
   addPlaceholderResolver(key: string, resolver: PlaceholderResolver): void;
+
   setOnProcessingErrorHandler(
     handler: (event: {
       unprocessedEntity: Entity;

From afbfc1e13f638eef6b2b71ef7f6532a45cd584fb Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 3 Apr 2025 12:09:46 +0100
Subject: [PATCH 03/23] fix typo

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 plugins/catalog-node/src/extensions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/catalog-node/src/extensions.ts b/plugins/catalog-node/src/extensions.ts
index 91ff9eb414..ad11000339 100644
--- a/plugins/catalog-node/src/extensions.ts
+++ b/plugins/catalog-node/src/extensions.ts
@@ -59,7 +59,7 @@ export interface CatalogProcessingExtensionPoint {
    * processing entities before they are persisted in the catalog.
    *
    * This function also can replace a Default processor if the provided processor
-   * matches the process name.
+   * matches the processor name.
    *
    * @param processors - One or more processors
    */

From 8146843cb4095536c5ebf6956a1c026067dc8b9b Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 3 Apr 2025 12:23:34 +0100
Subject: [PATCH 04/23] add signoff

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 plugins/catalog-node/report-alpha.api.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/catalog-node/report-alpha.api.md b/plugins/catalog-node/report-alpha.api.md
index 59f32cf76c..660b18521a 100644
--- a/plugins/catalog-node/report-alpha.api.md
+++ b/plugins/catalog-node/report-alpha.api.md
@@ -82,13 +82,10 @@ export type CatalogPermissionRuleInput<
 
 // @alpha (undocumented)
 export interface CatalogProcessingExtensionPoint {
-  // (undocumented)
   addEntityProvider(
     ...providers: Array<EntityProvider | Array<EntityProvider>>
   ): void;
-  // (undocumented)
   addPlaceholderResolver(key: string, resolver: PlaceholderResolver): void;
-  // (undocumented)
   addProcessor(
     ...processors: Array<CatalogProcessor | Array<CatalogProcessor>>
   ): void;

From d65ec54f23a17b98452e691b9263a59dfca5ec98 Mon Sep 17 00:00:00 2001
From: Nina Berg <nikb100@gmail.com>
Date: Mon, 7 Apr 2025 11:30:24 -0400
Subject: [PATCH 05/23] proxy-backend support sse connections closing

Signed-off-by: Nina Berg <nikb100@gmail.com>
---
 plugins/proxy-backend/src/service/router.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins/proxy-backend/src/service/router.ts b/plugins/proxy-backend/src/service/router.ts
index a6a52db63a..e58bccd7af 100644
--- a/plugins/proxy-backend/src/service/router.ts
+++ b/plugins/proxy-backend/src/service/router.ts
@@ -214,8 +214,12 @@ export function buildMiddleware(
     ].map(h => h.toLocaleLowerCase()),
   );
 
-  // only forward the allowed headers in backend->client
-  fullConfig.onProxyRes = (proxyRes: http.IncomingMessage) => {
+  fullConfig.onProxyRes = (
+    proxyRes: http.IncomingMessage,
+    _,
+    res: express.Response,
+  ) => {
+    // only forward the allowed headers in backend->client
     const headerNames = Object.keys(proxyRes.headers);
 
     headerNames.forEach(h => {
@@ -223,6 +227,14 @@ export function buildMiddleware(
         delete proxyRes.headers[h];
       }
     });
+
+    // handle SSE connections closed by the backend
+    // https://github.com/chimurai/http-proxy-middleware/discussions/765
+    proxyRes.on('close', () => {
+      if (!res.writableEnded) {
+        res.end();
+      }
+    });
   };
 
   if (reviveConsumedRequestBodies) {

From 9b5b744e240e1b2aa76e3b1837b312f7ff8d97b1 Mon Sep 17 00:00:00 2001
From: Nina Berg <nikb100@gmail.com>
Date: Mon, 7 Apr 2025 14:35:58 -0400
Subject: [PATCH 06/23] add changeset and tests

Signed-off-by: Nina Berg <nikb100@gmail.com>
---
 .changeset/thin-trams-work.md                 |  5 ++
 .../proxy-backend/src/service/router.test.ts  | 47 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 .changeset/thin-trams-work.md

diff --git a/.changeset/thin-trams-work.md b/.changeset/thin-trams-work.md
new file mode 100644
index 0000000000..ddc31631d1
--- /dev/null
+++ b/.changeset/thin-trams-work.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-proxy-backend': patch
+---
+
+Fixed handling of proxied sse connections when the upstream server closes the connection
diff --git a/plugins/proxy-backend/src/service/router.test.ts b/plugins/proxy-backend/src/service/router.test.ts
index 66d6de2f28..7d9a3dadbc 100644
--- a/plugins/proxy-backend/src/service/router.test.ts
+++ b/plugins/proxy-backend/src/service/router.test.ts
@@ -479,6 +479,7 @@ describe('buildMiddleware', () => {
         pragma: 'value',
         'set-cookie': ['value'],
       },
+      on: jest.fn(),
     } as Partial<http.IncomingMessage>;
 
     expect(config).toBeDefined();
@@ -522,6 +523,7 @@ describe('buildMiddleware', () => {
         'set-cookie': [],
         'x-auth-request-user': 'asd',
       },
+      on: jest.fn(),
     } as Partial<http.IncomingMessage>;
 
     expect(config).toBeDefined();
@@ -603,4 +605,49 @@ describe('buildMiddleware', () => {
       ),
     ).toThrow(/Proxy target is not a valid URL/);
   });
+
+  it('closes SSE connections when backend closes the connection', async () => {
+    buildMiddleware(
+      '/proxy',
+      logger,
+      '/test',
+      {
+        target: 'http://mocked',
+      },
+      httpRouterService,
+    );
+
+    expect(createProxyMiddleware).toHaveBeenCalledTimes(1);
+
+    const config = mockCreateProxyMiddleware.mock.calls[0][1] as Options;
+
+    const testServerResponse = {
+      headers: {},
+      on: jest.fn((event, callback) => {
+        if (event === 'close') {
+          callback();
+        }
+        return testServerResponse;
+      }),
+    } as Partial<http.IncomingMessage>;
+
+    const testClientResponse = {
+      writableEnded: false,
+      end: jest.fn(),
+    } as Partial<Response>;
+
+    expect(config).toBeDefined();
+    expect(config.onProxyRes).toBeDefined();
+
+    config.onProxyRes!(
+      testServerResponse as http.IncomingMessage,
+      {} as Request,
+      testClientResponse as Response,
+    );
+    expect(testServerResponse.on).toHaveBeenCalledWith(
+      'close',
+      expect.any(Function),
+    );
+    expect(testClientResponse.end).toHaveBeenCalled();
+  });
 });

From d903b9228430422c226f41bbd40a02b3b6ca8daa Mon Sep 17 00:00:00 2001
From: Nina Berg <nikb100@gmail.com>
Date: Mon, 7 Apr 2025 14:47:52 -0400
Subject: [PATCH 07/23] capitalize SSE for vale

Signed-off-by: Nina Berg <nikb100@gmail.com>
---
 .changeset/thin-trams-work.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/thin-trams-work.md b/.changeset/thin-trams-work.md
index ddc31631d1..26accde189 100644
--- a/.changeset/thin-trams-work.md
+++ b/.changeset/thin-trams-work.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-proxy-backend': patch
 ---
 
-Fixed handling of proxied sse connections when the upstream server closes the connection
+Fixed handling of proxied SSE connections when the upstream server closes the connection

From 1cb286e38e2d233fed12a7e97e1505afef5009b1 Mon Sep 17 00:00:00 2001
From: Yuval Fatal <92246164+YuvalFireFly@users.noreply.github.com>
Date: Mon, 7 Apr 2025 22:26:38 +0300
Subject: [PATCH 08/23] Add Firefly Backstage Plugin

Signed-off-by: Yuval Fatal <92246164+YuvalFireFly@users.noreply.github.com>
---
 microsite/data/plugins/firefly.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 microsite/data/plugins/firefly.yaml

diff --git a/microsite/data/plugins/firefly.yaml b/microsite/data/plugins/firefly.yaml
new file mode 100644
index 0000000000..8a24920499
--- /dev/null
+++ b/microsite/data/plugins/firefly.yaml
@@ -0,0 +1,10 @@
+---
+title: Firefly
+author: Firefly
+authorUrl: https://www.firefly.ai/
+category: Infrastructure
+description: A Backstage plugin for Firefly.ai that enables cloud infrastructure management, providing resource visibility, IaC coverage tracking, and automated asset cataloging.
+documentation: https://docs.firefly.ai/firefly-docs/integrations/backstage
+iconUrl: https://avatars.githubusercontent.com/u/100200663?s=400&v=4
+npmPackageName: '@fireflyai/backstage-plugin-firefly'
+addedDate: '2025-04-07'

From 5b76599d8c0feda9933a670a6df9ba49dedf8989 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 09:22:51 +0000
Subject: [PATCH 09/23] chore(deps): update dependency @types/ws to v8.18.1

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 215e6ce4bf..abf38d6171 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21181,11 +21181,11 @@ __metadata:
   linkType: hard
 
 "@types/ws@npm:*, @types/ws@npm:^8.0.0, @types/ws@npm:^8.5.10, @types/ws@npm:^8.5.3, @types/ws@npm:^8.5.4":
-  version: 8.18.0
-  resolution: "@types/ws@npm:8.18.0"
+  version: 8.18.1
+  resolution: "@types/ws@npm:8.18.1"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/2a3bbf27690532627bfde8a215c0cf3a56680f339f972785b30d0b4665528275b9270c0a0839244610b0a3f2da4218c6dd741ceba1d173fde5c5091f2034b823
+  checksum: 10/1ce05e3174dcacf28dae0e9b854ef1c9a12da44c7ed73617ab6897c5cbe4fccbb155a20be5508ae9a7dde2f83bd80f5cf3baa386b934fc4b40889ec963e94f3a
   languageName: node
   linkType: hard
 

From c4a47efe7a7f25310fa9cdd26d2f92c11b81e192 Mon Sep 17 00:00:00 2001
From: Benedikt Scheffbuch <github@benediktscheffbuch.de>
Date: Tue, 8 Apr 2025 11:57:52 +0200
Subject: [PATCH 10/23] Fix vscode launch.json in debugging.md

- Add comment descriptions
- Link to VSCode docs

Signed-off-by: Benedikt Scheffbuch <github@benediktscheffbuch.de>
---
 docs/tooling/local-dev/debugging.md | 33 ++++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/docs/tooling/local-dev/debugging.md b/docs/tooling/local-dev/debugging.md
index 65354442b2..16b65d159c 100644
--- a/docs/tooling/local-dev/debugging.md
+++ b/docs/tooling/local-dev/debugging.md
@@ -52,26 +52,29 @@ The resulting log should now have more information available for debugging:
 
 ### VSCode
 
-In your `launch.json`, add a new entry with the following,
+In your `.vscode/launch.json`, add a new entry with the following,
 
 ```jsonc
 {
-   "name": "Start Backend",
-   "type": "node",
-   "request": "launch",
-   "cwd": "${workspaceFolder}",
-   "runtimeExecutable": "yarn",
-   "args": [
-      "start-backend",
-      "--inspect"
-   ],
-   "skipFiles": [
-      "<node_internals>/**"
-   ],
-   "console": "integratedTerminal"
-},
+  "configurations": [
+    {
+      "name": "Start Backstage", // The name of this configuration, displayed in the Run and Debug panel.
+      "type": "node", // Specifies that this is a Node.js debugging configuration.
+      "request": "launch", // Indicates that the debugger should launch the application (as opposed to attaching to an already running process).
+      "cwd": "${workspaceFolder}", // Sets the current working directory to the root of the workspace.
+      "runtimeExecutable": "yarn", // Specifies the runtime to execute the application. In this case, it uses `yarn` to run the script.
+      "args": ["dev", "--inspect"], // Arguments passed to the `yarn` command. Here, it runs `yarn dev` with the `--inspect` flag to enable debugging.
+      "skipFiles": ["<node_internals>/**"], // Tells the debugger to skip stepping into Node.js internal files during debugging.
+      "console": "integratedTerminal" // Specifies that the debugger should use the integrated terminal for input/output.
+    }
+  ]
+}
 ```
 
+You can add multiple configurations for different purposes.
+
+See the [VSCode docs](https://code.visualstudio.com/docs/debugtest/debugging-configuration) for more information.
+
 ### WebStorm
 
 This section describes the process for enabling run configurations for Backstage in WebStorm.

From 13dd9888597c5b37e5f9e6d1a07b8abfe7133436 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 11:22:17 +0000
Subject: [PATCH 11/23] chore(deps): update dependency @types/dockerode to
 v3.3.37

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 215e6ce4bf..463d5a8ca9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19730,13 +19730,13 @@ __metadata:
   linkType: hard
 
 "@types/dockerode@npm:^3.3.0, @types/dockerode@npm:^3.3.29":
-  version: 3.3.35
-  resolution: "@types/dockerode@npm:3.3.35"
+  version: 3.3.37
+  resolution: "@types/dockerode@npm:3.3.37"
   dependencies:
     "@types/docker-modem": "npm:*"
     "@types/node": "npm:*"
     "@types/ssh2": "npm:*"
-  checksum: 10/9b1bc6ffc032c5fd76564c4b2c80724eddcba4c0deb885105b811f0a843464f3152e44ea850d91b614f234e35fa70002aa7350d109517460a7fc339800833ade
+  checksum: 10/c6611a6a26f8dfe1819d6b19278045020e956bd48dd5e2a054063732ee3808f64c5c5290936288ac68060c516cb56b2218e0bfe9182e391048f20f437879af28
   languageName: node
   linkType: hard
 

From 8685cabe224bbb2779b2da8b6f7645f18fa80378 Mon Sep 17 00:00:00 2001
From: pmckl <peter.lajos@outlook.com>
Date: Tue, 8 Apr 2025 15:14:48 +0200
Subject: [PATCH 12/23] feat: Added labels to scaffolder histogram metrics

Signed-off-by: pmckl <peter.lajos@outlook.com>
---
 .changeset/legal-loops-push.md                        |  5 +++++
 .../src/scaffolder/tasks/NunjucksWorkflowRunner.ts    | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 .changeset/legal-loops-push.md

diff --git a/.changeset/legal-loops-push.md b/.changeset/legal-loops-push.md
new file mode 100644
index 0000000000..956b91f364
--- /dev/null
+++ b/.changeset/legal-loops-push.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Added `template` and `step` labels for scaffolder historgam metrics: scaffolder_task_duration and scaffolder_step_duration
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index c352714d9d..80e9517fd6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -634,6 +634,7 @@ function scaffoldingTracker() {
 
       taskCount.add(1, { template, user, result: 'ok' });
       taskDuration.record(endTime(), {
+        template,
         result: 'ok',
       });
     }
@@ -652,6 +653,7 @@ function scaffoldingTracker() {
 
       taskCount.add(1, { template, user, result: 'failed' });
       taskDuration.record(endTime(), {
+        template,
         result: 'failed',
       });
     }
@@ -670,6 +672,7 @@ function scaffoldingTracker() {
 
       taskCount.add(1, { template, user, result: 'cancelled' });
       taskDuration.record(endTime(), {
+        template,
         result: 'cancelled',
       });
     }
@@ -714,6 +717,8 @@ function scaffoldingTracker() {
 
       stepCount.add(1, { template, step: step.name, result: 'ok' });
       stepDuration.record(endTime(), {
+        template,
+        step: step.name,
         result: 'ok',
       });
     }
@@ -728,6 +733,8 @@ function scaffoldingTracker() {
 
       stepCount.add(1, { template, step: step.name, result: 'cancelled' });
       stepDuration.record(endTime(), {
+        template,
+        step: step.name,
         result: 'cancelled',
       });
     }
@@ -742,6 +749,8 @@ function scaffoldingTracker() {
 
       stepCount.add(1, { template, step: step.name, result: 'failed' });
       stepDuration.record(endTime(), {
+        template,
+        step: step.name,
         result: 'failed',
       });
     }
@@ -755,6 +764,8 @@ function scaffoldingTracker() {
 
       stepCount.add(1, { template, step: step.name, result: 'skipped' });
       stepDuration.record(endTime(), {
+        template,
+        step: step.name,
         result: 'skipped',
       });
     }

From c48322734ddf5ac47734229e2ed2a49b3a747263 Mon Sep 17 00:00:00 2001
From: pmckl <peter.lajos@outlook.com>
Date: Tue, 8 Apr 2025 16:00:55 +0200
Subject: [PATCH 13/23] fix: typo

Signed-off-by: pmckl <peter.lajos@outlook.com>
---
 .changeset/legal-loops-push.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/legal-loops-push.md b/.changeset/legal-loops-push.md
index 956b91f364..b21e1c146c 100644
--- a/.changeset/legal-loops-push.md
+++ b/.changeset/legal-loops-push.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-backend': patch
 ---
 
-Added `template` and `step` labels for scaffolder historgam metrics: scaffolder_task_duration and scaffolder_step_duration
+Added `template` and `step` labels for scaffolder histogram metrics: `scaffolder_task_duration` and `scaffolder_step_duration`

From bfb84b7d035e7d77dcb22650d513f2d1f71c2c4a Mon Sep 17 00:00:00 2001
From: Benedikt Scheffbuch <github@benediktscheffbuch.de>
Date: Wed, 9 Apr 2025 08:28:17 +0200
Subject: [PATCH 14/23] chore(docs): Update docs/tooling/local-dev/debugging.md
 to include new default start script

Co-authored-by: Patrik Oldsberg <poldsberg@gmail.com>
Signed-off-by: Benedikt Scheffbuch <github@benediktscheffbuch.de>
---
 docs/tooling/local-dev/debugging.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tooling/local-dev/debugging.md b/docs/tooling/local-dev/debugging.md
index 16b65d159c..2629ce4f75 100644
--- a/docs/tooling/local-dev/debugging.md
+++ b/docs/tooling/local-dev/debugging.md
@@ -63,7 +63,7 @@ In your `.vscode/launch.json`, add a new entry with the following,
       "request": "launch", // Indicates that the debugger should launch the application (as opposed to attaching to an already running process).
       "cwd": "${workspaceFolder}", // Sets the current working directory to the root of the workspace.
       "runtimeExecutable": "yarn", // Specifies the runtime to execute the application. In this case, it uses `yarn` to run the script.
-      "args": ["dev", "--inspect"], // Arguments passed to the `yarn` command. Here, it runs `yarn dev` with the `--inspect` flag to enable debugging.
+      "args": ["start", "--inspect"], // Arguments passed to the `yarn` command. Here, it runs `yarn start` with the `--inspect` flag to enable debugging.
       "skipFiles": ["<node_internals>/**"], // Tells the debugger to skip stepping into Node.js internal files during debugging.
       "console": "integratedTerminal" // Specifies that the debugger should use the integrated terminal for input/output.
     }

From 4148e3d1220827198aa846db7533d582df212e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Wed, 9 Apr 2025 11:38:29 +0200
Subject: [PATCH 15/23] Update root-http-router.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 docs/backend-system/core-services/root-http-router.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/backend-system/core-services/root-http-router.md b/docs/backend-system/core-services/root-http-router.md
index 9ee8599eb5..7a268e27fc 100644
--- a/docs/backend-system/core-services/root-http-router.md
+++ b/docs/backend-system/core-services/root-http-router.md
@@ -74,7 +74,7 @@ There's additional options that you can pass to configure the root HTTP Router s
 You can configure the root HTTP Router service by passing the options to the `createBackend` function.
 
 ```ts
-import { rootHttpRouterServiceFactory } from '@backstage/backend-app-api';
+import { rootHttpRouterServiceFactory } from '@backstage/backend-defaults/rootHttpRouter';
 import { RequestHandler } from 'express';
 import morgan from 'morgan';
 
@@ -144,7 +144,7 @@ The root HTTP Router service also allows for configuration of the underlying Nod
 A `applyDefaults` helper is also made available to use the default app/router configuration while still enabling custom server configuration
 
 ```ts
-import { rootHttpRouterServiceFactory } from '@backstage/backend-app-api';
+import { rootHttpRouterServiceFactory } from '@backstage/backend-defaults/rootHttpRouter';
 
 const backend = createBackend();
 

From 4a7127daa22b968bd4c5039e6cd8f45563e0e9e6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 15:03:20 +0000
Subject: [PATCH 16/23] Update dependency @rspack/core to v1.3.4

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

diff --git a/yarn.lock b/yarn.lock
index 97a44d708d..ca99b5b5f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12098,10 +12098,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/error-codes@npm:0.11.1":
-  version: 0.11.1
-  resolution: "@module-federation/error-codes@npm:0.11.1"
-  checksum: 10/acdb6a2c4d607327dd54ef29058d094c50ef0af9ca1058802c91cbd03fe6f5851b78fb03a16d5fefef47ef7719bb9102ce82b341fb8951e0d1d2ded15f427875
+"@module-federation/error-codes@npm:0.11.2":
+  version: 0.11.2
+  resolution: "@module-federation/error-codes@npm:0.11.2"
+  checksum: 10/9add39ffaebcca582435a926c4628db94337c974f61dd37be355bf97080c7b829fbde4ede7c63175627f094f7607b389b3a0620610b0a1d04c751b0a65aa5bfd
   languageName: node
   linkType: hard
 
@@ -12169,13 +12169,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/runtime-core@npm:0.11.1":
-  version: 0.11.1
-  resolution: "@module-federation/runtime-core@npm:0.11.1"
+"@module-federation/runtime-core@npm:0.11.2":
+  version: 0.11.2
+  resolution: "@module-federation/runtime-core@npm:0.11.2"
   dependencies:
-    "@module-federation/error-codes": "npm:0.11.1"
-    "@module-federation/sdk": "npm:0.11.1"
-  checksum: 10/b37e531f88160efb7c7782b15e4ca09c0397453c7f1bbe85ee3e830e98e278b1d451a68108b92bf115d19d85e638e22a70a2725f444830042c43df802b19d9e8
+    "@module-federation/error-codes": "npm:0.11.2"
+    "@module-federation/sdk": "npm:0.11.2"
+  checksum: 10/46917a17f226da9fdac668bdb77addebed2412814588a5724dbd79a52819683690d9614b5277fbbafb65cc3ac645b8cf59246e5ee9aa2e030d50e4d21764432d
   languageName: node
   linkType: hard
 
@@ -12189,13 +12189,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/runtime-tools@npm:0.11.1":
-  version: 0.11.1
-  resolution: "@module-federation/runtime-tools@npm:0.11.1"
+"@module-federation/runtime-tools@npm:0.11.2":
+  version: 0.11.2
+  resolution: "@module-federation/runtime-tools@npm:0.11.2"
   dependencies:
-    "@module-federation/runtime": "npm:0.11.1"
-    "@module-federation/webpack-bundler-runtime": "npm:0.11.1"
-  checksum: 10/20daeb7378d51782cab7a9c93f8fd3fb71c864b05df107a1a2d9232be0407b9a761849569358d6dd97301b340b721c3cc33cbe80422eeca75115452883f5a2cf
+    "@module-federation/runtime": "npm:0.11.2"
+    "@module-federation/webpack-bundler-runtime": "npm:0.11.2"
+  checksum: 10/c896edc700545b95533f5751fc6cb9ba96fa635d9b81676e6c9ae7a71f825a71b30df642b6b134077801d68b6b6455da55ac997b6be6eb441abb5eaa91033ad6
   languageName: node
   linkType: hard
 
@@ -12209,14 +12209,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/runtime@npm:0.11.1":
-  version: 0.11.1
-  resolution: "@module-federation/runtime@npm:0.11.1"
+"@module-federation/runtime@npm:0.11.2":
+  version: 0.11.2
+  resolution: "@module-federation/runtime@npm:0.11.2"
   dependencies:
-    "@module-federation/error-codes": "npm:0.11.1"
-    "@module-federation/runtime-core": "npm:0.11.1"
-    "@module-federation/sdk": "npm:0.11.1"
-  checksum: 10/250ad378ba8f9b4491578d3e934bd9454c2346f8945f448e6ae9182f0da56d1633bbbba0fe3d768515e3042c859a6dc2aa4494e9ffafbed86500b0bc627fa410
+    "@module-federation/error-codes": "npm:0.11.2"
+    "@module-federation/runtime-core": "npm:0.11.2"
+    "@module-federation/sdk": "npm:0.11.2"
+  checksum: 10/98decc0f3fd0021c01cafac08764802c001554f285bd1f7c7199a83214cf7b596cd06fcdd78117bb05089999ea3520086c8854789307d32de3d8a9bd8f9829b5
   languageName: node
   linkType: hard
 
@@ -12231,10 +12231,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/sdk@npm:0.11.1":
-  version: 0.11.1
-  resolution: "@module-federation/sdk@npm:0.11.1"
-  checksum: 10/88d087685c717e86d9118da39675f829a8a00eaa0c4a879ccc00950a8e927f3698bd14d008afcfda4aebbe422e38bccff928f39f289281195a5cd7b1817678c8
+"@module-federation/sdk@npm:0.11.2":
+  version: 0.11.2
+  resolution: "@module-federation/sdk@npm:0.11.2"
+  checksum: 10/0b57523a03b8c81e975bf6bb756130742923a95f37dd7480335c5072500254a1d221077f0fbf595a8ddfb3ac30a0ffe685a259c2377b2982615ee80f856cb85c
   languageName: node
   linkType: hard
 
@@ -12258,13 +12258,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/webpack-bundler-runtime@npm:0.11.1":
-  version: 0.11.1
-  resolution: "@module-federation/webpack-bundler-runtime@npm:0.11.1"
+"@module-federation/webpack-bundler-runtime@npm:0.11.2":
+  version: 0.11.2
+  resolution: "@module-federation/webpack-bundler-runtime@npm:0.11.2"
   dependencies:
-    "@module-federation/runtime": "npm:0.11.1"
-    "@module-federation/sdk": "npm:0.11.1"
-  checksum: 10/97ed186d9888861c0198621545842397303feb1dd923803c986a68a3ca9bd9f8bef63c38e723b73bf54324183e3e24f360aa8b17bb34883c151ad97cafd03ba3
+    "@module-federation/runtime": "npm:0.11.2"
+    "@module-federation/sdk": "npm:0.11.2"
+  checksum: 10/52445b5ed70e83097391e0abdc908f43cde156b15812d743ca46db3e79d8da378f17cae610c7d821b2c076811252b2eb8290452190030b3bcbb0f467a85c393d
   languageName: node
   linkType: hard
 
@@ -16326,82 +16326,82 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rspack/binding-darwin-arm64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-darwin-arm64@npm:1.3.1"
+"@rspack/binding-darwin-arm64@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-darwin-arm64@npm:1.3.4"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rspack/binding-darwin-x64@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-darwin-x64@npm:1.3.1"
+"@rspack/binding-darwin-x64@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-darwin-x64@npm:1.3.4"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@rspack/binding-linux-arm64-gnu@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-linux-arm64-gnu@npm:1.3.1"
+"@rspack/binding-linux-arm64-gnu@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-linux-arm64-gnu@npm:1.3.4"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rspack/binding-linux-arm64-musl@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-linux-arm64-musl@npm:1.3.1"
+"@rspack/binding-linux-arm64-musl@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-linux-arm64-musl@npm:1.3.4"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rspack/binding-linux-x64-gnu@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-linux-x64-gnu@npm:1.3.1"
+"@rspack/binding-linux-x64-gnu@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-linux-x64-gnu@npm:1.3.4"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rspack/binding-linux-x64-musl@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-linux-x64-musl@npm:1.3.1"
+"@rspack/binding-linux-x64-musl@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-linux-x64-musl@npm:1.3.4"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rspack/binding-win32-arm64-msvc@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-win32-arm64-msvc@npm:1.3.1"
+"@rspack/binding-win32-arm64-msvc@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-win32-arm64-msvc@npm:1.3.4"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rspack/binding-win32-ia32-msvc@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-win32-ia32-msvc@npm:1.3.1"
+"@rspack/binding-win32-ia32-msvc@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-win32-ia32-msvc@npm:1.3.4"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@rspack/binding-win32-x64-msvc@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding-win32-x64-msvc@npm:1.3.1"
+"@rspack/binding-win32-x64-msvc@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding-win32-x64-msvc@npm:1.3.4"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@rspack/binding@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@rspack/binding@npm:1.3.1"
+"@rspack/binding@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@rspack/binding@npm:1.3.4"
   dependencies:
-    "@rspack/binding-darwin-arm64": "npm:1.3.1"
-    "@rspack/binding-darwin-x64": "npm:1.3.1"
-    "@rspack/binding-linux-arm64-gnu": "npm:1.3.1"
-    "@rspack/binding-linux-arm64-musl": "npm:1.3.1"
-    "@rspack/binding-linux-x64-gnu": "npm:1.3.1"
-    "@rspack/binding-linux-x64-musl": "npm:1.3.1"
-    "@rspack/binding-win32-arm64-msvc": "npm:1.3.1"
-    "@rspack/binding-win32-ia32-msvc": "npm:1.3.1"
-    "@rspack/binding-win32-x64-msvc": "npm:1.3.1"
+    "@rspack/binding-darwin-arm64": "npm:1.3.4"
+    "@rspack/binding-darwin-x64": "npm:1.3.4"
+    "@rspack/binding-linux-arm64-gnu": "npm:1.3.4"
+    "@rspack/binding-linux-arm64-musl": "npm:1.3.4"
+    "@rspack/binding-linux-x64-gnu": "npm:1.3.4"
+    "@rspack/binding-linux-x64-musl": "npm:1.3.4"
+    "@rspack/binding-win32-arm64-msvc": "npm:1.3.4"
+    "@rspack/binding-win32-ia32-msvc": "npm:1.3.4"
+    "@rspack/binding-win32-x64-msvc": "npm:1.3.4"
   dependenciesMeta:
     "@rspack/binding-darwin-arm64":
       optional: true
@@ -16421,19 +16421,18 @@ __metadata:
       optional: true
     "@rspack/binding-win32-x64-msvc":
       optional: true
-  checksum: 10/05b194682413fb4c0435c139ab2765ab29f191859b22c095346d86331a41097e5c09ad8681b48918267cfb9a09faa297753aa5b2a893d42527948643a30e17ca
+  checksum: 10/deceedf77d63a568c06ec3c4021a2c113013f7cab97662c1bc276938361262432df3e506735c9a88392e2e4faf1eecdb188a24aa6d1171de53b30d6efa280de4
   languageName: node
   linkType: hard
 
 "@rspack/core@npm:^1.0.10":
-  version: 1.3.1
-  resolution: "@rspack/core@npm:1.3.1"
+  version: 1.3.4
+  resolution: "@rspack/core@npm:1.3.4"
   dependencies:
-    "@module-federation/runtime-tools": "npm:0.11.1"
-    "@rspack/binding": "npm:1.3.1"
+    "@module-federation/runtime-tools": "npm:0.11.2"
+    "@rspack/binding": "npm:1.3.4"
     "@rspack/lite-tapable": "npm:1.0.1"
-    caniuse-lite: "npm:^1.0.30001706"
-    tinypool: "npm:^1.0.2"
+    caniuse-lite: "npm:^1.0.30001707"
   peerDependencies:
     "@rspack/tracing": ^1.x
     "@swc/helpers": ">=0.5.1"
@@ -16442,7 +16441,7 @@ __metadata:
       optional: true
     "@swc/helpers":
       optional: true
-  checksum: 10/8a827958a0eeb111b0d1cf86550391997aa19c95451301e47a0d2c77df9cfb2b6e192ec18c23abf0f5394dee24c3db57882245c1502d55073f8812d4c41a9ef3
+  checksum: 10/8f6f2b5e5c94026dd6d80b30844d9156cc9f1b0672251e65c30e00482a4e2d94fbc331cc5ca880a50157268eb869c53149ad5e042fd1d1d5a7bac5ae4b6e4cc2
   languageName: node
   linkType: hard
 
@@ -25031,10 +25030,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001669, caniuse-lite@npm:^1.0.30001706":
-  version: 1.0.30001707
-  resolution: "caniuse-lite@npm:1.0.30001707"
-  checksum: 10/5c5f9aad651f4d957cc59c8b4ac22bb7ac3a1c86c26ee7d5c59b00062bdc1c421980513179da1f5e20cade2da8d7f3c41d482ce7d4a8d9f411e4a827fe092d29
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001669, caniuse-lite@npm:^1.0.30001707":
+  version: 1.0.30001712
+  resolution: "caniuse-lite@npm:1.0.30001712"
+  checksum: 10/1831ac3260b9657c5a0236d21c02bea6a6b88fd67a451a0ff166d27da17c95ab398c5721e08aeb24f766bced1d38f562f07c8de84e91a10a065808e83835e89e
   languageName: node
   linkType: hard
 
@@ -45783,13 +45782,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinypool@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "tinypool@npm:1.0.2"
-  checksum: 10/6109322f14b3763f65c8fa49fddab72cd3edd96b82dd50e05e63de74867329ff5353bff4377281ec963213d9314f37f4a353e9ee34bbac85fd4c1e4a568d6076
-  languageName: node
-  linkType: hard
-
 "tinyrainbow@npm:^1.2.0":
   version: 1.2.0
   resolution: "tinyrainbow@npm:1.2.0"

From 32a40ce92745b83f22ea72b17fd84718d263c0b6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 15:13:35 +0000
Subject: [PATCH 17/23] Update dependency @codemirror/view to v6.36.5

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 8deeb71289..dc37e89fc1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9345,13 +9345,13 @@ __metadata:
   linkType: hard
 
 "@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.23.0":
-  version: 6.36.4
-  resolution: "@codemirror/view@npm:6.36.4"
+  version: 6.36.5
+  resolution: "@codemirror/view@npm:6.36.5"
   dependencies:
     "@codemirror/state": "npm:^6.5.0"
     style-mod: "npm:^4.1.0"
     w3c-keyname: "npm:^2.2.4"
-  checksum: 10/e9c60d13f3dda477e857c0e404125a570866d263b4a661fc9ba2ebe1d244094a9222e073a0f24ad80517315bf6b8820426cf038fba8395a9263b79ddf9247f0f
+  checksum: 10/577045647432ee2c8fd88c3d70a68f3c38b10d6e4b2099f62b7d2189f6183c7c91b559e3392b64bf3258f72f9b1dfeba4a95efaee48edf88a1c14f0e4fdb1aed
   languageName: node
   linkType: hard
 

From 544386b5136582b1b65fa9f1eeb6d64527fce9a6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 16:07:45 +0000
Subject: [PATCH 18/23] Update dependency @pmmmwh/react-refresh-webpack-plugin
 to v0.5.16

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 b5d9cc1474..d8ef3e6219 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15070,8 +15070,8 @@ __metadata:
   linkType: hard
 
 "@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.7":
-  version: 0.5.15
-  resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.15"
+  version: 0.5.16
+  resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.16"
   dependencies:
     ansi-html: "npm:^0.0.9"
     core-js-pure: "npm:^3.23.3"
@@ -15102,7 +15102,7 @@ __metadata:
       optional: true
     webpack-plugin-serve:
       optional: true
-  checksum: 10/d8c978654c4c6873edc3336bca87d359d3a7f32571e8404af8a3defd0e515aa34d9dc8324a9157d0220d72fb8a6a350660301c2757df964f845422a898714bc7
+  checksum: 10/d7ac4c58a377d37a4dc2f19d1434a14f83ff73d38fd7e374bdab2b2b73b7dc398803c1fb6eb84e8787417bffdc1735f83f65f55d8acac30a800de7122c16428e
   languageName: node
   linkType: hard
 

From 0fab18f588ebb355a9dae4d2945f093443a6e648 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 16:08:46 +0000
Subject: [PATCH 19/23] Update dependency dockerode to v4.0.5

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

diff --git a/yarn.lock b/yarn.lock
index b5d9cc1474..c4c58567b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27591,17 +27591,17 @@ __metadata:
   linkType: hard
 
 "dockerode@npm:^4.0.0":
-  version: 4.0.4
-  resolution: "dockerode@npm:4.0.4"
+  version: 4.0.5
+  resolution: "dockerode@npm:4.0.5"
   dependencies:
     "@balena/dockerignore": "npm:^1.0.2"
     "@grpc/grpc-js": "npm:^1.11.1"
     "@grpc/proto-loader": "npm:^0.7.13"
     docker-modem: "npm:^5.0.6"
     protobufjs: "npm:^7.3.2"
-    tar-fs: "npm:~2.0.1"
+    tar-fs: "npm:~2.1.2"
     uuid: "npm:^10.0.0"
-  checksum: 10/db2304e6125d0c4246833eaa6a389497c98564ba2ed18fa465eace1b6eb6c2a41f1711fc1e57cd2fc0f7ca6be80eeca43b0c35cd6b86205e34faf9acb0f72bcc
+  checksum: 10/a300e5fdcf4331a046db500b2e9052d440ffdc6761755e7ed69afff164866cba949affacafb83dde9e3b9f63fa1abe1c599714fc9057247533e1f926975a2b5d
   languageName: node
   linkType: hard
 
@@ -45373,15 +45373,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar-fs@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "tar-fs@npm:2.1.1"
+"tar-fs@npm:^2.0.0, tar-fs@npm:~2.1.2":
+  version: 2.1.2
+  resolution: "tar-fs@npm:2.1.2"
   dependencies:
     chownr: "npm:^1.1.1"
     mkdirp-classic: "npm:^0.5.2"
     pump: "npm:^3.0.0"
     tar-stream: "npm:^2.1.4"
-  checksum: 10/526deae025453e825f87650808969662fbb12eb0461d033e9b447de60ec951c6c4607d0afe7ce057defe9d4e45cf80399dd74bc15f9d9e0773d5e990a78ce4ac
+  checksum: 10/623f7e8e58a43578ba7368002c3cc7e321f6d170053ac0691d95172dbc7daf5dcf4347eb061277627340870ce6cfda89f5a5d633cc274c41ae6d69f54a2374e7
   languageName: node
   linkType: hard
 

From 166b85a46359eec2dab2ac663b7d0c48492dc7d7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 17:11:37 +0000
Subject: [PATCH 20/23] Update dependency esbuild to v0.25.2

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

diff --git a/yarn.lock b/yarn.lock
index 6cdc77688e..b9ad8a7a87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9648,9 +9648,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/aix-ppc64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/aix-ppc64@npm:0.25.1"
+"@esbuild/aix-ppc64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/aix-ppc64@npm:0.25.2"
   conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
@@ -9662,9 +9662,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/android-arm64@npm:0.25.1"
+"@esbuild/android-arm64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/android-arm64@npm:0.25.2"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -9676,9 +9676,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/android-arm@npm:0.25.1"
+"@esbuild/android-arm@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/android-arm@npm:0.25.2"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
@@ -9690,9 +9690,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/android-x64@npm:0.25.1"
+"@esbuild/android-x64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/android-x64@npm:0.25.2"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
@@ -9704,9 +9704,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/darwin-arm64@npm:0.25.1"
+"@esbuild/darwin-arm64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/darwin-arm64@npm:0.25.2"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -9718,9 +9718,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/darwin-x64@npm:0.25.1"
+"@esbuild/darwin-x64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/darwin-x64@npm:0.25.2"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -9732,9 +9732,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/freebsd-arm64@npm:0.25.1"
+"@esbuild/freebsd-arm64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/freebsd-arm64@npm:0.25.2"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -9746,9 +9746,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/freebsd-x64@npm:0.25.1"
+"@esbuild/freebsd-x64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/freebsd-x64@npm:0.25.2"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
@@ -9760,9 +9760,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-arm64@npm:0.25.1"
+"@esbuild/linux-arm64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-arm64@npm:0.25.2"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
@@ -9774,9 +9774,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-arm@npm:0.25.1"
+"@esbuild/linux-arm@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-arm@npm:0.25.2"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -9788,9 +9788,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-ia32@npm:0.25.1"
+"@esbuild/linux-ia32@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-ia32@npm:0.25.2"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
@@ -9802,9 +9802,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-loong64@npm:0.25.1"
+"@esbuild/linux-loong64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-loong64@npm:0.25.2"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
@@ -9816,9 +9816,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-mips64el@npm:0.25.1"
+"@esbuild/linux-mips64el@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-mips64el@npm:0.25.2"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
@@ -9830,9 +9830,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-ppc64@npm:0.25.1"
+"@esbuild/linux-ppc64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-ppc64@npm:0.25.2"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
@@ -9844,9 +9844,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-riscv64@npm:0.25.1"
+"@esbuild/linux-riscv64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-riscv64@npm:0.25.2"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
@@ -9858,9 +9858,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-s390x@npm:0.25.1"
+"@esbuild/linux-s390x@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-s390x@npm:0.25.2"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
@@ -9872,16 +9872,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/linux-x64@npm:0.25.1"
+"@esbuild/linux-x64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/linux-x64@npm:0.25.2"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-arm64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/netbsd-arm64@npm:0.25.1"
+"@esbuild/netbsd-arm64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/netbsd-arm64@npm:0.25.2"
   conditions: os=netbsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -9893,16 +9893,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/netbsd-x64@npm:0.25.1"
+"@esbuild/netbsd-x64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/netbsd-x64@npm:0.25.2"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-arm64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/openbsd-arm64@npm:0.25.1"
+"@esbuild/openbsd-arm64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/openbsd-arm64@npm:0.25.2"
   conditions: os=openbsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -9914,9 +9914,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/openbsd-x64@npm:0.25.1"
+"@esbuild/openbsd-x64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/openbsd-x64@npm:0.25.2"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
@@ -9928,9 +9928,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/sunos-x64@npm:0.25.1"
+"@esbuild/sunos-x64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/sunos-x64@npm:0.25.2"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
@@ -9942,9 +9942,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/win32-arm64@npm:0.25.1"
+"@esbuild/win32-arm64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/win32-arm64@npm:0.25.2"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -9956,9 +9956,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/win32-ia32@npm:0.25.1"
+"@esbuild/win32-ia32@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/win32-ia32@npm:0.25.2"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
@@ -9970,9 +9970,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.25.1":
-  version: 0.25.1
-  resolution: "@esbuild/win32-x64@npm:0.25.1"
+"@esbuild/win32-x64@npm:0.25.2":
+  version: 0.25.2
+  resolution: "@esbuild/win32-x64@npm:0.25.2"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -28432,34 +28432,34 @@ __metadata:
   linkType: hard
 
 "esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0, esbuild@npm:^0.25.0":
-  version: 0.25.1
-  resolution: "esbuild@npm:0.25.1"
+  version: 0.25.2
+  resolution: "esbuild@npm:0.25.2"
   dependencies:
-    "@esbuild/aix-ppc64": "npm:0.25.1"
-    "@esbuild/android-arm": "npm:0.25.1"
-    "@esbuild/android-arm64": "npm:0.25.1"
-    "@esbuild/android-x64": "npm:0.25.1"
-    "@esbuild/darwin-arm64": "npm:0.25.1"
-    "@esbuild/darwin-x64": "npm:0.25.1"
-    "@esbuild/freebsd-arm64": "npm:0.25.1"
-    "@esbuild/freebsd-x64": "npm:0.25.1"
-    "@esbuild/linux-arm": "npm:0.25.1"
-    "@esbuild/linux-arm64": "npm:0.25.1"
-    "@esbuild/linux-ia32": "npm:0.25.1"
-    "@esbuild/linux-loong64": "npm:0.25.1"
-    "@esbuild/linux-mips64el": "npm:0.25.1"
-    "@esbuild/linux-ppc64": "npm:0.25.1"
-    "@esbuild/linux-riscv64": "npm:0.25.1"
-    "@esbuild/linux-s390x": "npm:0.25.1"
-    "@esbuild/linux-x64": "npm:0.25.1"
-    "@esbuild/netbsd-arm64": "npm:0.25.1"
-    "@esbuild/netbsd-x64": "npm:0.25.1"
-    "@esbuild/openbsd-arm64": "npm:0.25.1"
-    "@esbuild/openbsd-x64": "npm:0.25.1"
-    "@esbuild/sunos-x64": "npm:0.25.1"
-    "@esbuild/win32-arm64": "npm:0.25.1"
-    "@esbuild/win32-ia32": "npm:0.25.1"
-    "@esbuild/win32-x64": "npm:0.25.1"
+    "@esbuild/aix-ppc64": "npm:0.25.2"
+    "@esbuild/android-arm": "npm:0.25.2"
+    "@esbuild/android-arm64": "npm:0.25.2"
+    "@esbuild/android-x64": "npm:0.25.2"
+    "@esbuild/darwin-arm64": "npm:0.25.2"
+    "@esbuild/darwin-x64": "npm:0.25.2"
+    "@esbuild/freebsd-arm64": "npm:0.25.2"
+    "@esbuild/freebsd-x64": "npm:0.25.2"
+    "@esbuild/linux-arm": "npm:0.25.2"
+    "@esbuild/linux-arm64": "npm:0.25.2"
+    "@esbuild/linux-ia32": "npm:0.25.2"
+    "@esbuild/linux-loong64": "npm:0.25.2"
+    "@esbuild/linux-mips64el": "npm:0.25.2"
+    "@esbuild/linux-ppc64": "npm:0.25.2"
+    "@esbuild/linux-riscv64": "npm:0.25.2"
+    "@esbuild/linux-s390x": "npm:0.25.2"
+    "@esbuild/linux-x64": "npm:0.25.2"
+    "@esbuild/netbsd-arm64": "npm:0.25.2"
+    "@esbuild/netbsd-x64": "npm:0.25.2"
+    "@esbuild/openbsd-arm64": "npm:0.25.2"
+    "@esbuild/openbsd-x64": "npm:0.25.2"
+    "@esbuild/sunos-x64": "npm:0.25.2"
+    "@esbuild/win32-arm64": "npm:0.25.2"
+    "@esbuild/win32-ia32": "npm:0.25.2"
+    "@esbuild/win32-x64": "npm:0.25.2"
   dependenciesMeta:
     "@esbuild/aix-ppc64":
       optional: true
@@ -28513,7 +28513,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 10/f1dcaa7c72133c4e130dc7a6c05158d48d7ccf6643efb12fd0c5a9727226a9249d3ea4a4ea34f879c4559819d9dd706a968fd34d5c180ae019ea0403246c5564
+  checksum: 10/3b16423d33e0c05078b38bfe88e1b2125164a6b8dccfd06db8698766e54406f3299de8a74e3ce818f1d5a9c8bf993aa4d27a5716c39580eb80bd92d52ccf34d3
   languageName: node
   linkType: hard
 

From 375423268c7cab6b3d859bbcc1230487a5cb5f02 Mon Sep 17 00:00:00 2001
From: Jack Palmer <jackpalmer@spotify.com>
Date: Wed, 9 Apr 2025 20:26:41 +0100
Subject: [PATCH 21/23] fix: Add missing types to config.d.ts

Signed-off-by: Jack Palmer <jackpalmer@spotify.com>
---
 .../catalog-backend-module-gitlab/config.d.ts | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/plugins/catalog-backend-module-gitlab/config.d.ts b/plugins/catalog-backend-module-gitlab/config.d.ts
index e41de67208..4cc7ebe844 100644
--- a/plugins/catalog-backend-module-gitlab/config.d.ts
+++ b/plugins/catalog-backend-module-gitlab/config.d.ts
@@ -33,11 +33,25 @@ export interface Config {
            * If not defined the whole instance will be scanned.
            */
           group?: string;
+          /**
+           * If true, the provider will only ingest users that are part of the configured group.
+           */
+          restrictUsersToGroup?: boolean;
           /**
            * (Optional) Default branch to read the catalog-info.yaml file.
            * If not set, 'master' will be used.
            */
           branch?: string;
+          /**
+           * If no `branch` is configured and there is no default branch defined at the project as well, this fallback is used
+           * to discover catalog files.
+           * Defaults to: `master`
+           */
+          fallbackBranch?: string;
+          /**
+           * Defaults to `catalog-info.yaml`
+           */
+          catalogFile?: string;
           /**
            * (Optional) The name used for the catalog file.
            * If not set, 'catalog-info.yaml' will be used.
@@ -59,6 +73,26 @@ export interface Config {
            * (Optional) RegExp for the Group Name Pattern
            */
           groupPattern?: string;
+          /**
+           * Specifies the types of group membership relations that should be included when ingesting data.
+           *
+           * The following values are valid:
+           * - 'DIRECT': Direct members of the group. This is the default relation and is always included.
+           * - 'INHERITED': Members inherited from parent (ascendant) groups.
+           * - 'DESCENDANTS': Members from child (descendant) groups.
+           * - 'SHARED_FROM_GROUPS': Members shared from other groups.
+           *
+           * See: https://docs.gitlab.com/ee/api/graphql/reference/#groupmemberrelation
+           *
+           * If the `relations` array is provided in the app-config.yaml, it should contain any combination of the above values.
+           * The 'DIRECT' relation is automatically included and cannot be excluded, even if not specified.
+           */
+          relations?: string[];
+          /**
+           * Enable org ingestion
+           * Defaults to `false`
+           */
+          orgEnabled?: boolean;
           /**
            * (Optional) Skip forked repository
            */
@@ -72,7 +106,12 @@ export interface Config {
            * Should be in the format group/subgroup/repo, with no leading or trailing slashes.
            */
           excludeRepos?: string[];
-
+          /**
+           * If true, users without a seat will be included in the catalog.
+           * Group/Application Access Tokens are still filtered out but you might find service accounts or other users without a seat.
+           * Defaults to `false`
+           */
+          includeUsersWithoutSeat?: boolean;
           /**
            * (Optional) If true, limit by repositories that the current user is a member of.
            * See: https://docs.gitlab.com/api/projects/#list-projects

From 871a8db6c013b2382ff187c7804797a888fbafe7 Mon Sep 17 00:00:00 2001
From: Jack Palmer <jackpalmer@spotify.com>
Date: Wed, 9 Apr 2025 20:29:37 +0100
Subject: [PATCH 22/23] chore: changeset

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

diff --git a/.changeset/wicked-ideas-cross.md b/.changeset/wicked-ideas-cross.md
new file mode 100644
index 0000000000..95c8fed42e
--- /dev/null
+++ b/.changeset/wicked-ideas-cross.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-gitlab': patch
+---
+
+fix: Add missing config options to config declaration file

From f25a5bee448add9c9aedd3ecb7009945d52e24e7 Mon Sep 17 00:00:00 2001
From: Charles de Dreuille <charles.dedreuille@gmail.com>
Date: Thu, 10 Apr 2025 08:51:52 +0200
Subject: [PATCH 23/23] Add gray scale

Signed-off-by: Charles de Dreuille <charles.dedreuille@gmail.com>
---
 .changeset/tricky-loops-repair.md |  5 +++
 packages/canon/css/core.css       | 48 ++++++++++++++++++---------
 packages/canon/css/styles.css     | 48 ++++++++++++++++++---------
 packages/canon/src/css/core.css   | 54 ++++++++++++++++++++++---------
 4 files changed, 110 insertions(+), 45 deletions(-)
 create mode 100644 .changeset/tricky-loops-repair.md

diff --git a/.changeset/tricky-loops-repair.md b/.changeset/tricky-loops-repair.md
new file mode 100644
index 0000000000..9508c55f86
--- /dev/null
+++ b/.changeset/tricky-loops-repair.md
@@ -0,0 +1,5 @@
+---
+'@backstage/canon': patch
+---
+
+Added a new gray scale for Canon for both light and dark theme.
diff --git a/packages/canon/css/core.css b/packages/canon/css/core.css
index b4583ea35d..ffdde83d72 100644
--- a/packages/canon/css/core.css
+++ b/packages/canon/css/core.css
@@ -9127,9 +9127,19 @@
   --canon-radius-5: calc(1rem);
   --canon-radius-6: calc(1.25rem);
   --canon-radius-full: 9999px;
-  --canon-bg: #f8f8f8;
-  --canon-bg-surface-1: #fff;
-  --canon-bg-surface-2: #ececec;
+  --canon-black: #000;
+  --canon-white: #fff;
+  --canon-gray-1: #f8f8f8;
+  --canon-gray-2: #ececec;
+  --canon-gray-3: #d9d9d9;
+  --canon-gray-4: #c1c1c1;
+  --canon-gray-5: #9e9e9e;
+  --canon-gray-6: #8c8c8c;
+  --canon-gray-7: #757575;
+  --canon-gray-8: #595959;
+  --canon-bg: var(--canon-gray-1);
+  --canon-bg-surface-1: var(--canon-white);
+  --canon-bg-surface-2: var(--canon-gray-2);
   --canon-bg-solid: #1f5493;
   --canon-bg-solid-hover: #163a66;
   --canon-bg-solid-pressed: #0f2b4e;
@@ -9141,15 +9151,15 @@
   --canon-bg-danger: #feebe7;
   --canon-bg-warning: #fff2b2;
   --canon-bg-success: #e6f6eb;
-  --canon-fg-primary: #000;
-  --canon-fg-secondary: #757575;
+  --canon-fg-primary: var(--canon-black);
+  --canon-fg-secondary: var(--canon-gray-7);
   --canon-fg-link: #1f5493;
   --canon-fg-link-hover: #1f2d5c;
   --canon-fg-disabled: #9e9e9e;
-  --canon-fg-solid: #fff;
+  --canon-fg-solid: var(--canon-white);
   --canon-fg-solid-disabled: #9c9c9c;
   --canon-fg-tint: #1f5493;
-  --canon-fg-tint-disabled: #9e9e9e;
+  --canon-fg-tint-disabled: var(--canon-gray-5);
   --canon-fg-danger: #e22b2b;
   --canon-fg-warning: #e36d05;
   --canon-fg-success: #1db954;
@@ -9166,9 +9176,17 @@
 }
 
 [data-theme="dark"] {
-  --canon-bg: #000;
-  --canon-bg-surface-1: #191919;
-  --canon-bg-surface-2: #242424;
+  --canon-gray-1: #191919;
+  --canon-gray-2: #242424;
+  --canon-gray-3: #373737;
+  --canon-gray-4: #464646;
+  --canon-gray-5: #575757;
+  --canon-gray-6: #7b7b7b;
+  --canon-gray-7: #9e9e9e;
+  --canon-gray-8: #b4b4b4;
+  --canon-bg: var(--canon-black);
+  --canon-bg-surface-1: var(--canon-gray-1);
+  --canon-bg-surface-2: var(--canon-gray-2);
   --canon-bg-solid: #9cc9ff;
   --canon-bg-solid-hover: #83b9fd;
   --canon-bg-solid-pressed: #83b9fd;
@@ -9180,15 +9198,15 @@
   --canon-bg-danger: #3b1219;
   --canon-bg-warning: #302008;
   --canon-bg-success: #132d21;
-  --canon-fg-primary: #fff;
-  --canon-fg-secondary: #9e9e9e;
+  --canon-fg-primary: var(--canon-white);
+  --canon-fg-secondary: var(--canon-gray-7);
   --canon-fg-link: #9cc9ff;
   --canon-fg-link-hover: #7eb5f7;
-  --canon-fg-disabled: #9e9e9e;
+  --canon-fg-disabled: var(--canon-gray-7);
   --canon-fg-solid: #101821;
-  --canon-fg-solid-disabled: #575757;
+  --canon-fg-solid-disabled: var(--canon-gray-5);
   --canon-fg-tint: #9cc9ff;
-  --canon-fg-tint-disabled: #575757;
+  --canon-fg-tint-disabled: var(--canon-gray-5);
   --canon-fg-danger: #e22b2b;
   --canon-fg-warning: #e36d05;
   --canon-fg-success: #1db954;
diff --git a/packages/canon/css/styles.css b/packages/canon/css/styles.css
index 681d3027a9..1c431ad54c 100644
--- a/packages/canon/css/styles.css
+++ b/packages/canon/css/styles.css
@@ -9127,9 +9127,19 @@
   --canon-radius-5: calc(1rem);
   --canon-radius-6: calc(1.25rem);
   --canon-radius-full: 9999px;
-  --canon-bg: #f8f8f8;
-  --canon-bg-surface-1: #fff;
-  --canon-bg-surface-2: #ececec;
+  --canon-black: #000;
+  --canon-white: #fff;
+  --canon-gray-1: #f8f8f8;
+  --canon-gray-2: #ececec;
+  --canon-gray-3: #d9d9d9;
+  --canon-gray-4: #c1c1c1;
+  --canon-gray-5: #9e9e9e;
+  --canon-gray-6: #8c8c8c;
+  --canon-gray-7: #757575;
+  --canon-gray-8: #595959;
+  --canon-bg: var(--canon-gray-1);
+  --canon-bg-surface-1: var(--canon-white);
+  --canon-bg-surface-2: var(--canon-gray-2);
   --canon-bg-solid: #1f5493;
   --canon-bg-solid-hover: #163a66;
   --canon-bg-solid-pressed: #0f2b4e;
@@ -9141,15 +9151,15 @@
   --canon-bg-danger: #feebe7;
   --canon-bg-warning: #fff2b2;
   --canon-bg-success: #e6f6eb;
-  --canon-fg-primary: #000;
-  --canon-fg-secondary: #757575;
+  --canon-fg-primary: var(--canon-black);
+  --canon-fg-secondary: var(--canon-gray-7);
   --canon-fg-link: #1f5493;
   --canon-fg-link-hover: #1f2d5c;
   --canon-fg-disabled: #9e9e9e;
-  --canon-fg-solid: #fff;
+  --canon-fg-solid: var(--canon-white);
   --canon-fg-solid-disabled: #9c9c9c;
   --canon-fg-tint: #1f5493;
-  --canon-fg-tint-disabled: #9e9e9e;
+  --canon-fg-tint-disabled: var(--canon-gray-5);
   --canon-fg-danger: #e22b2b;
   --canon-fg-warning: #e36d05;
   --canon-fg-success: #1db954;
@@ -9166,9 +9176,17 @@
 }
 
 [data-theme="dark"] {
-  --canon-bg: #000;
-  --canon-bg-surface-1: #191919;
-  --canon-bg-surface-2: #242424;
+  --canon-gray-1: #191919;
+  --canon-gray-2: #242424;
+  --canon-gray-3: #373737;
+  --canon-gray-4: #464646;
+  --canon-gray-5: #575757;
+  --canon-gray-6: #7b7b7b;
+  --canon-gray-7: #9e9e9e;
+  --canon-gray-8: #b4b4b4;
+  --canon-bg: var(--canon-black);
+  --canon-bg-surface-1: var(--canon-gray-1);
+  --canon-bg-surface-2: var(--canon-gray-2);
   --canon-bg-solid: #9cc9ff;
   --canon-bg-solid-hover: #83b9fd;
   --canon-bg-solid-pressed: #83b9fd;
@@ -9180,15 +9198,15 @@
   --canon-bg-danger: #3b1219;
   --canon-bg-warning: #302008;
   --canon-bg-success: #132d21;
-  --canon-fg-primary: #fff;
-  --canon-fg-secondary: #9e9e9e;
+  --canon-fg-primary: var(--canon-white);
+  --canon-fg-secondary: var(--canon-gray-7);
   --canon-fg-link: #9cc9ff;
   --canon-fg-link-hover: #7eb5f7;
-  --canon-fg-disabled: #9e9e9e;
+  --canon-fg-disabled: var(--canon-gray-7);
   --canon-fg-solid: #101821;
-  --canon-fg-solid-disabled: #575757;
+  --canon-fg-solid-disabled: var(--canon-gray-5);
   --canon-fg-tint: #9cc9ff;
-  --canon-fg-tint-disabled: #575757;
+  --canon-fg-tint-disabled: var(--canon-gray-5);
   --canon-fg-danger: #e22b2b;
   --canon-fg-warning: #e36d05;
   --canon-fg-success: #1db954;
diff --git a/packages/canon/src/css/core.css b/packages/canon/src/css/core.css
index d0686e94f7..260140af70 100644
--- a/packages/canon/src/css/core.css
+++ b/packages/canon/src/css/core.css
@@ -75,10 +75,24 @@
   --canon-radius-6: calc(1.25rem);
   --canon-radius-full: 9999px;
 
+  /* Base Colors */
+  --canon-black: #000000;
+  --canon-white: #ffffff;
+
+  /* Gray scale */
+  --canon-gray-1: #f8f8f8;
+  --canon-gray-2: #ececec;
+  --canon-gray-3: #d9d9d9;
+  --canon-gray-4: #c1c1c1;
+  --canon-gray-5: #9e9e9e;
+  --canon-gray-6: #8c8c8c;
+  --canon-gray-7: #757575;
+  --canon-gray-8: #595959;
+
   /* Background Colors */
-  --canon-bg: #f8f8f8;
-  --canon-bg-surface-1: #fff;
-  --canon-bg-surface-2: #ececec;
+  --canon-bg: var(--canon-gray-1);
+  --canon-bg-surface-1: var(--canon-white);
+  --canon-bg-surface-2: var(--canon-gray-2);
   --canon-bg-solid: #1f5493;
   --canon-bg-solid-hover: #163a66;
   --canon-bg-solid-pressed: #0f2b4e;
@@ -92,15 +106,15 @@
   --canon-bg-success: #e6f6eb;
 
   /* Foreground Colors */
-  --canon-fg-primary: #000000;
-  --canon-fg-secondary: #757575;
+  --canon-fg-primary: var(--canon-black);
+  --canon-fg-secondary: var(--canon-gray-7);
   --canon-fg-link: #1f5493;
   --canon-fg-link-hover: #1f2d5c;
   --canon-fg-disabled: #9e9e9e;
-  --canon-fg-solid: #ffffff;
+  --canon-fg-solid: var(--canon-white);
   --canon-fg-solid-disabled: #9c9c9c;
   --canon-fg-tint: #1f5493;
-  --canon-fg-tint-disabled: #9e9e9e;
+  --canon-fg-tint-disabled: var(--canon-gray-5);
   --canon-fg-danger: #e22b2b;
   --canon-fg-warning: #e36d05;
   --canon-fg-success: #1db954;
@@ -122,10 +136,20 @@
 
 /* Dark theme tokens */
 [data-theme='dark'] {
+  /* Gray scale */
+  --canon-gray-1: #191919;
+  --canon-gray-2: #242424;
+  --canon-gray-3: #373737;
+  --canon-gray-4: #464646;
+  --canon-gray-5: #575757;
+  --canon-gray-6: #7b7b7b;
+  --canon-gray-7: #9e9e9e;
+  --canon-gray-8: #b4b4b4;
+
   /* Background Colors */
-  --canon-bg: #000000;
-  --canon-bg-surface-1: #191919;
-  --canon-bg-surface-2: #242424;
+  --canon-bg: var(--canon-black);
+  --canon-bg-surface-1: var(--canon-gray-1);
+  --canon-bg-surface-2: var(--canon-gray-2);
   --canon-bg-solid: #9cc9ff;
   --canon-bg-solid-hover: #83b9fd;
   --canon-bg-solid-pressed: #83b9fd;
@@ -139,15 +163,15 @@
   --canon-bg-success: #132d21;
 
   /* Foreground Colors */
-  --canon-fg-primary: #ffffff;
-  --canon-fg-secondary: #9e9e9e;
+  --canon-fg-primary: var(--canon-white);
+  --canon-fg-secondary: var(--canon-gray-7);
   --canon-fg-link: #9cc9ff;
   --canon-fg-link-hover: #7eb5f7;
-  --canon-fg-disabled: #9e9e9e;
+  --canon-fg-disabled: var(--canon-gray-7);
   --canon-fg-solid: #101821;
-  --canon-fg-solid-disabled: #575757;
+  --canon-fg-solid-disabled: var(--canon-gray-5);
   --canon-fg-tint: #9cc9ff;
-  --canon-fg-tint-disabled: #575757;
+  --canon-fg-tint-disabled: var(--canon-gray-5);
   --canon-fg-danger: #e22b2b;
   --canon-fg-warning: #e36d05;
   --canon-fg-success: #1db954;