fix: STRF-11281 Narrow comma separation cases and Improve Base Rules …

…Error (#1139)
bigcommerce · Oct 6, 2023 · 3879486 · 3879486
1 parent 579e3b2
commit 3879486
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/nodeSass/AutoFixer.js b/lib/nodeSass/AutoFixer.js
@@ -109,7 +109,7 @@ class AutoFixer {
             }
             if (
                 err.formatted.includes('Invalid CSS after') &&
-                err.formatted.includes('expected selector, was ', '')
+                err.formatted.includes('expected selector, was ",')
             ) {
                 return POSSIBLE_WRONG_COMMA;
             }

diff --git a/lib/nodeSass/BaseRulesFixer.js b/lib/nodeSass/BaseRulesFixer.js
@@ -13,19 +13,28 @@ class BaseRulesFixer extends BaseFixer {
     }
 
     transform() {
+        const self = this;
         return {
             postcssPlugin: 'Transform Base Rules Issues into Comments',
             Rule(rule, { Comment }) {
                 if (
                     rule.parent.type === 'root' &&
-                    (rule.selector.startsWith('&--') || rule.selector.startsWith('&.'))
+                    (rule.selector.startsWith('&') ||
+                        rule.selector.startsWith(':not(&)') ||
+                        rule.selector.startsWith('* &'))
                 ) {
-                    const comment = new Comment({ text: rule.toString() });
+                    const comment = new Comment({ text: self.replaceInnerComments(rule) });
                     rule.replaceWith(comment);
                 }
             },
         };
     }
+
+    // when we replace rule with comment, there might be a case when comment is inside another rule
+    // which breaks the commenting root rule
+    replaceInnerComments(rule) {
+        return rule.toString().replace(/\/\*(.*)\*\//g, '//$1');
+    }
 }
 
 module.exports = BaseRulesFixer;