postcss-minify-params 4.0.0-rc.1 → 4.0.2

package/README.md

@@ -28,12 +28,12 @@ See [PostCSS] docs for 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
 
 MIT © [Bogdan Chadkin](mailto:trysound@yandex.ru)
 
 [PostCSS]: https://github.com/postcss/postcss
-[ci-img]:  https://travis-ci.org/ben-eb/postcss-minify-params.svg
-[ci]:      https://travis-ci.org/ben-eb/postcss-minify-params
+[ci-img]:  https://travis-ci.org/cssnano/postcss-minify-params.svg
+[ci]:      https://travis-ci.org/cssnano/postcss-minify-params

package/dist/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+var _browserslist = require('browserslist');
+
+var _browserslist2 = _interopRequireDefault(_browserslist);
 
 var _postcss = require('postcss');
 
@@ -38,15 +40,13 @@ function gcd(a, b) {
 }
 
 function aspectRatio(a, b) {
-    var divisor = gcd(a, b);
+    const divisor = gcd(a, b);
 
     return [a / divisor, b / divisor];
 }
 
 function split(args) {
-    return args.map(function (arg) {
-        return (0, _postcssValueParser.stringify)(arg);
-    }).join('');
+    return args.map(arg => (0, _postcssValueParser.stringify)(arg)).join('');
 }
 
 function removeNode(node) {
@@ -54,25 +54,22 @@ function removeNode(node) {
     node.type = 'word';
 }
 
-function transform(rule) {
-    // We should not re-arrange parameters for css-modules' @value
-    // at-rule. For example:
-    //
-    // @value vertical, center from "./foo.css";
-    if (!rule.params || rule.name === 'value') {
+function transform(legacy, rule) {
+    const ruleName = rule.name.toLowerCase();
+
+    // We should re-arrange parameters only for `@media` and `@supports` at-rules
+    if (!rule.params || !["media", "supports"].includes(ruleName)) {
         return;
     }
 
-    var params = (0, _postcssValueParser2.default)(rule.params);
+    const params = (0, _postcssValueParser2.default)(rule.params);
 
-    params.walk(function (node, index) {
+    params.walk((node, index) => {
         if (node.type === 'div' || node.type === 'function') {
             node.before = node.after = '';
-            if (node.type === 'function' && node.nodes[4] && node.nodes[0].value.indexOf('-aspect-ratio') === 3) {
-                var _aspectRatio = aspectRatio(node.nodes[2].value, node.nodes[4].value),
-                    _aspectRatio2 = _slicedToArray(_aspectRatio, 2),
-                    a = _aspectRatio2[0],
-                    b = _aspectRatio2[1];
+
+            if (node.type === 'function' && node.nodes[4] && node.nodes[0].value.toLowerCase().indexOf('-aspect-ratio') === 3) {
+                const [a, b] = aspectRatio(node.nodes[2].value, node.nodes[4].value);
 
                 node.nodes[2].value = a;
                 node.nodes[4].value = b;
@@ -80,17 +77,23 @@ function transform(rule) {
         } else if (node.type === 'space') {
             node.value = ' ';
         } else {
-            var prevWord = params.nodes[index - 2];
-            if (node.value === 'all' && rule.name === 'media' && !prevWord) {
-                var nextSpace = params.nodes[index + 1];
-                var nextWord = params.nodes[index + 2];
-                var secondSpace = params.nodes[index + 3];
-                if (nextWord && nextWord.value === 'and') {
+            const prevWord = params.nodes[index - 2];
+
+            if (node.value.toLowerCase() === 'all' && rule.name.toLowerCase() === 'media' && !prevWord) {
+                const nextWord = params.nodes[index + 2];
+
+                if (!legacy || nextWord) {
+                    removeNode(node);
+                }
+
+                if (nextWord && nextWord.value.toLowerCase() === 'and') {
+                    const nextSpace = params.nodes[index + 1];
+                    const secondSpace = params.nodes[index + 3];
+
                     removeNode(nextWord);
                     removeNode(nextSpace);
                     removeNode(secondSpace);
                 }
-                removeNode(node);
             }
         }
     }, true);
@@ -104,9 +107,20 @@ function transform(rule) {
     }
 }
 
-exports.default = _postcss2.default.plugin('postcss-minify-params', function () {
-    return function (css) {
-        return css.walkAtRules(transform);
+function hasAllBug(browser) {
+    return ~['ie 10', 'ie 11'].indexOf(browser);
+}
+
+exports.default = _postcss2.default.plugin('postcss-minify-params', () => {
+    return (css, result) => {
+        const resultOpts = result.opts || {};
+        const browsers = (0, _browserslist2.default)(null, {
+            stats: resultOpts.stats,
+            path: __dirname,
+            env: resultOpts.env
+        });
+
+        return css.walkAtRules(transform.bind(null, browsers.some(hasAllBug)));
     };
 });
 module.exports = exports['default'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-minify-params",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.2",
   "description": "Minify at-rule params with PostCSS",
   "keywords": [
     "postcss",
@@ -16,15 +16,16 @@
   ],
   "author": "Bogdan Chadkin <trysound@yandex.ru>",
   "license": "MIT",
-  "repository": "ben-eb/cssnano",
+  "repository": "cssnano/cssnano",
   "bugs": {
-    "url": "https://github.com/ben-eb/cssnano/issues"
+    "url": "https://github.com/cssnano/cssnano/issues"
   },
-  "homepage": "https://github.com/ben-eb/cssnano",
+  "homepage": "https://github.com/cssnano/cssnano",
   "dependencies": {
     "alphanum-sort": "^1.0.0",
-    "cssnano-util-get-arguments": "^4.0.0-rc.0",
-    "postcss": "^6.0.0",
+    "browserslist": "^4.0.0",
+    "cssnano-util-get-arguments": "^4.0.0",
+    "postcss": "^7.0.0",
     "postcss-value-parser": "^3.0.0",
     "uniqs": "^2.0.0"
   },
@@ -33,9 +34,9 @@
   },
   "devDependencies": {
     "babel-cli": "^6.0.0",
-    "cross-env": "^3.0.0"
+    "cross-env": "^5.0.0"
   },
   "engines": {
-    "node": ">=4"
+    "node": ">=6.9.0"
   }
 }

package/CHANGELOG.md

@@ -1,36 +0,0 @@
-# Head
-
-* Resolves an issue with mangling css-modules' `@value` at-rule.
-
-# 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.
-
-# 1.2.2
-
-* Resolves an issue where `all and` would be removed from
-  `@media not all and (conditions) {}`, causing an invalid media query to
-  be output.
-
-# 1.2.1
-
-* Resolves an issue where `1.2.0` would throw on empty function parentheses.
-
-# 1.2.0
-
-* Adds support for simplifying `min-aspect-ratio` and `max-aspect-ratio`. For
-  example, `@media (min-aspect-ratio: 1280/720) {}` can be minified to
-  `@media (min-aspect-ratio:16/9){}`.
-
-# 1.1.0
-
-* Adds support for removing the unnecessary `all and` from media queries.
-
-# 1.0.1
-
-* Refactor to ES6.
-
-# 1.0.0
-
-* Initial release.