postcss-minify-gradients 4.0.0-rc.0 → 4.0.2

package/README.md

@@ -43,7 +43,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

@@ -16,9 +16,13 @@ var _cssnanoUtilGetArguments = require('cssnano-util-get-arguments');
 
 var _cssnanoUtilGetArguments2 = _interopRequireDefault(_cssnanoUtilGetArguments);
 
+var _isColorStop = require('is-color-stop');
+
+var _isColorStop2 = _interopRequireDefault(_isColorStop);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var angles = {
+const angles = {
     top: '0deg',
     right: '90deg',
     bottom: '180deg',
@@ -26,75 +30,151 @@ var angles = {
 };
 
 function isLessThan(a, b) {
-    return a.unit === b.unit && parseFloat(a.number) >= parseFloat(b.number);
+    return a.unit.toLowerCase() === b.unit.toLowerCase() && parseFloat(a.number) >= parseFloat(b.number);
 }
 
 function optimise(decl) {
-    if (!~decl.value.indexOf('gradient')) {
+    const value = decl.value;
+
+    if (!~value.toLowerCase().indexOf('gradient')) {
         return;
     }
-    decl.value = (0, _postcssValueParser2.default)(decl.value).walk(function (node) {
+
+    decl.value = (0, _postcssValueParser2.default)(value).walk(node => {
         if (node.type !== 'function' || !node.nodes.length) {
             return false;
         }
-        if (node.value === 'linear-gradient' || node.value === 'repeating-linear-gradient' || node.value === '-webkit-linear-gradient' || node.value === '-webkit-repeating-linear-gradient') {
-            var args = (0, _cssnanoUtilGetArguments2.default)(node);
-            if (node.nodes[0].value === 'to' && args[0].length === 3) {
+
+        const lowerCasedValue = node.value.toLowerCase();
+
+        if (lowerCasedValue === 'linear-gradient' || lowerCasedValue === 'repeating-linear-gradient' || lowerCasedValue === '-webkit-linear-gradient' || lowerCasedValue === '-webkit-repeating-linear-gradient') {
+            let args = (0, _cssnanoUtilGetArguments2.default)(node);
+
+            if (node.nodes[0].value.toLowerCase() === 'to' && args[0].length === 3) {
                 node.nodes = node.nodes.slice(2);
-                node.nodes[0].value = angles[node.nodes[0].value];
+                node.nodes[0].value = angles[node.nodes[0].value.toLowerCase()];
             }
-            var lastStop = null;
-            args.forEach(function (arg, index) {
+
+            let lastStop = null;
+
+            args.forEach((arg, index) => {
                 if (!arg[2]) {
                     return;
                 }
-                var isFinalStop = index === args.length - 1;
-                var thisStop = (0, _postcssValueParser.unit)(arg[2].value);
+
+                let isFinalStop = index === args.length - 1;
+                let thisStop = (0, _postcssValueParser.unit)(arg[2].value);
+
                 if (lastStop === null) {
                     lastStop = thisStop;
-                    if (!isFinalStop && lastStop && lastStop.number === '0' && lastStop.unit !== 'deg') {
+
+                    if (!isFinalStop && lastStop && lastStop.number === '0' && lastStop.unit.toLowerCase() !== 'deg') {
                         arg[1].value = arg[2].value = '';
                     }
+
                     return;
                 }
-                if (isLessThan(lastStop, thisStop)) {
+
+                if (lastStop && thisStop && isLessThan(lastStop, thisStop)) {
                     arg[2].value = 0;
                 }
+
                 lastStop = thisStop;
+
                 if (isFinalStop && arg[2].value === '100%') {
                     arg[1].value = arg[2].value = '';
                 }
             });
+
             return false;
         }
-        if (node.value === 'radial-gradient' || node.value === 'repeating-radial-gradient' || node.value === '-webkit-radial-gradient' || node.value === '-webkit-repeating-radial-gradient') {
-            var _args = (0, _cssnanoUtilGetArguments2.default)(node);
-            var _lastStop = void 0;
-            var hasAt = _args[0].find(function (n) {
-                return n.value === 'at';
-            });
-            _args.forEach(function (arg, index) {
+
+        if (lowerCasedValue === 'radial-gradient' || lowerCasedValue === 'repeating-radial-gradient') {
+            let args = (0, _cssnanoUtilGetArguments2.default)(node);
+            let lastStop;
+
+            const hasAt = args[0].find(n => n.value.toLowerCase() === 'at');
+
+            args.forEach((arg, index) => {
                 if (!arg[2] || !index && hasAt) {
                     return;
                 }
-                var thisStop = (0, _postcssValueParser.unit)(arg[2].value);
-                if (!_lastStop) {
-                    _lastStop = thisStop;
+
+                let thisStop = (0, _postcssValueParser.unit)(arg[2].value);
+
+                if (!lastStop) {
+                    lastStop = thisStop;
+
+                    return;
+                }
+
+                if (lastStop && thisStop && isLessThan(lastStop, thisStop)) {
+                    arg[2].value = 0;
+                }
+
+                lastStop = thisStop;
+            });
+
+            return false;
+        }
+
+        if (lowerCasedValue === '-webkit-radial-gradient' || lowerCasedValue === '-webkit-repeating-radial-gradient') {
+            let args = (0, _cssnanoUtilGetArguments2.default)(node);
+            let lastStop;
+
+            args.forEach(arg => {
+                let color;
+                let stop;
+
+                if (arg[2] !== undefined) {
+                    if (arg[0].type === 'function') {
+                        color = `${arg[0].value}(${(0, _postcssValueParser.stringify)(arg[0].nodes)})`;
+                    } else {
+                        color = arg[0].value;
+                    }
+
+                    if (arg[2].type === 'function') {
+                        stop = `${arg[2].value}(${(0, _postcssValueParser.stringify)(arg[2].nodes)})`;
+                    } else {
+                        stop = arg[2].value;
+                    }
+                } else {
+                    if (arg[0].type === 'function') {
+                        color = `${arg[0].value}(${(0, _postcssValueParser.stringify)(arg[0].nodes)})`;
+                    }
+
+                    color = arg[0].value;
+                }
+
+                color = color.toLowerCase();
+
+                const colorStop = stop || stop === 0 ? (0, _isColorStop2.default)(color, stop.toLowerCase()) : (0, _isColorStop2.default)(color);
+
+                if (!colorStop || !arg[2]) {
+                    return;
+                }
+
+                let thisStop = (0, _postcssValueParser.unit)(arg[2].value);
+
+                if (!lastStop) {
+                    lastStop = thisStop;
+
                     return;
                 }
-                if (isLessThan(_lastStop, thisStop)) {
+
+                if (lastStop && thisStop && isLessThan(lastStop, thisStop)) {
                     arg[2].value = 0;
                 }
-                _lastStop = thisStop;
+
+                lastStop = thisStop;
             });
+
             return false;
         }
     }).toString();
 }
 
-exports.default = _postcss2.default.plugin('postcss-minify-gradients', function () {
-    return function (css) {
-        return css.walkDecls(optimise);
-    };
+exports.default = _postcss2.default.plugin('postcss-minify-gradients', () => {
+    return css => css.walkDecls(optimise);
 });
 module.exports = exports['default'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-minify-gradients",
-  "version": "4.0.0-rc.0",
+  "version": "4.0.2",
   "description": "Minify gradient parameters with PostCSS.",
   "main": "dist/index.js",
   "scripts": {
@@ -18,24 +18,25 @@
   "license": "MIT",
   "devDependencies": {
     "babel-cli": "^6.0.0",
-    "cross-env": "^3.0.0"
+    "cross-env": "^5.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": {
-    "cssnano-util-get-arguments": "^4.0.0-rc.0",
-    "postcss": "^6.0.0",
+    "cssnano-util-get-arguments": "^4.0.0",
+    "is-color-stop": "^1.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,34 +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.
-* Better handling of color stop positions in radial gradients, the module now
-  correctly accounts for the first set of parameters potentially being
-  directional and not stop values.
-
-# 1.0.5
-
-* Resolves a crash on empty `linear-gradient()` functions.
-
-# 1.0.4
-
-* Resolves an issue where `0` was being removed from intermediate colour stops
-  if preceding colour stops contained `calc()` (thanks to @jaybekster).
-
-# 1.0.3
-
-* Resolves an issue where `0` was being incorrectly stripped from the final
-  colour stop value.
-
-# 1.0.2
-
-* Resolves an issue where the module would incorrectly parse floating
-  point numbers.
-
-# 1.0.1
-
-* Reduce function iterations (thanks to @TrySound).
-
-# 1.0.0
-
-* Initial release.