fix html escape during render

Author: yyx990803

lib/generate.js

@@ -6,7 +6,6 @@ var path = require('path')
 var getOptions = require('./options')
 var ask = require('./ask')
 var filter = require('./filter')
-var extend = Object.assign || require('util')._extend
 
 // register hendlebars helper
 Handlebars.registerHelper('if_eq', function (a, b, opts) {
@@ -33,10 +32,10 @@ Handlebars.registerHelper('unless_eq', function (a, b, opts) {
 module.exports = function generate (name, src, dest, done) {
   var opts = getOptions(name, src)
   var metalsmith = Metalsmith(path.join(src, 'template'))
-  // extract all gathered data from user and override project name with destination directory name
-  var data = extend({}, metalsmith.metadata(), { destDirName: name })
-  // avoid handlebars escaping HTML
-  data.noEscape = true
+  var data = Object.assign(metalsmith.metadata(), {
+    destDirName: name,
+    noEscape: true
+  })
   metalsmith
     .use(askQuestions(opts.prompts))
     .use(filterFiles(opts.filters))

test/e2e/test.js

@@ -31,13 +31,14 @@ function monkeyPatchInquirer (answers) {
 describe('vue-cli', () => {
   const answers = {
     name: 'vue-cli-test',
-    author: 'ziga',
+    author: 'John Doe <[email protected]>',
     description: 'vue-cli e2e test',
     preprocessor: {
       less: true,
       sass: true
     },
-    pick: 'no'
+    pick: 'no',
+    noEscape: true
   }
 
   it('template generation', done => {
@@ -54,7 +55,6 @@ describe('vue-cli', () => {
       ], function (file, next) {
         const template = fs.readFileSync(`${MOCK_TEMPLATE_REPO_PATH}/template/${file}`, 'utf8')
         const generated = fs.readFileSync(`${MOCK_TEMPLATE_BUILD_PATH}/${file}`, 'utf8')
-
         render(template, answers, (err, res) => {
           if (err) return next(err)
           expect(res).to.equal(generated)