postcss-discard-comments 4.0.0-rc.0 → 4.0.2

package/README.md

@@ -103,7 +103,7 @@ examples for your environment.
 
 ## Contributors
 
-See [CONTRIBUTORS.md](https://github.com/ben-eb/cssnano/blob/master/CONTRIBUTORS.md).
+See [CONTRIBUTORS.md](https://github.com/cssnano/cssnano/blob/master/CONTRIBUTORS.md).
 
 
 ## License

package/dist/index.js

@@ -1,53 +1,73 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-var _postcss = require('postcss');
+var _postcss = require("postcss");
 
-var _commentRemover = require('./lib/commentRemover');
+var _commentRemover = require("./lib/commentRemover");
 
 var _commentRemover2 = _interopRequireDefault(_commentRemover);
 
-var _commentParser = require('./lib/commentParser');
+var _commentParser = require("./lib/commentParser");
 
 var _commentParser2 = _interopRequireDefault(_commentParser);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var space = _postcss.list.space;
-exports.default = (0, _postcss.plugin)('postcss-discard-comments', function () {
-    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+const { space } = _postcss.list;
 
-    var remover = new _commentRemover2.default(opts);
+exports.default = (0, _postcss.plugin)("postcss-discard-comments", (opts = {}) => {
+    const remover = new _commentRemover2.default(opts);
+    const matcherCache = {};
+    const replacerCache = {};
 
     function matchesComments(source) {
-        return (0, _commentParser2.default)(source).filter(function (node) {
-            return node.type === 'comment';
-        });
+        if (matcherCache[source]) {
+            return matcherCache[source];
+        }
+
+        const result = (0, _commentParser2.default)(source).filter(([type]) => type);
+
+        matcherCache[source] = result;
+
+        return result;
     }
 
-    function replaceComments(source) {
-        var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ' ';
+    function replaceComments(source, separator = " ") {
+        const key = source + "@|@" + separator;
+
+        if (replacerCache[key]) {
+            return replacerCache[key];
+        }
 
-        var parsed = (0, _commentParser2.default)(source).reduce(function (value, node) {
-            if (node.type !== 'comment') {
-                return value + node.value;
+        const parsed = (0, _commentParser2.default)(source).reduce((value, [type, start, end]) => {
+            const contents = source.slice(start, end);
+
+            if (!type) {
+                return value + contents;
             }
-            if (remover.canRemove(node.value)) {
+
+            if (remover.canRemove(contents)) {
                 return value + separator;
             }
-            return value + '/*' + node.value + '*/';
-        }, '');
 
-        return space(parsed).join(' ');
+            return `${value}/*${contents}*/`;
+        }, "");
+
+        const result = space(parsed).join(" ");
+
+        replacerCache[key] = result;
+
+        return result;
     }
 
-    return function (css) {
-        css.walk(function (node) {
-            if (node.type === 'comment' && remover.canRemove(node.text)) {
+    return css => {
+        css.walk(node => {
+            if (node.type === "comment" && remover.canRemove(node.text)) {
                 node.remove();
+
                 return;
             }
 
@@ -55,37 +75,45 @@ exports.default = (0, _postcss.plugin)('postcss-discard-comments', function () {
                 node.raws.between = replaceComments(node.raws.between);
             }
 
-            if (node.type === 'decl') {
+            if (node.type === "decl") {
                 if (node.raws.value && node.raws.value.raw) {
                     if (node.raws.value.value === node.value) {
                         node.value = replaceComments(node.raws.value.raw);
                     } else {
                         node.value = replaceComments(node.value);
                     }
+
                     node.raws.value = null;
                 }
+
                 if (node.raws.important) {
                     node.raws.important = replaceComments(node.raws.important);
-                    var b = matchesComments(node.raws.important);
-                    node.raws.important = b.length ? node.raws.important : '!important';
+
+                    const b = matchesComments(node.raws.important);
+
+                    node.raws.important = b.length ? node.raws.important : "!important";
                 }
+
                 return;
             }
 
-            if (node.type === 'rule' && node.raws.selector && node.raws.selector.raw) {
-                node.raws.selector.raw = replaceComments(node.raws.selector.raw, '');
+            if (node.type === "rule" && node.raws.selector && node.raws.selector.raw) {
+                node.raws.selector.raw = replaceComments(node.raws.selector.raw, "");
+
                 return;
             }
 
-            if (node.type === 'atrule') {
+            if (node.type === "atrule") {
                 if (node.raws.afterName) {
-                    var commentsReplaced = replaceComments(node.raws.afterName);
+                    const commentsReplaced = replaceComments(node.raws.afterName);
+
                     if (!commentsReplaced.length) {
-                        node.raws.afterName = commentsReplaced + ' ';
+                        node.raws.afterName = commentsReplaced + " ";
                     } else {
-                        node.raws.afterName = ' ' + commentsReplaced + ' ';
+                        node.raws.afterName = " " + commentsReplaced + " ";
                     }
                 }
+
                 if (node.raws.params && node.raws.params.raw) {
                     node.raws.params.raw = replaceComments(node.raws.params.raw);
                 }
@@ -93,4 +121,4 @@ exports.default = (0, _postcss.plugin)('postcss-discard-comments', function () {
         });
     };
 });
-module.exports = exports['default'];
+module.exports = exports["default"];

package/dist/lib/commentParser.js

@@ -5,32 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = commentParser;
 function commentParser(input) {
-    var tokens = [];
-    var length = input.length;
-    var pos = 0;
-    var next = void 0;
+    const tokens = [];
+    const length = input.length;
+    let pos = 0;
+    let next;
 
     while (pos < length) {
         next = input.indexOf('/*', pos);
 
         if (~next) {
-            tokens.push({
-                type: 'other',
-                value: input.slice(pos, next)
-            });
+            tokens.push([0, pos, next]);
             pos = next;
 
             next = input.indexOf('*/', pos + 2);
-            tokens.push({
-                type: 'comment',
-                value: input.slice(pos + 2, next)
-            });
+            tokens.push([1, pos + 2, next]);
             pos = next + 2;
         } else {
-            tokens.push({
-                type: 'other',
-                value: input.slice(pos)
-            });
+            tokens.push([0, pos, length]);
             pos = length;
         }
     }

package/dist/lib/commentRemover.js

@@ -8,11 +8,13 @@ function CommentRemover(options) {
 }
 
 CommentRemover.prototype.canRemove = function (comment) {
-    var remove = this.options.remove;
+    const remove = this.options.remove;
+
     if (remove) {
         return remove(comment);
     } else {
-        var isImportant = comment.indexOf('!') === 0;
+        const isImportant = comment.indexOf('!') === 0;
+
         if (!isImportant) {
             return true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-discard-comments",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.2",
   "description": "Discard comments in your CSS files with PostCSS.",
   "main": "dist/index.js",
   "files": [
@@ -19,24 +19,24 @@
   "license": "MIT",
   "devDependencies": {
     "babel-cli": "^6.0.0",
-    "cross-env": "^3.0.0",
-    "postcss-scss": "^0.3.0",
-    "postcss-simple-vars": "^3.0.0"
+    "cross-env": "^5.0.0",
+    "postcss-scss": "^2.0.0",
+    "postcss-simple-vars": "^5.0.1"
   },
-  "homepage": "https://github.com/ben-eb/cssnano",
+  "homepage": "https://github.com/cssnano/cssnano",
   "author": {
     "name": "Ben Briggs",
     "email": "beneb.info@gmail.com",
     "url": "http://beneb.info"
   },
-  "repository": "ben-eb/cssnano",
+  "repository": "cssnano/cssnano",
   "dependencies": {
-    "postcss": "^6.0.0"
+    "postcss": "^7.0.0"
   },
   "bugs": {
-    "url": "https://github.com/ben-eb/cssnano/issues"
+    "url": "https://github.com/cssnano/cssnano/issues"
   },
   "engines": {
-    "node": ">=4"
+    "node": ">=6.9.0"
   }
 }

package/CHANGELOG.md

@@ -1,75 +0,0 @@
-# 4.0.0-rc.0
-
-* Breaking: Drops support for Node 0.12, we now require at least Node 4.
-* Breaking: Update PostCSS to 6.0.0.
-
-# 2.0.4
-
-* Now compiled with Babel 6.
-
-# 2.0.3
-
-* Fixes an issue where comments that were removed from selectors were replaced
-  by a single space.
-
-# 2.0.2
-
-* Fixes an integration issue where comments inside values transformed by other
-  processors had their values reset to their original state before the
-  comments were removed.
-
-# 2.0.1
-
-* Replaces a dependency on node-balanced with internal comments parser.
-
-# 2.0.0
-
-* Upgraded to PostCSS 5 (thanks to @avanes).
-
-# 1.2.1
-
-* Improved performance by iterating the AST in a single pass.
-
-# 1.2.0
-
-* Adds support for user-directed removal of comments, with the `remove`
-  option (thanks to @dmitrykiselyov).
-* `removeAllButFirst` now operates on each CSS tree, rather than the first one
-  passed to the plugin.
-* Fixes to pass the PostCSS plugin guidelines.
-
-# 1.1.3
-
-* As PostCSS handles the source map content, there is no need to check for
-  the existence of a '#' at position 0 of the comment. This patch fixes this
-  behaviour.
-
-# 1.1.2
-
-* Fixes an issue where comment separated values were being incorrectly
-  transformed to not have spaces separating them instead, in `decl.value`.
-  e.g. `10px/*test*/20px` became `10px20px` in `decl.value` but not
-  `decl._value.raw`.
-
-# 1.1.1
-
-* Fixes a bug where non-special comments, with an exclamation mark in any part
-  of the text, were not being removed.
-
-# 1.1.0
-
-* Now uses the PostCSS `4.1` plugin API.
-* Adds support for transforming comments inside `!important` values.
-
-# 1.0.2
-
-* Adds a JSHint config, tidy up unnecessary lines of code.
-
-# 1.0.1
-
-* Fixed a bug which affected initializing the plugin with no options.
-* Stopped the plugin from trying to match comments in empty strings.
-
-# 1.0.0
-
-* Initial release.