fix style-rewriter bug and add test case

yyx990803 · yyx990803 · commit 66d2051498b6 · 2016-05-25T13:51:46.000-04:00
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
@@ -35,13 +35,16 @@ module.exports = function (css, map) {
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
   var autoprefixOptions = options.autoprefixer
+  var postcssOptions = options.postcss
 
-  // plugins
-  var plugins = options.postcss
-  if (typeof plugins === 'function') {
-    plugins = plugins.call(this, this)
-  } else if (typeof options.postcss === 'object' && options.postcss.plugins) {
-    plugins = options.postcss.plugins
+  // postcss plugins
+  var plugins
+  if (Array.isArray(postcssOptions)) {
+    plugins = postcssOptions
+  } else if (typeof postcssOptions === 'function') {
+    plugins = postcssOptions.call(this, this)
+  } else if (isObject(postcssOptions) && postcssOptions.plugins) {
+    plugins = postcssOptions.plugins
   }
   plugins = plugins ? plugins.slice() : [] // make sure to copy it
 
@@ -75,7 +78,7 @@ module.exports = function (css, map) {
     !this.minimize &&
     options.cssSourceMap !== false &&
     process.env.NODE_ENV !== 'production' &&
-    !options.postcss.options.map
+    !(isObject(postcssOptions) && postcssOptions.options && postcssOptions.map)
   ) {
     opts.map = {
       inline: false,
@@ -85,10 +88,10 @@ module.exports = function (css, map) {
   }
 
   // postcss options from configuration
-  if (options.postcss && options.postcss.options) {
-    for (var option in options.postcss.options) {
+  if (isObject(postcssOptions) && postcssOptions.options) {
+    for (var option in postcssOptions.options) {
       if (!opts.hasOwnProperty(option)) {
-        opts[option] = options.postcss.options[option]
+        opts[option] = postcssOptions.options[option]
       }
     }
   }
@@ -104,3 +107,7 @@ module.exports = function (css, map) {
       cb(e)
     })
 }
+
+function isObject (val) {
+  return val && typeof val === 'object'
+}
diff --git a/package.json b/package.json
@@ -74,9 +74,11 @@
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^1.0.0",
+    "postcss": "^5.0.21",
     "rimraf": "^2.4.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
+    "sugarss": "^0.1.3",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-style-loader": "^1.0.0",
diff --git a/test/fixtures/postcss.vue b/test/fixtures/postcss.vue
@@ -0,0 +1,5 @@
+<style>
+h1
+  color: red
+  font-size: 14px
+</style>
diff --git a/test/test.js b/test/test.js
@@ -259,4 +259,21 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('postcss options', function (done) {
+    test({
+      entry: './test/fixtures/postcss.vue',
+      vue: {
+        postcss: {
+          options: {
+            parser: require('sugarss')
+          }
+        }
+      }
+    }, function (window) {
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      done()
+    })
+  })
 })
