fix(cli): find monorepo root before trying to search workspace for pl…

…ugins
ionic-team · Oct 29, 2024 · d926beb · d926beb
1 parent 05c66b4
commit d926beb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/cli/src/config.ts b/cli/src/config.ts
@@ -10,7 +10,7 @@ import { fatal, isFatal } from './errors';
 import { logger } from './log';
 import { tryFn } from './util/fn';
 import { formatJSObject } from './util/js';
-import { findNXMonorepoRoot, isNXMonorepo } from './util/monorepotools';
+import { findMonorepoRoot, findNXMonorepoRoot, isMonorepo, isNXMonorepo } from './util/monorepotools';
 import { requireTS, resolveNode } from './util/node';
 import { lazy } from './util/promise';
 import { getCommandOutput } from './util/subprocess';
@@ -40,10 +40,29 @@ export async function loadConfig(): Promise<Config> {
     return {};
   })();
 
+  const workspacesSetup = await (async (): Promise<Config['app']['workspaces'] | undefined> => {
+    if (isMonorepo(appRootDir) && conf.extConfig.workspaces === 'npm') {
+      const { fileType, path: rootOfMonorepo } = findMonorepoRoot(appRootDir);
+      if (fileType === 'yaml') {
+        return undefined;
+      }
+      const pkgJSONOfMonorepoRoot: { workspaces: string[] } | null = await tryFn(
+        readJSON,
+        resolve(rootOfMonorepo, 'package.json'),
+      );
+      const workspaces = pkgJSONOfMonorepoRoot?.workspaces ?? [];
+      return {
+        type: conf.extConfig.workspaces,
+        workspaceDirs: workspaces,
+        workspaceRoot: rootOfMonorepo,
+      };
+    }
+    return undefined;
+  })();
+
   const appId = conf.extConfig.appId ?? '';
   const appName = conf.extConfig.appName ?? '';
   const webDir = conf.extConfig.webDir ?? 'www';
-  const workspaces = conf.extConfig.workspaces;
   const cli = await loadCLIConfig(cliRootDir);
 
   const config: Config = {
@@ -62,7 +81,7 @@ export async function loadConfig(): Promise<Config> {
         version: '1.0.0',
         ...depsForNx,
       },
-      workspaces,
+      workspaces: workspacesSetup,
       ...conf,
     },
   };

diff --git a/cli/src/definitions.ts b/cli/src/definitions.ts
@@ -63,7 +63,9 @@ export interface AppConfig {
   readonly extConfigName: string;
   readonly extConfigFilePath: string;
   readonly extConfig: ExternalConfig;
-  readonly workspaces: 'npm' | undefined;
+  readonly workspaces:
+    | { type: 'npm'; workspaceDirs: string[]; workspaceRoot: string }
+    | undefined;
 }
 
 export interface AndroidConfig extends PlatformConfig {

diff --git a/cli/src/plugin.ts b/cli/src/plugin.ts
@@ -54,10 +54,11 @@ export function getIncludedPluginPackages(config: Config, platform: string): rea
   }
 }
 export async function getPlugins(config: Config, platform: string): Promise<Plugin[]> {
-  if (config.app.workspaces === 'npm' && config.app.package.workspaces !== undefined) {
+  if (config.app.workspaces?.type === 'npm') {
+    const { workspaceDirs, workspaceRoot } = config.app.workspaces;
     const workspacePackages = await mapWorkspaces({
-      cwd: config.app.rootDir,
-      pkg: { workspaces: config.app.package.workspaces },
+      cwd: workspaceRoot,
+      pkg: { workspaces: workspaceDirs },
     });
     const resolvedWorkspacePackages = await Promise.all(
       Array.from(workspacePackages.entries()).map(async ([name, path]) => {