Merge pull request #241 from samzlab/hotfix/selector-regexp-fix

Hotfix/selector regexp fix
FullHuman · Dec 8, 2019 · bc78298 · bc78298
2 parents a7da401 + 7c10f47
commit bc78298
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 10 deletions.
diff --git a/__tests__/purgecss.test.js b/__tests__/purgecss.test.js
@@ -392,6 +392,9 @@ describe('nth-child', () => {
     })
     it('finds some-item:nth-child(2n+1)', () => {
         expect(purgecssResult.includes('some-item:nth-child(2n+1)')).toBe(true)
+	})
+	it('removes canvas (contains "n")', () => {
+        expect(purgecssResult.includes('canvas')).toBe(false)
     })
 })
 

diff --git a/__tests__/test_examples/nth_child/nth_child.css b/__tests__/test_examples/nth_child/nth_child.css
@@ -4,3 +4,6 @@
 .some-item:nth-child(2n+1){
   color: blue
 }
+canvas {
+  display: none
+}
diff --git a/__tests__/test_examples/nth_child/nth_child.html b/__tests__/test_examples/nth_child/nth_child.html
@@ -3,4 +3,4 @@
 <div class="some-item">
 </div>
 <div class="some-item">
-</div>
+</div>
diff --git a/lib/purgecss.es.js b/lib/purgecss.es.js
@@ -355,6 +355,8 @@ var CSS_WHITELIST = ['*', '::-webkit-scrollbar', '::selection', ':root', '::befo
 
 var SELECTOR_STANDARD_TYPES = ['class', 'id', 'universal', 'pseudo'];
 
+var IS_NTH = /^:nth-/;
+
 var Purgecss =
 /*#__PURE__*/
 function () {
@@ -825,8 +827,8 @@ function () {
 
                 if (SELECTOR_STANDARD_TYPES.includes(type) && typeof value !== 'undefined') {
                   selectorsInRule.push(value);
-                } else if (type === 'tag' && !/[+]|n|-|(even)|(odd)|^from$|^to$|^\d/.test(value)) {
-                  // test if we do not have a pseudo class parameter (e.g. 2n in :nth-child(2n))
+                } else if (type === 'tag' && !( // skip everything inside :nth-* pseudo selectors
+                selector.parent && selector.parent.type === 'pseudo' && IS_NTH.test(selector.parent.value))) {
                   selectorsInRule.push(value);
                 }
               }

diff --git a/lib/purgecss.js b/lib/purgecss.js
@@ -359,6 +359,8 @@ var CSS_WHITELIST = ['*', '::-webkit-scrollbar', '::selection', ':root', '::befo
 
 var SELECTOR_STANDARD_TYPES = ['class', 'id', 'universal', 'pseudo'];
 
+var IS_NTH = /^:nth-/;
+
 var Purgecss =
 /*#__PURE__*/
 function () {
@@ -829,8 +831,8 @@ function () {
 
                 if (SELECTOR_STANDARD_TYPES.includes(type) && typeof value !== 'undefined') {
                   selectorsInRule.push(value);
-                } else if (type === 'tag' && !/[+]|n|-|(even)|(odd)|^from$|^to$|^\d/.test(value)) {
-                  // test if we do not have a pseudo class parameter (e.g. 2n in :nth-child(2n))
+                } else if (type === 'tag' && !( // skip everything inside :nth-* pseudo selectors
+                selector.parent && selector.parent.type === 'pseudo' && IS_NTH.test(selector.parent.value))) {
                   selectorsInRule.push(value);
                 }
               }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purgecss",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Remove unused css selectors.",
   "main": "./lib/purgecss.js",
   "module": "./lib/purgecss.es.js",

diff --git a/src/index.js b/src/index.js
@@ -26,6 +26,8 @@ import {
 import CSS_WHITELIST from './constants/cssWhitelist'
 import SELECTOR_STANDARD_TYPES from './constants/selectorTypes'
 
+const IS_NTH = /^:nth-/;
+
 class Purgecss {
     options: Options
     root: Object
@@ -317,7 +319,8 @@ class Purgecss {
             return
         }
 
-        let keepSelector = true
+		let keepSelector = true
+
         node.selector = selectorParser(selectorsParsed => {
             selectorsParsed.walk(selector => {
                 const selectorsInRule = []
@@ -331,16 +334,20 @@ class Purgecss {
                         return
                     }
                     for (const { type, value } of selector.nodes) {
+
                         if (
                             SELECTOR_STANDARD_TYPES.includes(type) &&
                             typeof value !== 'undefined'
                         ) {
                             selectorsInRule.push(value)
                         } else if (
-                            type === 'tag' &&
-                            !/[+]|n|-|(even)|(odd)|^from$|^to$|^\d/.test(value)
+							type === 'tag' &&
+							!( // skip everything inside :nth-* pseudo selectors
+								selector.parent &&
+								selector.parent.type === 'pseudo' &&
+								IS_NTH.test(selector.parent.value)
+							)
                         ) {
-                            // test if we do not have a pseudo class parameter (e.g. 2n in :nth-child(2n))
                             selectorsInRule.push(value)
                         }
                     }