feat: hasPlugin matches router or vuex

Guillaume Chau · Guillaume Chau · commit 1c5fdd018435 · 2018-07-28T01:32:49.000+02:00
diff --git a/packages/@vue/cli-service/lib/PluginAPI.js b/packages/@vue/cli-service/lib/PluginAPI.js
@@ -41,6 +41,11 @@ class PluginAPI {
    * @return {boolean}
    */
   hasPlugin (id) {
+    if (id === 'router') id = 'vue-router'
+    if (['vue-router', 'vuex'].includes(id)) {
+      const pkg = this.service.pkg
+      return ((pkg.dependencies && pkg.dependencies[id]) || (pkg.devDependencies && pkg.devDependencies[id]))
+    }
     return this.service.plugins.some(p => matchesPluginId(id, p.id))
   }
 
diff --git a/packages/@vue/cli-ui/apollo-server/api/PluginApi.js b/packages/@vue/cli-ui/apollo-server/api/PluginApi.js
@@ -374,6 +374,7 @@ class PluginApi {
    * @param {string} id Plugin id or short id
    */
   hasPlugin (id) {
+    if (id === 'router') id = 'vue-router'
     if (['vue-router', 'vuex'].includes(id)) {
       const pkg = folders.readPackage(this.cwd, this.context, true)
       return ((pkg.dependencies && pkg.dependencies[id]) || (pkg.devDependencies && pkg.devDependencies[id]))
diff --git a/packages/@vue/cli/lib/Generator.js b/packages/@vue/cli/lib/Generator.js
@@ -213,6 +213,11 @@ module.exports = class Generator {
   }
 
   hasPlugin (_id) {
+    if (_id === 'router') _id = 'vue-router'
+    if (['vue-router', 'vuex'].includes(_id)) {
+      const pkg = this.pkg
+      return ((pkg.dependencies && pkg.dependencies[_id]) || (pkg.devDependencies && pkg.devDependencies[_id]))
+    }
     return [
       ...this.plugins.map(p => p.id),
       ...Object.keys(this.pkg.devDependencies || {}),
