Merge remote-tracking branch 'origin' into migrate-to-msw

* origin:
  fix: ts
  fix: forwardRef to SidebarItem
  fix(cli): one more await in the test
  backend-common: make loadBackendConfig return config directly and log all resolved app-configs

plugins/proxy-backend/src/service/router.test.ts

@@ -16,7 +16,6 @@
 
 import { buildMiddleware, createRouter } from './router';
 import * as winston from 'winston';
-import { ConfigReader } from '@backstage/config';
 import {
   loadBackendConfig,
   SingleHostDiscovery,
@@ -42,7 +41,7 @@ const mockCreateProxyMiddleware = createProxyMiddleware as jest.MockedFunction<
 describe('createRouter', () => {
   it('works', async () => {
     const logger = winston.createLogger();
-    const config = ConfigReader.fromConfigs(await loadBackendConfig());
+    const config = await loadBackendConfig({ logger });
     const discovery = SingleHostDiscovery.fromConfig(config);
     const router = await createRouter({
       config,

plugins/proxy-backend/src/service/standaloneServer.ts

@@ -22,7 +22,6 @@ import {
 import { Server } from 'http';
 import { Logger } from 'winston';
 import { createRouter } from './router';
-import { ConfigReader } from '@backstage/config';
 
 export interface ServerOptions {
   port: number;
@@ -37,7 +36,7 @@ export async function startStandaloneServer(
 
   logger.debug('Creating application...');
 
-  const config = ConfigReader.fromConfigs(await loadBackendConfig());
+  const config = await loadBackendConfig({ logger });
   const discovery = SingleHostDiscovery.fromConfig(config);
   const router = await createRouter({
     config,