fix: wrong info command in yarn >1 (#255)

Co-authored-by: nathanhleung <nathanhleung@users.noreply.github.com>

Author: nathanhleung

src/cli.js

@@ -22,13 +22,13 @@ const { name, version } = pkg;
  * parse the package string.
  */
 function printPackageFormatError() {
-  console.log(
+  console.error(
     `${C.errorText} Please specify the package to install with peerDeps in the form of \`package\` or \`package@n.n.n\``
   );
-  console.log(
+  console.error(
     `${C.errorText} At this time you must provide the full semver version of the package.`
   );
-  console.log(
+  console.error(
     `${C.errorText} Alternatively, omit it to automatically install the latest version of the package.`
   );
 }
@@ -64,7 +64,7 @@ console.log(clc.bold(`${name} v${version}`));
 
 // Make sure we're installing at least one package
 if (program.args.length === 0) {
-  console.log(
+  console.error(
     `${C.errorText} Please specify a package to install with peerDeps.`
   );
   // An exit code of "9" indicates an invalid argument
@@ -75,7 +75,7 @@ if (program.args.length === 0) {
 
 // Make sure we're installing no more than one package
 if (program.args.length > 1) {
-  console.log(
+  console.error(
     `${C.errorText} Too many arguments. Please specify ONE package at a time to install with peerDeps. Alternatively, pass extra arguments with --extra-args "<extra_args>".`
   );
   // An exit code of "9" indicates an invalid argument
@@ -99,7 +99,7 @@ if (!packageName) {
 let packageManager = C.npm; // Default package manager is npm
 
 if (program.yarn && program.pnpm) {
-  console.log(
+  console.error(
     `${C.errorText} Option --yarn and --pnpm cannot be used concurrently.`
   );
   process.exit(9);
@@ -113,7 +113,7 @@ if (program.pnpm) {
 
 // Yarn does not allow silent install of dependencies
 if (program.yarn && program.silent) {
-  console.log(`${C.errorText} Option --silent cannot be used with --yarn.`);
+  console.error(`${C.errorText} Option --silent cannot be used with --yarn.`);
   process.exit(9);
 }
 
@@ -122,15 +122,15 @@ const devMode = program.dev || program.D;
 // since --dev means it should be saved
 // as a devDependency
 if (devMode && program.silent) {
-  console.log(`${C.errorText} Option --silent cannot be used with --dev.`);
+  console.error(`${C.errorText} Option --silent cannot be used with --dev.`);
   process.exit(9);
 }
 
 // Dev option can't be used with global,
 // since --dev means it should be saved
 // as a devDependency (locally)
 if (devMode && program.silent) {
-  console.log(`${C.errorText} Option --dev cannot be used with --global.`);
+  console.error(`${C.errorText} Option --dev cannot be used with --global.`);
   process.exit(9);
 }
 
@@ -172,7 +172,7 @@ if (hasYarn() && packageManager !== C.yarn && !program.silent) {
     })
     .catch(err => {
       if (err) {
-        console.log(`${C.errorText} ${err.message}`);
+        console.error(`${C.errorText} ${err.message}`);
         process.exit(1);
       }
     });
@@ -190,11 +190,10 @@ if (hasYarn() && packageManager !== C.yarn && !program.silent) {
  */
 function installCb(err) {
   if (err) {
-    console.log(`${C.errorText} ${err.message}`);
+    console.error(`${C.errorText} ${err.message}`);
     process.exit(1);
   }
-  let successMessage = `${C.successText} ${packageName}
-  and its peerDeps were installed successfully.`;
+  let successMessage = `${C.successText} ${packageName} and its peerDeps were installed successfully.`;
   if (program.onlyPeers) {
     successMessage = `${C.successText} The peerDeps of ${packageName} were installed successfully.`;
   }

src/install-peerdeps.js

@@ -48,22 +48,38 @@ const spawnCommand = (command, args) => {
       }
     );
     cmdProcess.stdout.on("data", chunk => {
-      stdout += chunk;
+      if (chunk instanceof Buffer) {
+        stdout += chunk.toString("utf8");
+      } else {
+        stdout += chunk;
+      }
     });
     cmdProcess.stderr.on("data", chunk => {
-      stderr += chunk;
+      if (chunk instanceof Buffer) {
+        stderr += chunk.toString("utf8");
+      } else {
+        stderr += chunk;
+      }
     });
     cmdProcess.on("error", reject);
     cmdProcess.on("exit", code => {
       if (code === 0) {
         resolve(stdout);
       } else {
-        reject(stderr);
+        reject(new Error(`${[stdout, stderr].filter(Boolean).join("\n\n")}`));
       }
     });
   });
 };
 
+/**
+ * Gets the current Yarn version
+ * @returns {string} - The current Yarn version
+ */
+function getYarnVersion() {
+  return spawnCommand("yarn", ["--version"]).then(it => it.trim());
+}
+
 /**
  * Parse a registry manifest to get the best matching version
  * @param {Object} requestInfo - information needed to make the request for the data
@@ -91,26 +107,45 @@ function findPackageVersion({ data, version }) {
  * Gets metadata about the package from the provided registry
  * @param {Object} requestInfo - information needed to make the request for the data
  * @param {string} requestInfo.packageName - the name of the package
- * @param {string} requestInfo.packageManager - the package manager to use (Yarn or npm)
+ * @param {string} requestInfo.packageManager - the package manager to use
  * @param {string} requestInfo.version - the version (or version tag) to attempt to install
  * @returns {Promise<Object>} - a Promise which resolves to the JSON response from the registry
  */
 function getPackageData({ packageName, packageManager, version }) {
   const pkgString = version ? `${packageName}@${version}` : packageName;
-  const args = ["info", pkgString, "--json"];
-  return spawnCommand(packageManager, args).then(response => {
-    const parsed = JSON.parse(response);
-    // Yarn returns with an extra nested { data } that NPM doesn't
-    return parsed.data || parsed;
-  });
+  return getYarnVersion()
+    .catch(err => {
+      if (packageManager === C.yarn) {
+        throw err;
+      }
+      // If we're not trying to install with Yarn, we won't re-throw and instead will ignore the error and continue
+    })
+    .then(yarnVersion => {
+      // In Yarn versions >= 2, the `yarn info` command was replaced with `yarn npm info`
+      const isUsingYarnGreaterThan1 =
+        yarnVersion && !yarnVersion.startsWith("1.");
+
+      const args = [
+        ...(isUsingYarnGreaterThan1 ? ["npm", "info"] : ["info"]),
+        pkgString,
+        "--json"
+      ];
+
+      return spawnCommand(packageManager, args).then(response => {
+        const parsed = JSON.parse(response);
+
+        // Yarn 1 returns with an extra nested { data } that NPM doesn't
+        return parsed.data || parsed;
+      });
+    });
 }
 
 /**
  * Gets the contents of the package.json for a package at a specific version
  * @param {Object} requestInfo - information needed to make the request for the data
  * @param {string} requestInfo.packageName - the name of the package
  * @param {Boolean} requestInfo.noRegistry - Gets the package dependencies list from the local node_modules instead of remote registry
- * @param {string} requestInfo.packageManager - the package manager to use (Yarn or npm)
+ * @param {string} requestInfo.packageManager - the package manager to use
  * @param {string} requestInfo.version - the version (or version tag) to attempt to install. Ignored if an installed version of the package is found in node_modules.
  * @returns {Promise<Object>} - a Promise which resolves to the JSON response from the registry
  */