postcss-colormin 5.1.0 → 5.2.2

package/dist/index.js

@@ -7,9 +7,11 @@ exports.default = void 0;
 
 var _browserslist = _interopRequireDefault(require("browserslist"));
 
+var _caniuseApi = require("caniuse-api");
+
 var _postcssValueParser = _interopRequireWildcard(require("postcss-value-parser"));
 
-var _colours = _interopRequireDefault(require("./colours"));
+var _minifyColor = _interopRequireDefault(require("./minifyColor"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -46,7 +48,7 @@ function isMathFunctionNode(node) {
   return ['calc', 'min', 'max', 'clamp'].includes(node.value.toLowerCase());
 }
 
-function transform(value, isLegacy) {
+function transform(value, options) {
   const parsed = (0, _postcssValueParser.default)(value);
   walk(parsed, (node, index, parent) => {
     if (node.type === 'function') {
@@ -54,7 +56,7 @@ function transform(value, isLegacy) {
         const {
           value: originalValue
         } = node;
-        node.value = (0, _colours.default)((0, _postcssValueParser.stringify)(node), isLegacy);
+        node.value = (0, _minifyColor.default)((0, _postcssValueParser.stringify)(node), options);
         node.type = 'word';
         const next = parent.nodes[index + 1];
 
@@ -68,25 +70,38 @@ function transform(value, isLegacy) {
         return false;
       }
     } else if (node.type === 'word') {
-      node.value = (0, _colours.default)(node.value, isLegacy);
+      node.value = (0, _minifyColor.default)(node.value, options);
     }
   });
   return parsed.toString();
 }
 
-function pluginCreator() {
+function addPluginDefaults(options, browsers) {
+  const defaults = {
+    transparent: browsers.some(hasTransparentBug) === false,
+    // Does the browser support 4 & 8 character hex notation
+    alphaHex: (0, _caniuseApi.isSupported)('css-rrggbbaa', browsers),
+    // Does the browser support "transparent" value properly
+    name: true
+  };
+  return { ...defaults,
+    ...options
+  };
+}
+
+function pluginCreator(config = {}) {
   return {
     postcssPlugin: 'postcss-colormin',
 
     prepare(result) {
-      const resultOpts = result.opts || {};
+      const resultOptions = result.opts || {};
       const browsers = (0, _browserslist.default)(null, {
-        stats: resultOpts.stats,
+        stats: resultOptions.stats,
         path: __dirname,
-        env: resultOpts.env
+        env: resultOptions.env
       });
-      const isLegacy = browsers.some(hasTransparentBug);
       const cache = {};
+      const options = addPluginDefaults(config, browsers);
       return {
         OnceExit(css) {
           css.walkDecls(decl => {
@@ -100,14 +115,18 @@ function pluginCreator() {
               return;
             }
 
-            const cacheKey = value + '|' + isLegacy;
+            const cacheKey = JSON.stringify({
+              value,
+              options,
+              browsers
+            });
 
             if (cache[cacheKey]) {
               decl.value = cache[cacheKey];
               return;
             }
 
-            const newValue = transform(value, isLegacy);
+            const newValue = transform(value, options);
             decl.value = newValue;
             cache[cacheKey] = newValue;
           });

package/dist/minifyColor.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = minifyColor;
+
+var _colord = require("colord");
+
+var _names = _interopRequireDefault(require("colord/plugins/names"));
+
+var _minify = _interopRequireDefault(require("colord/plugins/minify"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+(0, _colord.extend)([_names.default, _minify.default]);
+/**
+ * Performs color value minification
+ *
+ * @param {string} input - CSS value
+ * @param {boolean} options - object with colord.minify() options
+ */
+
+function minifyColor(input, options = {}) {
+  const instance = (0, _colord.colord)(input);
+
+  if (instance.isValid()) {
+    // Try to shorten the string if it is a valid CSS color value
+    const minified = instance.minify(options); // Fall back to the original input if it's smaller or has equal length
+
+    return minified.length < input.length ? minified : input.toLowerCase();
+  } else {
+    // Possibly malformed, so pass through
+    return input;
+  }
+}
+
+module.exports = exports.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-colormin",
-  "version": "5.1.0",
+  "version": "5.2.2",
   "description": "Minify colors in your CSS files with PostCSS.",
   "main": "dist/index.js",
   "files": [
@@ -8,9 +8,9 @@
     "LICENSE-MIT"
   ],
   "scripts": {
-    "prebuild": "del-cli dist",
-    "build": "cross-env BABEL_ENV=publish babel src --config-file ../../babel.config.json --out-dir dist --ignore \"**/__tests__/\"",
-    "prepublish": "yarn build"
+    "prebuild": "rimraf dist",
+    "build": "babel src --config-file ../../babel.config.json --out-dir dist --ignore \"**/__tests__/\"",
+    "prepare": "yarn build"
   },
   "keywords": [
     "color",
@@ -30,9 +30,10 @@
   },
   "repository": "cssnano/cssnano",
   "dependencies": {
-    "browserslist": "^4.16.0",
-    "colord": "^1.7.0",
-    "postcss-value-parser": "^4.1.0"
+    "browserslist": "^4.16.6",
+    "caniuse-api": "^3.0.0",
+    "colord": "^2.9.1",
+    "postcss-value-parser": "^4.2.0"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -45,6 +46,5 @@
   },
   "peerDependencies": {
     "postcss": "^8.2.15"
-  },
-  "gitHead": "28c247175032fa03f04911cde56ad82d74d211cc"
+  }
 }

package/CHANGELOG.md

@@ -1,81 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [5.1.0](https://github.com/cssnano/cssnano/compare/postcss-colormin@5.0.0...postcss-colormin@5.1.0) (2021-05-19)
-
-
-### Features
-
-* **postcss-colormin:** switch to colord and solve multiple issues ([#1107](https://github.com/cssnano/cssnano/issues/1107)) ([a7f0be4](https://github.com/cssnano/cssnano/commit/a7f0be4acc640aab89cace53a720b3d59b6f7b4f)), closes [#819](https://github.com/cssnano/cssnano/issues/819) [#1042](https://github.com/cssnano/cssnano/issues/1042) [#819](https://github.com/cssnano/cssnano/issues/819) [#771](https://github.com/cssnano/cssnano/issues/771)
-
-
-
-
-
-# [5.0.0](https://github.com/cssnano/cssnano/compare/postcss-colormin@5.0.0-rc.2...postcss-colormin@5.0.0) (2021-04-06)
-
-**Note:** Version bump only for package postcss-colormin
-
-
-
-
-
-# [5.0.0-rc.2](https://github.com/cssnano/cssnano/compare/postcss-colormin@5.0.0-rc.1...postcss-colormin@5.0.0-rc.2) (2021-03-15)
-
-**Note:** Version bump only for package postcss-colormin
-
-
-
-
-
-# [5.0.0-rc.1](https://github.com/cssnano/cssnano/compare/postcss-colormin@5.0.0-rc.0...postcss-colormin@5.0.0-rc.1) (2021-03-04)
-
-**Note:** Version bump only for package postcss-colormin
-
-
-
-
-
-# 5.0.0-rc.0 (2021-02-19)
-
-
-### Bug Fixes
-
-* **postcss-colormin:** fixed plugin running error ([#856](https://github.com/cssnano/cssnano/issues/856)) ([eb37dd5](https://github.com/cssnano/cssnano/commit/eb37dd570a916ce7d6080a782a24d951082c5497))
-
-
-### chore
-
-* minimum require version of node is 10.13 ([#871](https://github.com/cssnano/cssnano/issues/871)) ([28bda24](https://github.com/cssnano/cssnano/commit/28bda243e32ce3ba89b3c358a5f78727b3732f11))
-
-
-### Features
-
-* migarete to PostCSS 8 ([#975](https://github.com/cssnano/cssnano/issues/975)) ([40b82dc](https://github.com/cssnano/cssnano/commit/40b82dca7f53ac02cd4fe62846dec79b898ccb49))
-
-
-### BREAKING CHANGES
-
-* minimum supported `postcss` version is `8.2.1`
-* minimum require version of node is 10.13
-
-
-
-## 4.1.9 (2019-02-12)
-
-
-### Performance Improvements
-
-* **postcss-colormin:** increase ([#682](https://github.com/cssnano/cssnano/issues/682)) ([73e021e](https://github.com/cssnano/cssnano/commit/73e021e0fd02ab44c8726ae0719c5669a29bc8dc))
-* **postcss-colormin:** increase perf ([#696](https://github.com/cssnano/cssnano/issues/696)) ([88c2f2e](https://github.com/cssnano/cssnano/commit/88c2f2e0c20fcd3f3be20b10501e0cec9e453aeb))
-
-
-
-## 4.1.1 (2018-09-24)
-
-
-### Bug Fixes
-
-* **postcss-merge-longhand:** not mangle border output ([#555](https://github.com/cssnano/cssnano/issues/555)) ([9a70605](https://github.com/cssnano/cssnano/commit/9a706050b621e7795a9bf74eb7110b5c81804ffe)), closes [#553](https://github.com/cssnano/cssnano/issues/553) [#554](https://github.com/cssnano/cssnano/issues/554)

package/dist/colours.js

@@ -1,77 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _colord = require("colord");
-
-var _names = _interopRequireDefault(require("colord/plugins/names"));
-
-var _toShorthand = _interopRequireDefault(require("./lib/toShorthand"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-(0, _colord.extend)([_names.default]);
-
-var _default = (colour, isLegacy = false) => {
-  if ((0, _colord.getFormat)(colour) === 'rgb') {
-    /* check that it is a valid CSS value
-     https://www.w3.org/TR/css-color-4/#rgb-functions */
-    let percentCount = 0;
-
-    for (const c of colour) {
-      if (c === '%') {
-        percentCount++;
-      }
-    } // rgb values should either be all percentages or all numbers
-
-
-    if (percentCount !== 3 && percentCount !== 0) {
-      return colour;
-    }
-  }
-
-  const parsed = (0, _colord.colord)(colour.toLowerCase());
-
-  if (parsed.isValid()) {
-    const alpha = parsed.alpha();
-
-    if (alpha === 1) {
-      const toHex = (0, _toShorthand.default)(parsed.toHex());
-      const toName = parsed.toName();
-
-      if (toName && toName.length < toHex.length) {
-        return toName;
-      } else {
-        return toHex;
-      }
-    } else {
-      const rgb = parsed.toRgb();
-
-      if (!isLegacy && !rgb.r && !rgb.g && !rgb.b && !alpha) {
-        return 'transparent';
-      }
-
-      let hsla = parsed.toHslString();
-      let rgba = parsed.toRgbString();
-      const shortestConversion = hsla.length < rgba.length ? hsla : rgba;
-      let result;
-
-      if (colour.length < shortestConversion.length) {
-        result = colour;
-      } else {
-        result = shortestConversion;
-      }
-
-      return result;
-    }
-  } else {
-    // Possibly malformed, so pass through
-    return colour;
-  }
-};
-
-exports.default = _default;
-module.exports = exports.default;

package/dist/lib/toShorthand.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _default = hex => {
-  if (hex[1] === hex[2] && hex[3] === hex[4] && hex[5] === hex[6]) {
-    return '#' + hex[2] + hex[4] + hex[6];
-  }
-
-  return hex;
-};
-
-exports.default = _default;
-module.exports = exports.default;