postcss-colormin 4.0.0-rc.2 → 4.0.3

package/README.md

@@ -34,7 +34,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/colours.js

@@ -18,30 +18,59 @@ var _toShorthand2 = _interopRequireDefault(_toShorthand);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var shorter = function shorter(a, b) {
-    return (a && a.length < b.length ? a : b).toLowerCase();
-};
+const shorter = (a, b) => (a && a.length < b.length ? a : b).toLowerCase();
 
-exports.default = function (colour) {
-    var legacy = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+exports.default = (colour, isLegacy = false, cache = false) => {
+    const key = colour + "|" + isLegacy;
+
+    if (cache && cache[key]) {
+        return cache[key];
+    }
 
     try {
-        var parsed = (0, _color2.default)(colour.toLowerCase());
-        var alpha = parsed.alpha();
+        const parsed = (0, _color2.default)(colour.toLowerCase());
+        const alpha = parsed.alpha();
+
         if (alpha === 1) {
-            var toHex = (0, _toShorthand2.default)(parsed.hex().toLowerCase());
-            return shorter(_keywords2.default[toHex], toHex);
+            const toHex = (0, _toShorthand2.default)(parsed.hex().toLowerCase());
+            const result = shorter(_keywords2.default[toHex], toHex);
+
+            if (cache) {
+                cache[key] = result;
+            }
+
+            return result;
         } else {
-            var rgb = parsed.rgb();
-            if (!legacy && !rgb.color[0] && !rgb.color[1] && !rgb.color[2] && !alpha) {
-                return 'transparent';
+            const rgb = parsed.rgb();
+
+            if (!isLegacy && !rgb.color[0] && !rgb.color[1] && !rgb.color[2] && !alpha) {
+                const result = 'transparent';
+
+                if (cache) {
+                    cache[key] = result;
+                }
+
+                return result;
+            }
+
+            let hsla = parsed.hsl().string();
+            let rgba = rgb.string();
+            let result = hsla.length < rgba.length ? hsla : rgba;
+
+            if (cache) {
+                cache[key] = result;
             }
-            var hsla = parsed.hsl().round().string();
-            var rgba = rgb.string();
-            return hsla.length < rgba.length ? hsla : rgba;
+
+            return result;
         }
     } catch (e) {
         // Possibly malformed, so pass through
-        return colour;
+        const result = colour;
+
+        if (cache) {
+            cache[key] = result;
+        }
+
+        return result;
     }
 };

package/dist/index.js

@@ -1,62 +1,37 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-var _browserslist = require('browserslist');
+var _browserslist = require("browserslist");
 
 var _browserslist2 = _interopRequireDefault(_browserslist);
 
-var _postcss = require('postcss');
+var _postcss = require("postcss");
 
 var _postcss2 = _interopRequireDefault(_postcss);
 
-var _postcssValueParser = require('postcss-value-parser');
+var _postcssValueParser = require("postcss-value-parser");
 
 var _postcssValueParser2 = _interopRequireDefault(_postcssValueParser);
 
-var _colours = require('./colours');
+var _colours = require("./colours");
 
 var _colours2 = _interopRequireDefault(_colours);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function walk(parent, callback) {
-    parent.nodes.forEach(function (node, index) {
-        var bubble = callback(node, index, parent);
+    parent.nodes.forEach((node, index) => {
+        const bubble = callback(node, index, parent);
+
         if (node.nodes && bubble !== false) {
             walk(node, callback);
         }
     });
 }
 
-function transform(legacy, decl) {
-    if (/^(composes|font|filter|-webkit-tap-highlight-color)/i.test(decl.prop)) {
-        return;
-    }
-    var ast = (0, _postcssValueParser2.default)(decl.value);
-    walk(ast, function (node, index, parent) {
-        if (node.type === 'function') {
-            if (/^(rgb|hsl)a?$/.test(node.value)) {
-                var value = node.value;
-
-                node.value = (0, _colours2.default)((0, _postcssValueParser.stringify)(node), legacy);
-                node.type = 'word';
-                var next = parent.nodes[index + 1];
-                if (node.value !== value && next && next.type === 'word') {
-                    parent.nodes.splice(index + 1, 0, { type: 'space', value: ' ' });
-                }
-            } else if (node.value === 'calc') {
-                return false;
-            }
-        } else if (node.type === 'word') {
-            node.value = (0, _colours2.default)(node.value, legacy);
-        }
-    });
-    decl.value = ast.toString();
-}
-
 /*
  * IE 8 & 9 do not properly handle clicks on elements
  * with a `transparent` `background-color`.
@@ -65,17 +40,62 @@ function transform(legacy, decl) {
  */
 
 function hasTransparentBug(browser) {
-    return ~['ie 8', 'ie 9'].indexOf(browser);
+    return ~["ie 8", "ie 9"].indexOf(browser);
 }
 
-exports.default = _postcss2.default.plugin('postcss-colormin', function () {
-    return function (css, result) {
-        var resultOpts = result.opts || {};
-        var browsers = (0, _browserslist2.default)(null, {
+exports.default = _postcss2.default.plugin("postcss-colormin", () => {
+    return (css, result) => {
+        const resultOpts = result.opts || {};
+        const browsers = (0, _browserslist2.default)(null, {
             stats: resultOpts.stats,
             path: __dirname,
             env: resultOpts.env
         });
-        css.walkDecls(transform.bind(null, browsers.some(hasTransparentBug)));
+        const isLegacy = browsers.some(hasTransparentBug);
+        const colorminCache = {};
+        const cache = {};
+
+        css.walkDecls(decl => {
+            if (/^(composes|font|filter|-webkit-tap-highlight-color)/i.test(decl.prop)) {
+                return;
+            }
+
+            if (cache[decl.value]) {
+                decl.value = cache[decl.value];
+
+                return;
+            }
+
+            const parsed = (0, _postcssValueParser2.default)(decl.value);
+
+            walk(parsed, (node, index, parent) => {
+                if (node.type === "function") {
+                    if (/^(rgb|hsl)a?$/i.test(node.value)) {
+                        const { value } = node;
+
+                        node.value = (0, _colours2.default)((0, _postcssValueParser.stringify)(node), isLegacy, colorminCache);
+                        node.type = "word";
+
+                        const next = parent.nodes[index + 1];
+
+                        if (node.value !== value && next && (next.type === "word" || next.type === "function")) {
+                            parent.nodes.splice(index + 1, 0, {
+                                type: "space",
+                                value: " "
+                            });
+                        }
+                    } else if (node.value.toLowerCase() === "calc") {
+                        return false;
+                    }
+                } else if (node.type === "word") {
+                    node.value = (0, _colours2.default)(node.value, isLegacy, colorminCache);
+                }
+            });
+
+            const optimizedValue = parsed.toString();
+
+            decl.value = optimizedValue;
+            cache[decl.value] = optimizedValue;
+        });
     };
 });

package/dist/lib/toShorthand.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-exports.default = function (hex) {
+exports.default = hex => {
     if (hex[1] === hex[2] && hex[3] === hex[4] && hex[5] === hex[6]) {
         return '#' + hex[2] + hex[4] + hex[6];
     }
+
     return hex;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-colormin",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.3",
   "description": "Minify colors in your CSS files with PostCSS.",
   "main": "dist/index.js",
   "files": [
@@ -22,28 +22,28 @@
   "license": "MIT",
   "devDependencies": {
     "babel-cli": "^6.0.0",
-    "cross-env": "^3.0.0",
+    "cross-env": "^5.0.0",
     "css-color-names": "0.0.4",
     "write-file": "^1.0.0"
   },
-  "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": {
-    "browserslist": "^2.0.0",
-    "color": "^1.0.0",
+    "browserslist": "^4.0.0",
+    "color": "^3.0.0",
     "has": "^1.0.0",
-    "postcss": "^6.0.0",
+    "postcss": "^7.0.0",
     "postcss-value-parser": "^3.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,122 +0,0 @@
-# 4.0.0-rc.0
-
-* Breaking: Drops support for Node 0.12, we now require at least Node 4.
-* Breaking: Drops the `legacy` option which was used to provide support for
-  legacy IE versions. It has been superseded by using Browserslist to supply
-  a list of browsers; we recommend using the config file as the same values will
-  be propagated to other cssnano plugins which have the same functionality.
-  See https://github.com/ai/browserslist#config-file for more details.
-* Breaking: Update PostCSS to 6.0.0.
-* postcss-colormin will now no longer handle integer or whitespace compression;
-  it's now delegated to postcss-normalize-whitespace & postcss-convert-values.
-  We re-integrated colormin back into this module so that it would be clearer
-  what postcss-colormin's responsibilities are; which are to facilitate
-  conversion between identical colors.
-
-# 2.2.2
-
-* Resolves an issue where the module would mangle the non-standard `composes`
-  property when consumed via css-loader.
-
-# 2.2.1
-
-* Resolves an issue where converting an rgb/hsl function next to another token,
-  such as `linear-gradient(rgb(10, 10, 10)0%, blue)` would result in a
-  mangled value.
-
-# 2.2.0
-
-* Adds support for legacy IE versions (< 10).
-
-# 2.1.8
-
-* Fixes incorrect minification of percentages used by `rgb` functions; i.e.
-  `rgb(100%,100%,100%)` was not converted correctly to `#fff`.
-
-# 2.1.7
-
-* Fixes another regression where `hsla(0,0%,100%,.5)` was converted to
-  `hsla(0,0%,100%,0.5)`.
-
-# 2.1.6
-
-* Fixes a regression where codes for `rgba` & `hsla` were not correctly
-  capped at minimum/maximum values.
-
-# 2.1.5
-
-* Fixes several regressions from 2.1.3 - shorthand hex color minification,
-  incorrect conversion to `transparent` from `rgba(255, 255, 255, 0)`
-  (thanks to @TrySound).
-
-# 2.1.4
-
-* Fixes an error in the last patch where the `lib` directory was ignored by npm.
-
-# 2.1.3
-
-* Updates postcss-value-parser to version 3 (thanks to @TrySound).
-* Removes the dependency on colormin, conversion is now done in-module.
-
-# 2.1.2
-
-* Removed an unnecessary `trim` method that was used to work around a now
-  resolved issue in PostCSS (thanks to @TrySound).
-
-# 2.1.1
-
-* Fixed a regression that was compressing space around forward slashes in
-  calc functions.
-
-# 2.1.0
-
-* Better support for minifying colors in legacy CSS gradients, switched to
-  postcss-value-parser (thanks to @TrySound).
-
-# 2.0.0
-
-* Upgraded to PostCSS 5.
-
-# 1.2.7
-
-* Fixes an issue where IE filter properties were being converted
-  erroneously (thanks to @faddee).
-
-# 1.2.6
-
-* Fixed a crash when specifying `inherit` as a value
-  to `-webkit-tap-highlight-color`.
-
-# 1.2.5
-
-* Speed up node iteration by calling `eachDecl` once rather than twice.
-
-# 1.2.4
-
-* Fixed an issue caused by upgrading colormin to use ES6.
-
-# 1.2.3
-
-* Fixed an issue where `-webkit-tap-highlight-color` was being incorrectly
-  transformed to `transparent`. This is not supported in Safari.
-
-# 1.2.2
-
-* Fixed a bug where the module crashed on parsing comma separated values for
-  properties such as `box-shadow`.
-
-# 1.2.1
-
-* Extracted each color logic into a function for better readability.
-
-# 1.2.0
-
-* Now uses the PostCSS `4.1` plugin API.
-
-# 1.1.0
-
-* Now supports optimisation of colors in gradient values.
-
-# 1.0.0
-
-* Initial release.