v1.3.0

FullHuman · Apr 20, 2019 · fbac428 · fbac428
1 parent 8815852
commit fbac428
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+# v1.3.0 - 2019-04-20
+
+* Merged https://github.com/FullHuman/purgecss/pull/183, adding `defaultExtractor` option
+* remove ignore comment once purged, issue https://github.com/FullHuman/purgecss/issues/121
+
 # v1.2.0 - 2019-04-05
 
 * fix issue https://github.com/FullHuman/purgecss/issues/148, so the default extract is used for any file type that is not specified

diff --git a/__tests__/purgecss.test.js b/__tests__/purgecss.test.js
@@ -366,7 +366,7 @@ describe('special characters, overriding the default Extractor with a function',
         purgecssResult = new Purgecss({
             content: [`${root}special_characters/special_characters.js`],
             css: [`${root}special_characters/special_characters.css`],
-            defaultExtractor: content => content.match(/[A-z0-9-:/]+/g),
+            defaultExtractor: content => content.match(/[A-z0-9-:/]+/g)
         }).purge()[0].css
     })
 

diff --git a/__tests__/purgecssDefault.test.js b/__tests__/purgecssDefault.test.js
@@ -217,7 +217,6 @@ describe('purge methods with files and default extractor', () => {
         })
 
         it('removes the comment', () => {
-            console.log(purgecssResult)
             expect(purgecssResult.includes('/* purgecss ignore */')).toBe(false)
         })
     })
@@ -242,7 +241,6 @@ describe('purge methods with files and default extractor', () => {
         })
 
         it('removes the comments', () => {
-            console.log(purgecssResult)
             expect(purgecssResult.includes('/* purgecss start ignore */')).toBe(false)
             expect(purgecssResult.includes('/* purgecss end ignore */')).toBe(false)
         })
@@ -399,7 +397,6 @@ describe('purge methods with files and default extractor', () => {
                 ],
                 keyframes: false
             }).purge()[0].css
-            // console.log(purgecssResult)
         })
         it('keeps `99.9%`', () => {
             expect(purgecssResult.includes('99.9%')).toBe(true)

diff --git a/lib/purgecss.es.js b/lib/purgecss.es.js
@@ -752,7 +752,15 @@ function () {
         }
 
         if (node.type === 'comment') {
-          if (_this.isIgnoreAnnotation(node, 'start')) _this.ignore = true;else if (_this.isIgnoreAnnotation(node, 'end')) _this.ignore = false;
+          if (_this.isIgnoreAnnotation(node, 'start')) {
+            _this.ignore = true; // remove ignore annotation
+
+            node.remove();
+          } else if (_this.isIgnoreAnnotation(node, 'end')) {
+            _this.ignore = false; // remove ignore annotation
+
+            node.remove();
+          }
         }
       });
     }
@@ -768,7 +776,13 @@ function () {
       var _this2 = this;
 
       var annotation = node.prev();
-      if (this.isIgnoreAnnotation(annotation, 'next') || this.ignore === true) return;
+      if (this.ignore) return;
+
+      if (typeof annotation !== 'undefined' && annotation.type === 'comment' && this.isIgnoreAnnotation(annotation, 'next')) {
+        annotation.remove();
+        return;
+      }
+
       var keepSelector = true;
       node.selector = selectorParser(function (selectorsParsed) {
         selectorsParsed.walk(function (selector) {

diff --git a/lib/purgecss.js b/lib/purgecss.js
@@ -756,7 +756,15 @@ function () {
         }
 
         if (node.type === 'comment') {
-          if (_this.isIgnoreAnnotation(node, 'start')) _this.ignore = true;else if (_this.isIgnoreAnnotation(node, 'end')) _this.ignore = false;
+          if (_this.isIgnoreAnnotation(node, 'start')) {
+            _this.ignore = true; // remove ignore annotation
+
+            node.remove();
+          } else if (_this.isIgnoreAnnotation(node, 'end')) {
+            _this.ignore = false; // remove ignore annotation
+
+            node.remove();
+          }
         }
       });
     }
@@ -772,7 +780,13 @@ function () {
       var _this2 = this;
 
       var annotation = node.prev();
-      if (this.isIgnoreAnnotation(annotation, 'next') || this.ignore === true) return;
+      if (this.ignore) return;
+
+      if (typeof annotation !== 'undefined' && annotation.type === 'comment' && this.isIgnoreAnnotation(annotation, 'next')) {
+        annotation.remove();
+        return;
+      }
+
       var keepSelector = true;
       node.selector = selectorParser(function (selectorsParsed) {
         selectorsParsed.walk(function (selector) {

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