update config format

Author: yyx990803

lib/compiler.js

@@ -6,6 +6,7 @@ var parser = new parse5.Parser()
 var serializer = new parse5.TreeSerializer()
 var hash = require('hash-sum')
 var compilers = require('./compilers')
+var options = require('./compilers/options')
 var rewriteStyle = require('./style-rewriter')
 var rewriteTemplate = require('./template-rewriter')
 var Emitter = require('events').EventEmitter
@@ -23,8 +24,31 @@ if (process.env.NODE_ENV === 'production') {
 
 // expose compiler
 var compiler = module.exports = new Emitter()
-compiler.register = compilers.register
-compiler.loadConfig = compilers.loadConfig
+
+// load user config
+compiler.loadConfig = function () {
+  var fs = require('fs')
+  var path = require('path')
+  var configPath = path.resolve(process.cwd(), 'vue.config.js')
+  if (fs.existsSync(configPath)) {
+    compiler.applyConfig(require(configPath))
+  }
+}
+
+// apply config
+compiler.applyConfig = function (config) {
+  // copy user options to default options
+  Object.keys(config).forEach(function (key) {
+    if (key !== 'customCompilers') {
+      options[key] = config[key]
+    } else {
+      // register compilers
+      Object.keys(config[key]).forEach(function (name) {
+        compilers[name] = config[key][name]
+      })
+    }
+  })
+}
 
 /**
  * Compile a .vue file.
@@ -173,7 +197,7 @@ function isScoped (node) {
 function processTemplate (node, filePath, id, hasScopedStyle) {
   var template = checkSrc(node, filePath) || serializeTemplate(node)
   var lang = checkLang(node)
-  return compileAsPromise('template', template, compilers.template[lang])
+  return compileAsPromise('template', template, lang)
     .then(function (res) {
       if (hasScopedStyle) {
         return rewriteTemplate(id, res.source)
@@ -201,7 +225,7 @@ function processTemplate (node, filePath, id, hasScopedStyle) {
 function processStyle (node, filePath, id) {
   var style = checkSrc(node, filePath) || serializer.serialize(node)
   var lang = checkLang(node)
-  return compileAsPromise('style', style, compilers.style[lang])
+  return compileAsPromise('style', style, lang)
     .then(function (res) {
       if (isScoped(node)) {
         return rewriteStyle(id, res.source)
@@ -228,7 +252,7 @@ function processStyle (node, filePath, id) {
 function processScript (node, filePath) {
   var script = checkSrc(node, filePath) || serializer.serialize(node).trim()
   var lang = checkLang(node) || 'babel'
-  return compileAsPromise('script', script, compilers.script[lang])
+  return compileAsPromise('script', script, lang)
 }
 
 /**
@@ -300,11 +324,12 @@ function serializeTemplate (node) {
  *
  * @param {String} type
  * @param {String} source
- * @param {Function} [compile]
+ * @param {String} lang
  * @return {Promise}
  */
 
-function compileAsPromise (type, source, compile) {
+function compileAsPromise (type, source, lang) {
+  var compile = compilers[lang]
   if (compile) {
     return new Promise(function (resolve, reject) {
       compile(source, function (err, res) {

lib/compilers/index.js

@@ -1,70 +1,11 @@
-var options = require('./options')
-
 // built-in compilers
-var compilers = module.exports = {
-  script: {
-    coffee: require('./coffee'),
-    babel: require('./babel'),
-    // backwards compat
-    es: require('./babel')
-  },
-  style: {
-    less: require('./less'),
-    sass: require('./sass'),
-    scss: require('./sass'),
-    stylus: require('./stylus'),
-    myth: require('./myth')
-  },
-  template: {
-    jade: require('./jade')
-  }
-}
-
-/**
- * Register a custom pre-processor for a given language.
- *
- * @param {Object} opts
- *                 - lang {String}
- *                 - type {String}
- *                 - compile {Function}
- */
-compilers.register = function registerCompiler (opts) {
-  if (!opts.lang) {
-    return warn('missing language')
-  }
-  if (!opts.type) {
-    return warn('missing file type')
-  }
-  if (!opts.compile || typeof opts.compile !== 'function') {
-    return warn('missing compile function')
-  }
-  if (!compilers[opts.type]) {
-    return warn(
-      'invalid file type: ' + opts.type +
-      ' (valid types: script|style|template)'
-    )
-  }
-  compilers[opts.type][opts.lang] = opts.compile
-}
-
-// check for config file
-compilers.loadConfig = function () {
-  var fs = require('fs')
-  var path = require('path')
-  var configPath = path.resolve(process.cwd(), 'vue.config.js')
-  if (fs.existsSync(configPath)) {
-    require(configPath)({
-      register: compilers.register,
-      option: function (name, opts) {
-        options[name] = opts
-      }
-    })
-  }
-}
-
-function warn (msg) {
-  console.warn(
-    '[vue-component-compiler] Error attempting to' +
-    'register custom compiler: ' + msg
-  )
+module.exports = {
+  coffee: require('./coffee'),
+  babel: require('./babel'),
+  less: require('./less'),
+  sass: require('./sass'),
+  scss: require('./sass'),
+  stylus: require('./stylus'),
+  myth: require('./myth'),
+  jade: require('./jade')
 }

package.json

@@ -21,6 +21,7 @@
   },
   "homepage": "https://github.com/vuejs/vueify",
   "dependencies": {
+    "autoprefixer": "^6.0.3",
     "babel": "^5.8.23",
     "clean-css": "^3.4.4",
     "es6-promise": "^3.0.2",

test/test.js

@@ -5,12 +5,12 @@ var assert = require('assert')
 var hash = require('hash-sum')
 
 // test custom transform
-compiler.register({
-  lang: 'test',
-  type: 'script',
-  compile: function (content, cb) {
-    content = content.replace('not ', '')
-    cb(null, content)
+compiler.applyConfig({
+  customCompilers: {
+    test: function (content, cb) {
+      content = content.replace('not ', '')
+      cb(null, content)
+    }
   }
 })