feat: improve generator hasPlugin check + invoke output

vuejs · Jan 15, 2018 · 52dad9d · 52dad9d
1 parent fbc5f6b
commit 52dad9d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/packages/@vue/cli-plugin-eslint/generator.js b/packages/@vue/cli-plugin-eslint/generator.js
@@ -53,6 +53,20 @@ module.exports = (api, { config, lintOn = [] }) => {
 
   api.extendPackage(pkg)
 
+  if (api.hasPlugin('unit-mocha')) {
+    api.render(files => {
+      files['test/unit/.eslintrc'] = JSON.stringify({
+        env: { mocha: true }
+      }, null, 2)
+    })
+  } else if (api.hasPlugin('unit-jest')) {
+    api.render(files => {
+      files['test/unit/.eslintrc'] = JSON.stringify({
+        env: { jest: true }
+      }, null, 2)
+    })
+  }
+
   // lint & fix after create to ensure files adhere to chosen config
   if (config && config !== 'base') {
     api.onCreateComplete(() => {

diff --git a/packages/@vue/cli/lib/Generator.js b/packages/@vue/cli/lib/Generator.js
@@ -87,4 +87,15 @@ module.exports = class Generator {
     }
     debug('vue:cli-files')(this.files)
   }
+
+  hasPlugin (_id) {
+    const prefixRE = /^(@vue\/|vue-)cli-plugin-/
+    return [
+      ...this.plugins.map(p => p.id),
+      ...Object.keys(this.pkg.devDependencies || {}),
+      ...Object.keys(this.pkg.dependencies || {})
+    ].some(id => {
+      return id === _id || id.replace(prefixRE, '') === _id
+    })
+  }
 }
diff --git a/packages/@vue/cli/lib/GeneratorAPI.js b/packages/@vue/cli/lib/GeneratorAPI.js
@@ -101,11 +101,8 @@ module.exports = class GeneratorAPI {
     return path.resolve(this.generator.context, _path)
   }
 
-  hasPlugin (_id) {
-    const prefixRE = /^(@vue\/|vue-)cli-plugin-/
-    return this.generator.plugins.some(({ id }) => {
-      return id === _id || id.replace(prefixRE, '') === _id
-    })
+  hasPlugin (id) {
+    return this.generator.hasPlugin(id)
   }
 }
 

diff --git a/packages/@vue/cli/lib/invoke.js b/packages/@vue/cli/lib/invoke.js
@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const execa = require('execa')
 const chalk = require('chalk')
 const resolve = require('resolve')
 const Generator = require('./Generator')
@@ -9,6 +10,7 @@ const {
   log,
   error,
   hasYarn,
+  hasGit,
   logWithSpinner,
   stopSpinner
 } = require('@vue/cli-shared-utils')
@@ -87,8 +89,15 @@ async function invoke (pluginName, options) {
   }
 
   stopSpinner()
+
   log()
   log(`   Successfully invoked generator for plugin: ${chalk.cyan(id)}`)
+  if (hasGit) {
+    const { stdout } = await execa('git', ['ls-files', '--exclude-standard', '--modified', '--others'])
+    log(`   The following files have been updated / added:\n`)
+    log(chalk.red(stdout.split(/\r?\n/g).map(line => `     ${line}`).join('\n')))
+    log()
+  }
   log(`   You should review and commit the changes.`)
   log()
 }