refactor: fix function name and revert api break

vuejs · haoqunjiang · Oct 16, 2019 · Oct 11, 2019 · Oct 11, 2019 · Oct 11, 2019
commit 7157ff75872cdb2266a5aeacb6 8000 6eb84fee1c482f
diff --git a/packages/@vue/cli-shared-utils/lib/env.js b/packages/@vue/cli-shared-utils/lib/env.js
@@ -98,7 +98,7 @@ function getPnpmVersion () {
   return _pnpmVersion || '0.0.0'
 }
 
-exports.hasPnpmXOrLater = (version) => {
+function hasPnpmVersionOrLater (version) {
   if (process.env.VUE_CLI_TEST) {
     return true
   }
@@ -108,6 +108,14 @@ exports.hasPnpmXOrLater = (version) => {
   return semver.gte(getPnpmVersion(), version)
 }
 
+exports.hasPnpm3OrLater = () => {
+  return hasPnpmVersionOrLater('3.0.0')
+}
+
+exports.hasPnpm4OrLater = () => {
+  return hasPnpmVersionOrLater('4.0.0')
+}
+
 exports.hasProjectPnpm = (cwd) => {
   if (_pnpmProjects.has(cwd)) {
     return checkPnpm(_pnpmProjects.get(cwd))
@@ -120,7 +128,7 @@ exports.hasProjectPnpm = (cwd) => {
 }
 
 function checkPnpm (result) {
-  if (result && !exports.hasPnpmXOrLater('3.0.0')) {
+  if (result && !exports.hasPnpm3OrLater()) {
     throw new Error(`The project seems to require pnpm${_hasPnpm ? ' >= 3' : ''} but it's not installed.`)
   }
   return result

diff --git a/packages/@vue/cli-ui/apollo-server/util/command.js b/packages/@vue/cli-ui/apollo-server/util/command.js
@@ -1,14 +1,14 @@
 const {
   hasYarn,
   hasProjectYarn,
-  hasPnpmXOrLater,
+  hasPnpm3OrLater,
   hasProjectPnpm
 } = require('@vue/cli-shared-utils')
 const { loadOptions } = require('@vue/cli/lib/options')
 
 exports.getCommand = function (cwd = undefined) {
   if (!cwd) {
-    return loadOptions().packageManager || (hasYarn() ? 'yarn' : hasPnpmXOrLater('3.0.0') ? 'pnpm' : 'npm')
+    return loadOptions().packageManager || (hasYarn() ? 'yarn' : hasPnpm3OrLater() ? 'pnpm' : 'npm')
   }
   return hasProjectYarn(cwd) ? 'yarn' : hasProjectPnpm(cwd) ? 'pnpm' : 'npm'
 }
diff --git a/packages/@vue/cli/lib/Creator.js b/packages/@vue/cli/lib/Creator.js
@@ -33,7 +33,7 @@ const {
   hasGit,
   hasProjectGit,
   hasYarn,
-  hasPnpmXOrLater,
+  hasPnpm3OrLater,
   logWithSpinner,
   stopSpinner,
   exit,
@@ -116,7 +116,7 @@ module.exports = class Creator extends EventEmitter {
       cliOptions.packageManager ||
       loadOptions().packageManager ||
       (hasYarn() ? 'yarn' : null) ||
-      (hasPnpmXOrLater('3.0.0') ? 'pnpm' : 'npm')
+      (hasPnpm3OrLater() ? 'pnpm' : 'npm')
     )
     const pm = new PackageManager({ context, forcePackageManager: packageManager })
 
@@ -448,7 +448,7 @@ module.exports = class Creator extends EventEmitter {
 
     // ask for packageManager once
     const savedOptions = loadOptions()
-    if (!savedOptions.packageManager && (hasYarn() || hasPnpmXOrLater('3.0.0'))) {
+    if (!savedOptions.packageManager && (hasYarn() || hasPnpm3OrLater())) {
       const packageManagerChoices = []
 
       if (hasYarn()) {
@@ -459,7 +459,7 @@ module.exports = class Creator extends EventEmitter {
         })
       }
 
-      if (hasPnpmXOrLater('3.0.0')) {
+      if (hasPnpm3OrLater()) {
         packageManagerChoices.push({
           name: 'Use PNPM',
           value: 'pnpm',

diff --git a/packages/@vue/cli/lib/util/ProjectPackageManager.js b/packages/@vue/cli/lib/util/ProjectPackageManager.js
@@ -10,7 +10,8 @@ const chalk = require('chalk')
 const {
   hasYarn,
   hasProjectYarn,
-  hasPnpmXOrLater,
+  hasPnpm3OrLater,
+  hasPnpm4OrLater,
   hasProjectPnpm
 } = require('@vue/cli-shared-utils/lib/env')
 const { isOfficialPlugin, resolvePluginId } = require('@vue/cli-shared-utils/lib/pluginResolution')
@@ -51,7 +52,7 @@ const PACKAGE_MANAGER_CONFIG = {
     upgrade: ['update', '--loglevel', 'error'],
     remove: ['uninstall', '--loglevel', 'error']
   },
-  pnpm: hasPnpmXOrLater('4.0.0') ? PACKAGE_MANAGER_PNPM4_CONFIG : PACKAGE_MANAGER_PNPM3_CONFIG,
+  pnpm: hasPnpm4OrLater ? PACKAGE_MANAGER_PNPM4_CONFIG : PACKAGE_MANAGER_PNPM3_CONFIG,
   yarn: {
     install: [],
     add: ['add'],
@@ -81,7 +82,7 @@ class PackageManager {
     } else if (context) {
       this.bin = hasProjectYarn(context) ? 'yarn' : hasProjectPnpm(context) ? 'pnpm' : 'npm'
     } else {
-      this.bin = loadOptions().packageManager || (hasYarn() ? 'yarn' : hasPnpmXOrLater('3.0.0') ? 'pnpm' : 'npm')
+      this.bin = loadOptions().packageManager || (hasYarn() ? 'yarn' : hasPnpm3OrLater() ? 'pnpm' : 'npm')
     }
 
     if (!SUPPORTED_PACKAGE_MANAGERS.includes(this.bin)) {

diff --git a/packages/@vue/cli/lib/util/clearConsole.js b/packages/@vue/cli/lib/util/clearConsole.js
@@ -2,7 +2,7 @@ const chalk = require('chalk')
 const execa = require('execa')
 const semver = require('semver')
 const getVersions = require('./getVersions')
-const { clearConsole, hasYarn, hasPnpmXOrLater } = require('@vue/cli-shared-utils')
+const { clearConsole, hasYarn, hasPnpm3OrLater } = require('@vue/cli-shared-utils')
 
 async function getInstallationCommand () {
   if (hasYarn()) {
@@ -12,7 +12,7 @@ async function getInstallationCommand () {
     }
   }
 
-  if (hasPnpmXOrLater('3.0.0')) {
+  if (hasPnpm3OrLater()) {
     const { stdout: pnpmGlobalPrefix } = await execa('pnpm', ['config', 'get', 'prefix'])
     if (__dirname.includes(pnpmGlobalPrefix) && __dirname.includes('pnpm-global')) {
       return `pnpm i -g`

diff --git a/packages/@vue/cli/lib/util/loadCommand.js b/packages/@vue/cli/lib/util/loadCommand.js
@@ -11,11 +11,11 @@ module.exports = function loadCommand (commandName, moduleName) {
       } catch (err2) {
         if (isNotFoundError(err2)) {
           const chalk = require('chalk')
-          const { hasYarn, hasPnpmXOrLater } = require('@vue/cli-shared-utils')
+          const { hasYarn, hasPnpm3OrLater } = require('@vue/cli-shared-utils')
           let installCommand = `npm install -g`
           if (hasYarn()) {
             installCommand = `yarn global add`
-          } else if (hasPnpmXOrLater('3.0.0')) {
+          } else if (hasPnpm3OrLater()) {
             installCommand = `pnpm install -g`
           }
           console.log()