ember-scoped-css 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-scoped-css",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "",
   "type": "commonjs",
   "main": "index.js",

package/src/getPostfix.js

@@ -1,9 +1,7 @@
 const md5 = require('blueimp-md5');
+const path = require('path');
 
 module.exports = function (cssFileName) {
-  // if (cssFileName.includes('/')) {
-  //   throw new Error('cssFileName should not contain /');
-  // }
-
-  return 'e' + md5(cssFileName).substring(0, 8);
+  const relativePath = path.relative(process.cwd(), cssFileName);
+  return 'e' + md5(relativePath).substring(0, 8);
 };

package/src/replaceScopedClass.js

@@ -4,9 +4,7 @@ const renameClass = require('./renameClass');
 module.exports = function (hbs, templatePath, basePath) {
   let ast = recast.parse(hbs);
   let stack = [];
-  const cssPath = templatePath
-    .replace(basePath, '')
-    .replace(/(\.hbs)?(\.js)?/, '.css');
+  const cssPath = templatePath.replace(/(\.hbs)?\.js$/, '.css');
   const projectCssPath = cssPath; // cssPath.replace(basePath, '');
 
   recast.traverse(ast, {

package/src/rewriteHbs.js

@@ -5,16 +5,31 @@ module.exports = function rewriteHbs(hbs, classes, tags, postfix) {
 
   recast.traverse(ast, {
     AttrNode(node) {
-      if (node.name === 'class' && node.value.chars) {
-        const newClasses = node.value.chars.split(' ').map((c) => {
-          if (c.trim() && classes.has(c.trim())) {
-            return c.trim() + '_' + postfix;
-          } else {
-            return c;
-          }
-        });
+      if (node.name === 'class') {
+        if (node.value.type === 'TextNode' && node.value.chars) {
+          const newClasses = node.value.chars.split(' ').map((c) => {
+            if (c.trim() && classes.has(c.trim())) {
+              return c.trim() + '_' + postfix;
+            } else {
+              return c;
+            }
+          });
 
-        node.value.chars = newClasses.join(' ');
+          node.value.chars = newClasses.join(' ');
+        } else if (node.value.type === 'ConcatStatement') {
+          for (let part of node.value.parts) {
+            if (part.type === 'TextNode' && part.chars) {
+              const newClasses = part.chars.split(' ').map((c) => {
+                if (c.trim() && classes.has(c.trim())) {
+                  return c.trim() + '_' + postfix;
+                } else {
+                  return c;
+                }
+              });
+              part.chars = newClasses.join(' ');
+            }
+          }
+        }
       }
     },