fix: other fixes to make CLI more robust.

Signed-off-by: David Festal <[email protected]>
janus-idp · Nov 22, 2023 · 4589757 · 4589757
1 parent 3f5de34
commit 4589757
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 31 deletions.
diff --git a/packages/cli/src/commands/export-dynamic-plugin/backend.ts b/packages/cli/src/commands/export-dynamic-plugin/backend.ts
@@ -15,6 +15,8 @@
  */
 
 import { BackstagePackageJson, PackageRoleInfo } from '@backstage/cli-node';
+import { ConfigReader } from '@backstage/config';
+import { loadConfig } from '@backstage/config-loader';
 
 import { getPackages } from '@manypkg/get-packages';
 import { OptionValues } from 'commander';
@@ -29,7 +31,6 @@ import { Output } from '../../lib/builder';
 import { makeRollupConfigs } from '../../lib/builder/config';
 import { embedModules } from '../../lib/builder/embedPlugin';
 import { buildPackage, formatErrorMessage } from '../../lib/builder/packager';
-import { loadCliConfig } from '../../lib/config';
 import { readEntryPoints } from '../../lib/entryPoints';
 import { productionPack } from '../../lib/packager/productionPack';
 import { paths } from '../../lib/paths';
@@ -357,35 +358,38 @@ export async function backend(
   });
 
   if (opts.dev) {
-    if (opts.dev) {
-      const { fullConfig } = await loadCliConfig({ args: [] });
-      const dynamicPlugins = fullConfig.getOptional('dynamicPlugins');
-      if (
-        typeof dynamicPlugins === 'object' &&
-        dynamicPlugins !== null &&
-        'rootDirectory' in dynamicPlugins &&
-        typeof dynamicPlugins.rootDirectory === 'string'
-      ) {
-        await fs.ensureSymlink(
-          paths.resolveTarget('src'),
-          path.resolve(target, 'src'),
-          'dir',
-        );
-        const dynamicPluginsRootPath = path.isAbsolute(
-          dynamicPlugins.rootDirectory,
-        )
-          ? dynamicPlugins.rootDirectory
-          : paths.resolveTargetRoot(dynamicPlugins.rootDirectory);
-        await fs.ensureSymlink(
-          target,
-          path.resolve(dynamicPluginsRootPath, basename(paths.targetDir)),
-          'dir',
-        );
-      } else {
-        throw new Error(
-          `'dynamicPlugins.rootDirectory' should be configured in the app config in order to use the --dev option.`,
-        );
-      }
+    const appConfigs = await loadConfig({
+      configRoot: paths.targetRoot,
+      configTargets: [],
+    });
+    const fullConfig = ConfigReader.fromConfigs(appConfigs.appConfigs);
+
+    const dynamicPlugins = fullConfig.getOptional('dynamicPlugins');
+    if (
+      typeof dynamicPlugins === 'object' &&
+      dynamicPlugins !== null &&
+      'rootDirectory' in dynamicPlugins &&
+      typeof dynamicPlugins.rootDirectory === 'string'
+    ) {
+      await fs.ensureSymlink(
+        paths.resolveTarget('src'),
+        path.resolve(target, 'src'),
+        'dir',
+      );
+      const dynamicPluginsRootPath = path.isAbsolute(
+        dynamicPlugins.rootDirectory,
+      )
+        ? dynamicPlugins.rootDirectory
+        : paths.resolveTargetRoot(dynamicPlugins.rootDirectory);
+      await fs.ensureSymlink(
+        target,
+        path.resolve(dynamicPluginsRootPath, basename(paths.targetDir)),
+        'dir',
+      );
+    } else {
+      throw new Error(
+        `'dynamicPlugins.rootDirectory' should be configured in the app config in order to use the --dev option.`,
+      );
     }
   }
 }
diff --git a/packages/cli/src/lib/config.ts b/packages/cli/src/lib/config.ts
@@ -56,7 +56,10 @@ export async function loadCliConfig(options: Options) {
       localPackageNames = Array.from(
         graph.collectPackageNames([options.fromPackage], node => {
           // Workaround for Backstage main repo only, since the CLI has some artificial devDependencies
-          if (node.name === '@janus-idp/cli') {
+          if (
+            node.name === '@janus-idp/cli' ||
+            node.name === '@backstage/cli'
+          ) {
             return undefined;
           }
           return node.localDependencies.keys();