Better handle resolving dependencies when there are conflicts

Author: ericallam

packages/cli-v3/package.json

@@ -96,7 +96,7 @@
     "dotenv": "^16.4.4",
     "esbuild": "^0.19.11",
     "evt": "^2.4.13",
-    "execa": "^8.0.0",
+    "execa": "^9.1.0",
     "find-up": "^7.0.0",
     "glob": "^10.3.10",
     "gradient-string": "^2.0.2",

packages/cli-v3/src/utilities/javascriptProject.ts

@@ -1,4 +1,4 @@
-import { $ } from "execa";
+import { $, ExecaError } from "execa";
 import { join } from "node:path";
 import { readJSONFileSync } from "./fileSystem";
 import { logger } from "./logger";
@@ -269,8 +269,7 @@ class PNPMCommands implements PackageManagerCommands {
     packageNames: string[],
     options: PackageManagerOptions
   ): Promise<Record<string, string>> {
-    const { stdout } = await $({ cwd: options.cwd })`${this.cmd} list ${packageNames} -r --json`;
-    const result = JSON.parse(stdout) as PnpmList;
+    const result = await this.#listDependencies(packageNames, options);
 
     logger.debug(`Resolving ${packageNames.join(" ")} version using ${this.name}`);
 
@@ -289,6 +288,21 @@ class PNPMCommands implements PackageManagerCommands {
 
     return results;
   }
+
+  async #listDependencies(packageNames: string[], options: PackageManagerOptions) {
+    const childProcess = await $({
+      cwd: options.cwd,
+      reject: false,
+    })`${this.cmd} list ${packageNames} -r --json`;
+
+    if (childProcess.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess.stderr,
+      });
+    }
+
+    return JSON.parse(childProcess.stdout) as PnpmList;
+  }
 }
 
 type NpmDependency = {
@@ -331,8 +345,7 @@ class NPMCommands implements PackageManagerCommands {
     packageNames: string[],
     options: PackageManagerOptions
   ): Promise<Record<string, string>> {
-    const { stdout } = await $({ cwd: options.cwd })`${this.cmd} list ${packageNames} --json`;
-    const output = JSON.parse(stdout) as NpmListOutput;
+    const output = await this.#listDependencies(packageNames, options);
 
     logger.debug(`Resolving ${packageNames.join(" ")} version using ${this.name}`, { output });
 
@@ -349,6 +362,21 @@ class NPMCommands implements PackageManagerCommands {
     return results;
   }
 
+  async #listDependencies(packageNames: string[], options: PackageManagerOptions) {
+    const childProcess = await $({
+      cwd: options.cwd,
+      reject: false,
+    })`${this.cmd} list ${packageNames} --json`;
+
+    if (childProcess.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess.stderr,
+      });
+    }
+
+    return JSON.parse(childProcess.stdout) as NpmListOutput;
+  }
+
   #recursivelySearchDependencies(
     dependencies: Record<string, NpmDependency>,
     packageName: string
@@ -404,7 +432,7 @@ class YarnCommands implements PackageManagerCommands {
     packageNames: string[],
     options: PackageManagerOptions
   ): Promise<Record<string, string>> {
-    const { stdout } = await $({ cwd: options.cwd })`${this.cmd} info ${packageNames} --json`;
+    const stdout = await this.#listDependencies(packageNames, options);
 
     const lines = stdout.split("\n");
 
@@ -425,6 +453,21 @@ class YarnCommands implements PackageManagerCommands {
     return results;
   }
 
+  async #listDependencies(packageNames: string[], options: PackageManagerOptions) {
+    const childProcess = await $({
+      cwd: options.cwd,
+      reject: false,
+    })`${this.cmd} info ${packageNames} --json`;
+
+    if (childProcess.failed) {
+      logger.debug("Failed to list dependencies, using stdout anyway...", {
+        error: childProcess.stderr,
+      });
+    }
+
+    return childProcess.stdout;
+  }
+
   // The "value" when doing yarn info is formatted like this:
   // "package-name@npm:version" or "package-name@workspace:version"
   // This function will parse the value into just the package name.