Merge pull request #7 from css-modules/switch-to-composes

Use "composes" in place of "extends"
css-modules · Jun 7, 2015 · e3b144c · e3b144c
2 parents 7d0a312 + 30ccb68
commit e3b144c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/index.js b/src/index.js
@@ -16,7 +16,7 @@ const processor = (css) => {
         exports[exportedName].push(scopedName);
       }
       rule.selector = `.${scopedName}${pseudo || ''}`;
-      rule.eachDecl(/extends/, decl => {
+      rule.eachDecl("composes", decl => {
         let classes = decl.value.split(/ from /)[0];
         exports[exportedName].push(classes);
         decl.removeSelf();

diff --git a/test/test-cases.js b/test/test-cases.js
@@ -11,7 +11,7 @@ var processor = require("../");
 var pipeline = postcss([processor]);
 
 function normalize(str) {
-  return str.replace(/\r\n?/g, "\n");
+  return str.replace(/\r\n?/g, "\n").replace(/\n$/,'');
 }
 
 var generateScopedName = processor.generateScopedName;

diff --git a/test/test-cases/export-with-extends/source.css b/test/test-cases/export-with-extends/source.css
@@ -1 +1 @@
-:local(.exportName) { extends: otherClass; color: green; }
+:local(.exportName) { composes: otherClass; color: green; }
diff --git a/test/test-cases/export-with-multiple-extends/source.css b/test/test-cases/export-with-multiple-extends/source.css
@@ -1 +1 @@
-:local(.exportName) { extends: otherClass andAgain; extends: aThirdClass; color: green; }
+:local(.exportName) { composes: otherClass andAgain; composes: aThirdClass; color: green; }