Merge pull request #1860 from spotify/rugvip/config

config,config-loader: add support for suffixed config files and multiple roots

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

@@ -21,7 +21,10 @@ import { paths } from '../../lib/paths';
 import { buildBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
-  const appConfigs = await loadConfig({ rootPath: paths.targetRoot });
+  const appConfigs = await loadConfig({
+    env: 'production',
+    rootPaths: [paths.targetRoot, paths.targetDir],
+  });
   await buildBundle({
     entry: 'src/index',
     statsJsonEnabled: cmd.stats,

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

@@ -21,7 +21,10 @@ import { paths } from '../../lib/paths';
 import { serveBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
-  const appConfigs = await loadConfig({ rootPath: paths.targetRoot });
+  const appConfigs = await loadConfig({
+    env: 'development',
+    rootPaths: [paths.targetRoot, paths.targetDir],
+  });
   const waitForExit = await serveBundle({
     entry: 'src/index',
     checksEnabled: cmd.check,

packages/cli/src/commands/backend/dev.ts

@@ -21,7 +21,10 @@ import { paths } from '../../lib/paths';
 import { serveBackend } from '../../lib/bundler/backend';
 
 export default async (cmd: Command) => {
-  const appConfigs = await loadConfig({ rootPath: paths.targetRoot });
+  const appConfigs = await loadConfig({
+    env: 'development',
+    rootPaths: [paths.targetRoot, paths.targetDir],
+  });
   const waitForExit = await serveBackend({
     entry: 'src/index',
     checksEnabled: cmd.check,

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

@@ -21,7 +21,10 @@ import { paths } from '../../lib/paths';
 import { buildBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
-  const appConfigs = await loadConfig({ rootPath: paths.targetRoot });
+  const appConfigs = await loadConfig({
+    env: 'production',
+    rootPaths: [paths.targetRoot, paths.targetDir],
+  });
   await buildBundle({
     entry: 'dev/index',
     statsJsonEnabled: cmd.stats,

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

@@ -21,7 +21,10 @@ import { paths } from '../../lib/paths';
 import { serveBundle } from '../../lib/bundler';
 
 export default async (cmd: Command) => {
-  const appConfigs = await loadConfig({ rootPath: paths.targetRoot });
+  const appConfigs = await loadConfig({
+    env: 'development',
+    rootPaths: [paths.targetRoot, paths.targetDir],
+  });
   const waitForExit = await serveBundle({
     entry: 'dev/index',
     checksEnabled: cmd.check,