refactor: further modernize codebase

Author: yyx990803

lib/ask.js

@@ -17,7 +17,7 @@ const promptMapping = {
  */
 
 module.exports = function ask (prompts, data, done) {
-  async.eachSeries(Object.keys(prompts), function (key, next) {
+  async.eachSeries(Object.keys(prompts), (key, next) => {
     prompt(data, key, prompts[key], next)
   }, done)
 }
@@ -50,11 +50,11 @@ function prompt (data, key, prompt, done) {
     message: prompt.message || prompt.label || key,
     default: promptDefault,
     choices: prompt.choices || [],
-    validate: prompt.validate || function () { return true }
-  }], function (answers) {
+    validate: prompt.validate || (() => true)
+  }], answers => {
     if (Array.isArray(answers[key])) {
       data[key] = {}
-      answers[key].forEach(function (multiChoiceAnswer) {
+      answers[key].forEach(multiChoiceAnswer => {
         data[key][multiChoiceAnswer] = true
       })
     } else if (typeof answers[key] === 'string') {

lib/check-version.js

@@ -3,7 +3,7 @@ const semver = require('semver')
 const chalk = require('chalk')
 const packageConfig = require('../package.json')
 
-module.exports = function (done) {
+module.exports = done => {
   // Ensure minimum supported node version is used
   if (!semver.satisfies(process.version, packageConfig.engines.node)) {
     return console.log(chalk.red(
@@ -14,7 +14,7 @@ module.exports = function (done) {
   request({
     url: 'https://registry.npmjs.org/vue-cli',
     timeout: 1000
-  }, function (err, res, body) {
+  }, (err, res, body) => {
     if (!err && res.statusCode === 200) {
       const latestVersion = JSON.parse(body)['dist-tags'].latest
       const localVersion = packageConfig.version

lib/filter.js

@@ -1,13 +1,13 @@
 const match = require('minimatch')
 const evaluate = require('./eval')
 
-module.exports = function (files, filters, data, done) {
+module.exports = (files, filters, data, done) => {
   if (!filters) {
     return done()
   }
   const fileNames = Object.keys(files)
-  Object.keys(filters).forEach(function (glob) {
-    fileNames.forEach(function (file) {
+  Object.keys(filters).forEach(glob => {
+    fileNames.forEach(file => {
       if (match(file, glob, { dot: true })) {
         const condition = filters[glob]
         if (!evaluate(condition, data)) {

lib/generate.js

@@ -40,7 +40,7 @@ module.exports = function generate (name, src, dest, done) {
     inPlace: dest === process.cwd(),
     noEscape: true
   })
-  opts.helpers && Object.keys(opts.helpers).map(function (key) {
+  opts.helpers && Object.keys(opts.helpers).map(key => {
     Handlebars.registerHelper(key, opts.helpers[key])
   })
 
@@ -63,7 +63,7 @@ module.exports = function generate (name, src, dest, done) {
   metalsmith.clean(false)
     .source('.') // start from template root instead of `./src` which is Metalsmith's default for `source`
     .destination(dest)
-    .build(function (err, files) {
+    .build((err, files) => {
       done(err)
       if (typeof opts.complete === 'function') {
         const helpers = { chalk, logger, files }
@@ -84,7 +84,7 @@ module.exports = function generate (name, src, dest, done) {
  */
 
 function askQuestions (prompts) {
-  return function (files, metalsmith, done) {
+  return (files, metalsmith, done) => {
     ask(prompts, metalsmith.metadata(), done)
   }
 }
@@ -97,7 +97,7 @@ function askQuestions (prompts) {
  */
 
 function filterFiles (filters) {
-  return function (files, metalsmith, done) {
+  return (files, metalsmith, done) => {
     filter(files, filters, metalsmith.metadata(), done)
   }
 }
@@ -114,10 +114,10 @@ function renderTemplateFiles (skipInterpolation) {
   skipInterpolation = typeof skipInterpolation === 'string'
     ? [skipInterpolation]
     : skipInterpolation
-  return function (files, metalsmith, done) {
+  return (files, metalsmith, done) => {
     const keys = Object.keys(files)
     const metalsmithMetadata = metalsmith.metadata()
-    async.each(keys, function (file, next) {
+    async.each(keys, (file, next) => {
       // skipping files with skipInterpolation option
       if (skipInterpolation && multimatch([file], skipInterpolation, { dot: true }).length) {
         return next()
@@ -127,7 +127,7 @@ function renderTemplateFiles (skipInterpolation) {
       if (!/{{([^{}]+)}}/g.test(str)) {
         return next()
       }
-      render(str, metalsmithMetadata, function (err, res) {
+      render(str, metalsmithMetadata, (err, res) => {
         if (err) {
           err.message = `[${file}] ${err.message}`
           return next(err)
@@ -148,13 +148,11 @@ function renderTemplateFiles (skipInterpolation) {
 
 function logMessage (message, data) {
   if (!message) return
-  render(message, data, function (err, res) {
+  render(message, data, (err, res) => {
     if (err) {
       console.error('\n   Error when rendering template complete message: ' + err.message.trim())
     } else {
-      console.log('\n' + res.split(/\r?\n/g).map(function (line) {
-        return '   ' + line
-      }).join('\n'))
+      console.log('\n' + res.split(/\r?\n/g).map(line => '   ' + line).join('\n'))
     }
   })
 }

lib/git-user.js

@@ -1,6 +1,6 @@
 const exec = require('child_process').execSync
 
-module.exports = function () {
+module.exports = () => {
   let name
   let email
 

lib/local-path.js

@@ -1,11 +1,11 @@
 const path = require('path')
 
 module.exports = {
-  isLocalPath: function (templatePath) {
+  isLocalPath (templatePath) {
     return /^[./]|(^[a-zA-Z]:)/.test(templatePath)
   },
 
-  getTemplatePath: function (templatePath) {
+  getTemplatePath (templatePath) {
     return path.isAbsolute(templatePath)
       ? templatePath
       : path.normalize(path.join(process.cwd(), templatePath))

lib/logger.js

@@ -14,8 +14,8 @@ const sep = chalk.gray('·')
  * @param {String} message
  */
 
-exports.log = function () {
-  const msg = format.apply(format, arguments)
+exports.log = function (...args) {
+  const msg = format.apply(format, args)
   console.log(chalk.white(prefix), sep, msg)
 }
 
@@ -25,9 +25,9 @@ exports.log = function () {
  * @param {String} message
  */
 
-exports.fatal = function (message) {
-  if (message instanceof Error) message = message.message.trim()
-  const msg = format.apply(format, arguments)
+exports.fatal = function (...args) {
+  if (args[0] instanceof Error) args[0] = args[0].message.trim()
+  const msg = format.apply(format, args)
   console.error(chalk.red(prefix), sep, msg)
   process.exit(1)
 }
@@ -38,7 +38,7 @@ exports.fatal = function (message) {
  * @param {String} message
  */
 
-exports.success = function () {
-  const msg = format.apply(format, arguments)
+exports.success = function (...args) {
+  const msg = format.apply(format, args)
   console.log(chalk.white(prefix), sep, msg)
 }

lib/options.js

@@ -77,7 +77,7 @@ function setDefault (opts, key, val) {
 function setValidateName (opts) {
   const name = opts.prompts.name
   const customValidate = name.validate
-  name.validate = function (name) {
+  name.validate = name => {
     const its = validateName(name)
     if (!its.validForNewPackages) {
       const errors = (its.errors || []).concat(its.warnings || [])

lib/warnings.js

@@ -1,15 +1,15 @@
 const chalk = require('chalk')
 
 module.exports = {
-  v2SuffixTemplatesDeprecated: function (template, name) {
+  v2SuffixTemplatesDeprecated (template, name) {
     const initCommand = 'vue init ' + template.replace('-2.0', '') + ' ' + name
 
     console.log(chalk.red('  This template is deprecated, as the original template now uses Vue 2.0 by default.'))
     console.log()
     console.log(chalk.yellow('  Please use this command instead: ') + chalk.green(initCommand))
     console.log()
   },
-  v2BranchIsNowDefault: function (template, name) {
+  v2BranchIsNowDefault (template, name) {
     const vue1InitCommand = 'vue init ' + template + '#1.0' + ' ' + name
 
     console.log(chalk.green('  This will install Vue 2.x version of the template.'))