refactor compiler options

Author: yyx990803

index.js

@@ -1,7 +1,9 @@
 var through = require('through')
 var compiler = require('./lib/compiler')
 
-compiler.loadConfig()
+compiler.loadConfig({
+  extractCss: true
+})
 
 module.exports = function vueify (file, options) {
   if (!/.vue$/.test(file)) return through()

lib/compiler.js

@@ -9,7 +9,6 @@ var vueCompiler = require('vue-template-compiler')
 var genId = require('./gen-id')
 var normalize = require('./normalize')
 var compilers = require('./compilers')
-var options = require('./compilers/options')
 var rewriteStyle = require('./style-rewriter')
 
 var hasBabel = true
@@ -29,6 +28,9 @@ var insertCSSPath = normalize.lib('insert-css')
 var compiler = module.exports = new Emitter()
 compiler.setMaxListeners(Infinity)
 
+// options
+var options = compiler.options = {}
+
 // load user config
 compiler.loadConfig = function () {
   var fs = require('fs')
@@ -96,7 +98,7 @@ compiler.compile = function (content, filePath, cb) {
         file: filePath,
         style: style
       })
-      if (!process.env.VUEIFY_EXTRACT_CSS) {
+      if (!options.extractCSS) {
         style = JSON.stringify(style)
         output +=
           'var __vueify_style_dispose__ = require("' + insertCSSPath + '").insert(' + style + ')\n'
@@ -134,7 +136,7 @@ compiler.compile = function (content, filePath, cb) {
         '  if (!hotAPI.compatible) return\n' +
         '  module.hot.accept()\n' +
         // remove style tag on dispose
-        (style && !process.env.VUEIFY_EXTRACT_CSS
+        (style && !options.extractCSS
           ? '  module.hot.dispose(__vueify_style_dispose__)\n'
           : '') +
         '  if (!module.hot.data) {\n' +
@@ -189,7 +191,7 @@ function processStyle (part, filePath, id, parts) {
   var style = getContent(part, filePath)
   return compileAsPromise('style', style, part.lang, filePath)
     .then(function (res) {
-      return rewriteStyle(id, res, part.scoped).then(function (res) {
+      return rewriteStyle(id, res, part.scoped, options).then(function (res) {
         parts.styles.push(res)
       })
     })

lib/compilers/babel.js

@@ -1,6 +1,5 @@
 var fs = require('fs')
 var path = require('path')
-var options = require('./options')
 var ensureRequire = require('../ensure-require')
 
 var defaultBabelOptions = {
@@ -36,10 +35,10 @@ if (babelOptions === defaultBabelOptions) {
   }
 }
 
-module.exports = function (raw, cb) {
+module.exports = function (raw, cb, compiler) {
   try {
     var babel = require('babel-core')
-    var res = babel.transform(raw, options.babel || babelOptions)
+    var res = babel.transform(raw, compiler.options.babel || babelOptions)
   } catch (err) {
     return cb(err)
   }

lib/compilers/coffee.js

@@ -1,11 +1,10 @@
-var options = require('./options')
 var ensureRequire = require('../ensure-require.js')
 
-module.exports = function (raw, cb) {
+module.exports = function (raw, cb, compiler) {
   ensureRequire('coffee', ['coffee-script'])
   var coffee = require('coffee-script')
   try {
-    var js = coffee.compile(raw, options.coffee || {
+    var js = coffee.compile(raw, compiler.options.coffee || {
       bare: true
     })
   } catch (err) {

lib/compilers/jade.js

@@ -1,11 +1,10 @@
-var options = require('./options')
 var ensureRequire = require('../ensure-require.js')
 
-module.exports = function (raw, cb) {
+module.exports = function (raw, cb, compiler) {
   ensureRequire('jade', 'jade')
   var jade = require('jade')
   try {
-    var html = jade.compile(raw, options.jade || {})()
+    var html = jade.compile(raw, compiler.options.jade || {})()
   } catch (err) {
     return cb(err)
   }

lib/compilers/less.js

@@ -1,4 +1,3 @@
-var options = require('./options')
 var assign = require('object-assign')
 var path = require('path')
 var ensureRequire = require('../ensure-require.js')
@@ -9,7 +8,7 @@ module.exports = function (raw, cb, compiler, filePath) {
 
   var opts = assign({
     filename: path.basename(filePath)
-  }, options.less)
+  }, compiler.options.less)
 
   // provide import path
   var dir = path.dirname(filePath)

lib/compilers/options.js

@@ -1,11 +1,10 @@
-var options = require('./options')
 var ensureRequire = require('../ensure-require.js')
 
-module.exports = function (raw, cb) {
+module.exports = function (raw, cb, compiler) {
   ensureRequire('pug', 'pug')
   var pug = require('pug')
   try {
-    var html = pug.compile(raw, options.pug || {})()
+    var html = pug.compile(raw, compiler.options.pug || {})()
   } catch (err) {
     return cb(err)
   }

lib/compilers/pug.js

@@ -1,4 +1,3 @@
-var options = require('./options')
 var assign = require('object-assign')
 var path = require('path')
 var ensureRequire = require('../ensure-require.js')
@@ -19,7 +18,7 @@ module.exports = function (raw, cb, compiler, filePath) {
     error: function (err) {
       cb(err)
     }
-  }, options.sass || {
+  }, compiler.options.sass || {
     sourceComments: true
   })
 

lib/compilers/sass.js

@@ -1,4 +1,3 @@
-var options = require('./options')
 var assign = require('object-assign')
 var path = require('path')
 var ensureRequire = require('../ensure-require.js')
@@ -9,7 +8,7 @@ module.exports = function (raw, cb, compiler, filePath) {
 
   var opts = assign({
     filename: path.basename(filePath)
-  }, options.stylus || {})
+  }, compiler.options.stylus || {})
 
   var dir = path.dirname(filePath)
   var paths = [dir, process.cwd()]

lib/compilers/stylus.js

@@ -2,7 +2,6 @@ var postcss = require('postcss')
 var selectorParser = require('postcss-selector-parser')
 var cache = require('lru-cache')(100)
 var assign = require('object-assign')
-var options = require('./compilers/options')
 
 var currentId
 var addId = postcss.plugin('add-id', function () {
@@ -36,10 +35,11 @@ var addId = postcss.plugin('add-id', function () {
  * @param {String} id
  * @param {String} css
  * @param {Boolean} scoped
+ * @param {Object} options
  * @return {Promise}
  */
 
-module.exports = function (id, css, scoped) {
+module.exports = function (id, css, scoped, options) {
   var key = id + '!!' + css
   var val = cache.get(key)
   if (val) {

lib/style-rewriter.js

@@ -1,6 +1,7 @@
-process.env.VUEIFY_EXTRACT_CSS = true
-
 var fs = require('fs')
+var compiler = require('../lib/compiler')
+
+compiler.options.extractCSS = true
 
 module.exports = function (b, opts) {
   var outPath = opts.out || opts.o || 'bundle.css'