Merge branch 'master' into media-queries

Conflicts:
	src/index.js

Author: geelen

README.md

@@ -25,7 +25,7 @@ so it doesn't pollute CSS global scope and can be simply used in JS like so:
 
 ```js
 import styles from './buttons.css'
-elem.innerHTML = `<button class="${buttons.continueButton}">Continue</button>`
+elem.innerHTML = `<button class="${styles.continueButton}">Continue</button>`
 ```
 
 ## Extensions

package.json

@@ -35,7 +35,7 @@
   "homepage": "https://github.com/geelen/postcss-modules-scope",
   "dependencies": {
     "css-selector-tokenizer": "^0.5.0",
-    "postcss": "^4.1.11"
+    "postcss": "^5.0.4"
   },
   "devDependencies": {
     "babel": "^5.4.7",

src/index.js

@@ -79,20 +79,20 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
 
     // Find any :import and remember imported names
     let importedNames = {};
-    css.eachRule(rule => {
+    css.walkRules(rule => {
       if(/^:import\(.+\)$/.test(rule.selector)) {
-        rule.eachDecl(decl => {
+        rule.walkDecls(decl => {
           importedNames[decl.prop] = true;
         });
       }
     });
 
     // Find any :local classes
-    css.eachRule(rule => {
+    css.walkRules(rule => {
       let selector = Tokenizer.parse(rule.selector);
       let newSelector = traverseNode(selector);
       rule.selector = Tokenizer.stringify(newSelector);
-      rule.eachDecl("composes", decl => {
+      rule.walkDecls("composes", decl => {
         let localNames = getSingleLocalNamesForComposes(selector);
         let classes = decl.value.split(/\s+/);
         classes.forEach((className) => {
@@ -110,9 +110,9 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
             throw decl.error("referenced class name \"" + className + "\" in composes not found");
           }
         });
-        decl.removeSelf();
+        decl.remove();
       });
-      rule.eachDecl(decl => {
+      rule.walkDecls(decl => {
         var tokens = decl.value.split(/(,|'[^']*'|"[^"]*")/);
         tokens = tokens.map((token, idx) => {
           if(idx === 0 || tokens[idx - 1] === ',') {
@@ -130,8 +130,8 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
       });
     });
 
-    css.eachAtRule(atrule => {
-      // Find any :local keyframes and rewrite them
+    // Find any :local keyframes
+    css.walkAtRules(atrule => {
       if(/keyframes$/.test(atrule.name)) {
         var localKeyFrames = /^\s*:local\s*\((.+?)\)\s*$/.exec(atrule.params);
         if(localKeyFrames) {
@@ -156,7 +156,7 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
         nodes: exportedNames.map(exportedName => postcss.decl({
           prop: exportedName,
           value: exports[exportedName].join(" "),
-          before: "\n  ",
+          raws: { before: "\n  " },
           _autoprefixerDisabled: true
         }))
       }));

test/test-cases.js

@@ -9,7 +9,7 @@ var postcss = require("postcss");
 var processor = require("../src");
 
 function generateInvalidCSS(css) {
-  css.eachDecl(function(decl) {
+  css.walkDecls(function(decl) {
     decl.value = decl.value.replace(/_colon_/g, ":"); // because using a : in the tests would make it invalid CSS.
   });
 }