pass query.id as an option to addId in style-rewriter (vuejs#237)

Giumo X. Clanjor (哆啦比猫/兰威举) · yyx990803 · commit 89512340ee9f · 2016-05-22T12:08:04.000-04:00
- removed global variable "currentId"
- query.id is passed as an option to addId
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
@@ -3,8 +3,7 @@ var selectorParser = require('postcss-selector-parser')
 var loaderUtils = require('loader-utils')
 var assign = require('object-assign')
 
-var currentId
-var addId = postcss.plugin('add-id', function () {
+var addId = postcss.plugin('add-id', function (opts) {
   return function (root) {
     root.each(function rewriteSelector (node) {
       if (!node.selector) {
@@ -21,7 +20,7 @@ var addId = postcss.plugin('add-id', function () {
             if (n.type !== 'pseudo') node = n
           })
           selector.insertAfter(node, selectorParser.attribute({
-            attribute: currentId
+            attribute: opts.id
           }))
         })
       }).process(node.selector).result
@@ -46,7 +45,7 @@ module.exports = function (css, map) {
 
   // scoped css
   if (query.scoped) {
-    plugins.push(addId)
+    plugins.push(addId({ id: query.id }))
   }
 
   // autoprefixer
@@ -82,7 +81,6 @@ module.exports = function (css, map) {
     }
   }
 
-  currentId = query.id
   postcss(plugins)
     .process(css, opts)
     .then(function (result) {
