From 8a0ccc1bcd179e682ac66f85fbbe0619da685010 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 4 Jun 2020 11:00:08 +0200
Subject: [PATCH] packages/cli: pass config reader to bundler

---
 packages/cli/src/commands/app/build.ts    |  7 +++++--
 packages/cli/src/commands/app/serve.ts    |  7 +++++--
 packages/cli/src/commands/plugin/serve.ts |  7 +++++--
 packages/cli/src/lib/bundler/types.ts     | 11 +++++++----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/commands/app/build.ts b/packages/cli/src/commands/app/build.ts
index d09b2abcdd..4ecf54f532 100644
--- a/packages/cli/src/commands/app/build.ts
+++ b/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,
   });
 };
diff --git a/packages/cli/src/commands/app/serve.ts b/packages/cli/src/commands/app/serve.ts
index 5758aa2bf2..023a3a4663 100644
--- a/packages/cli/src/commands/app/serve.ts
+++ b/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();
diff --git a/packages/cli/src/commands/plugin/serve.ts b/packages/cli/src/commands/plugin/serve.ts
index 9cc6cf55d0..57b939fa63 100644
--- a/packages/cli/src/commands/plugin/serve.ts
+++ b/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();
diff --git a/packages/cli/src/lib/bundler/types.ts b/packages/cli/src/lib/bundler/types.ts
index 9ebd668fea..332a105182 100644
--- a/packages/cli/src/lib/bundler/types.ts
+++ b/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[];
 };