PostCSS 5 and CSS Modules updates

Author: sokra

lib/processCss.js

@@ -31,28 +31,7 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 			return tokens.join("");
 		}
 
-		function walkAtRules(a, b) {
-			if(css.walkAtRules)
-				css.walkAtRules(a, b);
-			else
-				css.eachAtRule(a, b);
-		}
-
-		function walkRules(fn) {
-			if(css.walkRules)
-				css.walkRules(fn);
-			else
-				css.eachRule(fn);
-		}
-
-		function walkDecls(fn) {
-			if(css.walkDecls)
-				css.walkDecls(fn);
-			else
-				css.eachDecl(fn);
-		}
-
-		walkAtRules("import", function(rule) {
+		css.walkAtRules("import", function(rule) {
 			var values = Tokenizer.parseValues(rule.params);
 			var url = values.nodes[0].nodes[0];
 			if(url.type === "url") {
@@ -69,34 +48,34 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 				url: url,
 				mediaQuery: mediaQuery
 			});
-			rule.removeSelf();
+			rule.remove();
 		});
 
-		walkRules(function(rule) {
+		css.walkRules(function(rule) {
 			if(rule.selector === ":export") {
-				rule.eachDecl(function(decl) {
+				rule.walkDecls(function(decl) {
 					exports[decl.prop] = decl.value;
 				});
-				rule.removeSelf();
+				rule.remove();
 			} else if(/^:import\(.+\)$/.test(rule.selector)) {
 				var match = /^:import\((.+)\)$/.exec(rule.selector);
 				var url = loaderUtils.parseString(match[1]);
-				rule.eachDecl(function(decl) {
+				rule.walkDecls(function(decl) {
 					imports["$" + decl.prop] = importItems.length;
 					importItems.push({
 						url: url,
 						export: decl.value
 					});
 				});
-				rule.removeSelf();
+				rule.remove();
 			}
 		});
 
 		Object.keys(exports).forEach(function(exportName) {
 			exports[exportName] = replaceImportsInString(exports[exportName]);
 		});
 
-		walkDecls(function(decl) {
+		css.walkDecls(function(decl) {
 			var values = Tokenizer.parseValues(decl.value);
 			values.nodes.forEach(function(value) {
 				value.nodes.forEach(function(item) {
@@ -124,7 +103,7 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 			});
 			decl.value = Tokenizer.stringifyValues(values);
 		});
-		walkAtRules(function(atrule) {
+		css.walkAtRules(function(atrule) {
 			if(typeof atrule.params === "string") {
 				atrule.params = replaceImportsInString(atrule.params);
 			}

package.json

@@ -7,10 +7,10 @@
     "css-selector-tokenizer": "^0.5.1",
     "cssnano": ">=2.6.1 <4",
     "loader-utils": "~0.2.2",
-    "postcss": ">=4.1.11 <6",
-    "postcss-modules-extract-imports": "0.0.5",
-    "postcss-modules-local-by-default": "0.0.12",
-    "postcss-modules-scope": "0.0.8",
+    "postcss": "^5.0.6",
+    "postcss-modules-extract-imports": "1.0.0-beta2",
+    "postcss-modules-local-by-default": "1.0.0-beta1",
+    "postcss-modules-scope": "1.0.0-beta2",
     "source-list-map": "^0.1.4"
   },
   "devDependencies": {