Merge branch 'master' of github.com:vuejs/vue-loader

vuejs · Dec 27, 2015 · 3cb0f30 · 3cb0f30
2 parents c2b4bc1 + 9416ae9
commit 3cb0f30
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
@@ -36,9 +36,13 @@ module.exports = function (css, map) {
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
   var autoprefixOptions = options.autoprefixer
+
+  // plugins
   var plugins = options.postcss
-    ? options.postcss.slice() // make sure to copy it
-    : []
+  if (typeof plugins === 'function') {
+    plugins = plugins.call(this, this)
+  }
+  plugins = plugins ? plugins.slice() : [] // make sure to copy it
 
   // scoped css
   if (query.scoped) {

diff --git a/test/test.js b/test/test.js
@@ -34,7 +34,7 @@ describe('vue-loader', function () {
 
   function getFile (file, cb) {
     fs.readFile(path.resolve(outputDir, file), 'utf-8', function (err, data) {
-      expect(err).to.be.null
+      expect(err).to.be.not.exist
       cb(data)
     })
   }