chore(postcss-merge-rules): refactor

Move all checks together.
cssnano · May 11, 2021 · 70091c6 · 70091c6
1 parent 491d19b
commit 70091c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/postcss-merge-rules/src/index.js b/packages/postcss-merge-rules/src/index.js
@@ -94,11 +94,6 @@ function canMerge(ruleA, ruleB, browsers, compatibilityCache) {
   const b = ruleB.selectors;
 
   const selectors = a.concat(b);
-  const hasHost = selectors.some((selector) => selector.includes(':host'));
-
-  if (hasHost) {
-    return false;
-  }
 
   if (!ensureCompatibility(selectors, browsers, compatibilityCache)) {
     return false;

diff --git a/packages/postcss-merge-rules/src/lib/ensureCompatibility.js b/packages/postcss-merge-rules/src/lib/ensureCompatibility.js
@@ -61,6 +61,10 @@ function isCssMixin(selector) {
   return selector[selector.length - 1] === ':';
 }
 
+function isHostPseudoClass(selector) {
+  return selector.includes(':host');
+}
+
 const isSupportedCache = {};
 
 // Move to util in future
@@ -85,6 +89,11 @@ export default function ensureCompatibility(
   if (selectors.some(isCssMixin)) {
     return false;
   }
+
+  // Should not merge :host selector https://github.com/angular/angular-cli/issues/18672
+  if (selectors.some(isHostPseudoClass)) {
+    return false;
+  }
   return selectors.every((selector) => {
     if (simpleSelectorRe.test(selector)) {
       return true;