fix: 修复exclude失效的bug

ben-lau · Jul 26, 2024 · 7129d99 · 7129d99
1 parent eee6da9
commit 7129d99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -203,11 +203,11 @@ var converter = function converter() {
       var remRootValue = baseSize.rem;
       var vwRootValue = baseSize.vw;
       remReplace = createPxReplacer(remRootValue, minPixelValue, unitPrecision, 'rem');
-      vwReplace = createPxReplacer(vwRootValue, minPixelValue, unitPrecision, 'vw'); // whole file
+      vwReplace = createPxReplacer(vwRootValue, minPixelValue, unitPrecision, 'vw'); // whole file, when exclude match this whole file, skip the comment marker
 
-      isExcludeFile = css.nodes.some(function (item) {
+      isExcludeFile || (isExcludeFile = css.nodes.some(function (item) {
         return item.type === 'comment' && item.text.trim() === commentOfDisableAll;
-      }); // not convert rem
+      })); // not convert rem
 
       if (isExcludeFile || css.nodes.some(function (item) {
         return item.type === 'comment' && item.text.trim() === commentOfDisableRem;

diff --git a/src/index.js b/src/index.js
@@ -165,8 +165,8 @@ const converter = (options = {}) => {
         'vw'
       );
 
-      // whole file
-      isExcludeFile = css.nodes.some(
+      // whole file, when exclude match this whole file, skip the comment marker
+      isExcludeFile ||= css.nodes.some(
         item =>
           item.type === 'comment' && item.text.trim() === commentOfDisableAll
       );