From 16960536be17624159b1eb4ea97a0e82efd2a565 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Sun, 14 Apr 2019 16:43:25 +0800
Subject: [PATCH] fix: fix vue add/invoke bug when user does not have yarn
 installed

closes #3804
---
 packages/@vue/cli-ui/apollo-server/util/command.js | 2 +-
 packages/@vue/cli/lib/add.js                       | 2 +-
 packages/@vue/cli/lib/invoke.js                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@vue/cli-ui/apollo-server/util/command.js b/packages/@vue/cli-ui/apollo-server/util/command.js
index aad7e14a11..c0792d344d 100644
--- a/packages/@vue/cli-ui/apollo-server/util/command.js
+++ b/packages/@vue/cli-ui/apollo-server/util/command.js
@@ -10,5 +10,5 @@ exports.getCommand = function (cwd = undefined) {
   if (!cwd) {
     return loadOptions().packageManager || (hasYarn() ? 'yarn' : hasPnpm3OrLater() ? 'pnpm' : 'npm')
   }
-  return hasProjectYarn(cwd) ? 'yarn' : hasProjectPnpm() ? 'pnpm' : 'npm'
+  return hasProjectYarn(cwd) ? 'yarn' : hasProjectPnpm(cwd) ? 'pnpm' : 'npm'
 }
diff --git a/packages/@vue/cli/lib/add.js b/packages/@vue/cli/lib/add.js
index b4d3698f41..07640da6c3 100644
--- a/packages/@vue/cli/lib/add.js
+++ b/packages/@vue/cli/lib/add.js
@@ -27,7 +27,7 @@ async function add (pluginName, options = {}, context = process.cwd()) {
   log(`📦  Installing ${chalk.cyan(packageName)}...`)
   log()
 
-  const packageManager = loadOptions().packageManager || (hasProjectYarn(context) ? 'yarn' : hasProjectPnpm() ? 'pnpm' : 'npm')
+  const packageManager = loadOptions().packageManager || (hasProjectYarn(context) ? 'yarn' : hasProjectPnpm(context) ? 'pnpm' : 'npm')
   await installPackage(context, packageManager, options.registry, packageName)
 
   log(`${chalk.green('✔')}  Successfully installed plugin: ${chalk.cyan(packageName)}`)
diff --git a/packages/@vue/cli/lib/invoke.js b/packages/@vue/cli/lib/invoke.js
index b478c0db33..33180eda6e 100644
--- a/packages/@vue/cli/lib/invoke.js
+++ b/packages/@vue/cli/lib/invoke.js
@@ -145,7 +145,7 @@ async function runGenerator (context, plugin, pkg = getPkg(context)) {
     log(`📦  Installing additional dependencies...`)
     log()
     const packageManager =
-      loadOptions().packageManager || (hasProjectYarn(context) ? 'yarn' : hasProjectPnpm() ? 'pnpm' : 'npm')
+      loadOptions().packageManager || (hasProjectYarn(context) ? 'yarn' : hasProjectPnpm(context) ? 'pnpm' : 'npm')
     await installDeps(context, packageManager, plugin.options && plugin.options.registry)
   }