8000 avoid duplicate done calls when rendering complete message · unclay/vue-cli@5c35540 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5c35540

Browse files
committed
avoid duplicate done calls when rendering complete message
1 parent c09bc22 commit 5c35540

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

lib/generate.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ module.exports = function generate (name, src, dest, done) {
4444
.destination(dest)
4545
.build(function (err) {
4646
done(err)
47-
if (opts.completeMessage) {
48-
formatMessage(opts.completeMessage, data, function (err, message) {
49-
if (err) return done(err)
50-
console.log(message)
51-
})
52-
}
47+
logMessage(opts.completeMessage, data)
5348
})
5449
}
5550

@@ -105,18 +100,22 @@ function renderTemplateFiles (files, metalsmith, done) {
105100
}
106101

107102
/**
108-
* Format complete message.
103+
* Display template complete message.
109104
*
110105
* @param {String} message
111106
* @param {Object} data
112107
* @param {Function} cb
113108
*/
114109

115-
function formatMessage (message, data, cb) {
110+
function logMessage (message, data) {
111+
if (!message) return
116112
render(message, data, function (err, res) {
117-
if (err) return cb(err)
118-
cb(null, '\n' + res.split(/\r?\n/g).map(function (line) {
119-
return ' ' + line
120-
}).join('\n'))
113+
if (err) {
114+
console.error('\n Error when rendering template complete message: ' + err.message.trim())
115+
} else {
116+
console.log('\n' + res.split(/\r?\n/g).map(function (line) {
117+
return ' ' + line
118+
}).join('\n'))
119+
}
121120
})
122121
}

0 commit comments

Comments
 (0)
0