packages/cli: pass config reader to bundler

packages/cli/src/commands/app/build.ts

@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
-import { buildBundle } from '../../lib/bundler';
 import { Command } from 'commander';
 import { loadConfig } from '@backstage/config-loader';
+import { ConfigReader } from '@backstage/config';
+import { buildBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
+  const appConfigs = await loadConfig();
   await buildBundle({
     entry: 'src/index',
     statsJsonEnabled: cmd.stats,
-    appConfig: await loadConfig(),
+    config: ConfigReader.fromConfigs(appConfigs),
+    appConfigs,
   });
 };

packages/cli/src/commands/app/serve.ts

@@ -15,14 +15,17 @@
  */
 
 import { Command } from 'commander';
-import { serveBundle } from '../../lib/bundler';
 import { loadConfig } from '@backstage/config-loader';
+import { ConfigReader } from '@backstage/config';
+import { serveBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
+  const appConfigs = await loadConfig();
   const waitForExit = await serveBundle({
     entry: 'src/index',
     checksEnabled: cmd.check,
-    appConfig: await loadConfig(),
+    config: ConfigReader.fromConfigs(appConfigs),
+    appConfigs,
   });
 
   await waitForExit();

packages/cli/src/commands/plugin/serve.ts

@@ -15,14 +15,17 @@
  */
 
 import { Command } from 'commander';
-import { serveBundle } from '../../lib/bundler';
 import { loadConfig } from '@backstage/config-loader';
+import { ConfigReader } from '@backstage/config';
+import { serveBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
+  const appConfigs = await loadConfig();
   const waitForExit = await serveBundle({
     entry: 'dev/index',
     checksEnabled: cmd.check,
-    appConfig: await loadConfig(),
+    config: ConfigReader.fromConfigs(appConfigs),
+    appConfigs,
   });
 
   await waitForExit();

packages/cli/src/lib/bundler/types.ts

@@ -14,21 +14,24 @@
  * limitations under the License.
  */
 
-import { AppConfig } from '@backstage/config';
+import { AppConfig, Config } from '@backstage/config';
 import { BundlingPathsOptions } from './paths';
 
 export type BundlingOptions = {
   checksEnabled: boolean;
   isDev: boolean;
-  appConfig: AppConfig[];
+  config: Config;
+  appConfigs: AppConfig[];
 };
 
 export type ServeOptions = BundlingPathsOptions & {
   checksEnabled: boolean;
-  appConfig: AppConfig[];
+  config: Config;
+  appConfigs: AppConfig[];
 };
 
 export type BuildOptions = BundlingPathsOptions & {
   statsJsonEnabled: boolean;
-  appConfig: AppConfig[];
+  config: Config;
+  appConfigs: AppConfig[];
 };