remove replaceAnimations from noscope option, exports csjs instead …

…of csjs()
rtsao · Aug 15, 2016 · ac4e1d5 · ac4e1d5
1 parent e4bc564
commit ac4e1d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -3,6 +3,6 @@
 var csjs = require('./csjs');
 
 module.exports = csjs();
-module.exports.csjs = csjs();
+module.exports.csjs = csjs;
 module.exports.noScope = csjs({ noscope: true });
 module.exports.getCss = require('./get-css');
diff --git a/lib/csjs.js b/lib/csjs.js
@@ -22,13 +22,7 @@ module.exports = function csjsTemplate(opts) {
     var css = joiner(strings, values.map(selectorize));
     var ignores = ignoreComposition(values);
 
-    var scope;
-    if (noscope) {
-      scope = extractExports(css);
-    } else {
-      scope = scopify(css, ignores);
-    }
-
+    var scope = noscope ? extractExports(css) : scopify(css, ignores);
     var extracted = extractExtends(scope.css);
     var localClasses = without(scope.classes, ignores);
     var localKeyframes = without(scope.keyframes, ignores);

diff --git a/lib/extract-exports.js b/lib/extract-exports.js
@@ -1,18 +1,17 @@
 'use strict';
 
-var replaceAnimations = require('./replace-animations');
 var regex = require('./regex');
 var classRegex = regex.classRegex;
 var keyframesRegex = regex.keyframesRegex;
 
 module.exports = extractExports;
 
 function extractExports(css) {
-  return replaceAnimations({
+  return {
     css: css,
     keyframes: getExport(css, keyframesRegex),
     classes: getExport(css, classRegex)
-  });
+  };
 }
 
 function getExport(css, regex) {