postcss-merge-rules 5.0.1 → 5.0.5

package/dist/index.js

@@ -64,7 +64,7 @@ function sameDeclarationsAndOrder(a, b) {
  * @param {postcss.Rule} ruleA
  * @param {postcss.Rule} ruleB
  * @param {string[]=} browsers
- * @param {Object.<string, boolean>=} compatibilityCache
+ * @param {Map<string, boolean>=} compatibilityCache
  * @return {boolean}
  */
 
@@ -83,7 +83,7 @@ function canMerge(ruleA, ruleB, browsers, compatibilityCache) {
     name
   } = ruleA.parent;
 
-  if (parent && name && ~name.indexOf('keyframes')) {
+  if (parent && name && name.includes('keyframes')) {
     return false;
   }
 
@@ -232,24 +232,24 @@ function partialMerge(first, second) {
   const firstDecls = getDecls(first); // Filter out intersections with later conflicts in First
 
   intersection = intersection.filter((decl, intersectIndex) => {
-    const index = indexOfDeclaration(firstDecls, decl);
-    const nextConflictInFirst = firstDecls.slice(index + 1).find(d => isConflictingProp(d.prop, decl.prop));
+    const indexOfDecl = indexOfDeclaration(firstDecls, decl);
+    const nextConflictInFirst = firstDecls.slice(indexOfDecl + 1).filter(d => isConflictingProp(d.prop, decl.prop));
 
-    if (!nextConflictInFirst) {
+    if (!nextConflictInFirst.length) {
       return true;
     }
 
-    const nextConflictInIntersection = intersection.slice(intersectIndex + 1).find(d => isConflictingProp(d.prop, decl.prop));
+    const nextConflictInIntersection = intersection.slice(intersectIndex + 1).filter(d => isConflictingProp(d.prop, decl.prop));
 
-    if (!nextConflictInIntersection) {
+    if (!nextConflictInIntersection.length) {
       return false;
     }
 
-    if (declarationIsEqual(nextConflictInFirst, nextConflictInIntersection)) {
-      return true;
+    if (nextConflictInFirst.length !== nextConflictInIntersection.length) {
+      return false;
     }
 
-    return false;
+    return nextConflictInFirst.every((d, index) => declarationIsEqual(d, nextConflictInIntersection[index]));
   }); // Filter out intersections with previous conflicts in Second
 
   const secondDecls = getDecls(second);
@@ -325,7 +325,7 @@ function partialMerge(first, second) {
 }
 /**
  * @param {string[]} browsers
- * @param {Object.<string, boolean>} compatibilityCache
+ * @param {Map<string, boolean>} compatibilityCache
  * @return {function(postcss.Rule)}
  */
 
@@ -391,7 +391,7 @@ function pluginCreator() {
         path: __dirname,
         env: resultOpts.env
       });
-      const compatibilityCache = {};
+      const compatibilityCache = new Map();
       return {
         OnceExit(css) {
           css.walkRules(selectorMerger(browsers, compatibilityCache));

package/dist/lib/ensureCompatibility.js

@@ -3,18 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.filterPrefixes = filterPrefixes;
-exports.sameVendor = sameVendor;
-exports.noVendor = noVendor;
 exports.ensureCompatibility = ensureCompatibility;
+exports.noVendor = noVendor;
 exports.pseudoElements = void 0;
+exports.sameVendor = sameVendor;
 
 var _caniuseApi = require("caniuse-api");
 
 var _postcssSelectorParser = _interopRequireDefault(require("postcss-selector-parser"));
 
-var _vendors = _interopRequireDefault(require("vendors"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const simpleSelectorRe = /^#?[-._a-z0-9 ]+$/i;
@@ -25,17 +22,14 @@ const cssFirstLetter = 'css-first-letter';
 const cssFirstLine = 'css-first-line';
 const cssInOutOfRange = 'css-in-out-of-range';
 const formValidation = 'form-validation';
-/** @type {string[]} */
-
-const prefixes = _vendors.default.map(v => `-${v}-`);
+const vendorPrefix = /-(ah|apple|atsc|epub|hp|khtml|moz|ms|o|rim|ro|tc|wap|webkit|xv)-/;
 /**
  * @param {string} selector
  * @return {string[]}
  */
 
-
 function filterPrefixes(selector) {
-  return prefixes.filter(prefix => selector.indexOf(prefix) !== -1);
+  return selector.match(vendorPrefix);
 } // Internet Explorer use :-ms-input-placeholder.
 // Microsoft Edge use ::-ms-input-placeholder.
 
@@ -56,7 +50,7 @@ function sameVendor(selectorsA, selectorsB) {
 
 
 function noVendor(selector) {
-  return !filterPrefixes(selector).length;
+  return !vendorPrefix.test(selector);
 }
 
 const pseudoElements = {
@@ -122,18 +116,18 @@ function isHostPseudoClass(selector) {
   return selector.includes(':host');
 }
 
-const isSupportedCache = {}; // Move to util in future
+const isSupportedCache = new Map(); // Move to util in future
 
 function isSupportedCached(feature, browsers) {
   const key = JSON.stringify({
     feature,
     browsers
   });
-  let result = isSupportedCache[key];
+  let result = isSupportedCache.get(key);
 
   if (!result) {
     result = (0, _caniuseApi.isSupported)(feature, browsers);
-    isSupportedCache[key] = result;
+    isSupportedCache.set(key, result);
   }
 
   return result;
@@ -155,8 +149,8 @@ function ensureCompatibility(selectors, browsers, compatibilityCache) {
       return true;
     }
 
-    if (compatibilityCache && selector in compatibilityCache) {
-      return compatibilityCache[selector];
+    if (compatibilityCache && compatibilityCache.has(selector)) {
+      return compatibilityCache.get(selector);
     }
 
     let compatible = true;
@@ -180,11 +174,11 @@ function ensureCompatibility(selectors, browsers, compatibilityCache) {
         }
 
         if (type === 'combinator') {
-          if (~value.indexOf('~')) {
+          if (value.includes('~')) {
             compatible = isSupportedCached(cssSel3, browsers);
           }
 
-          if (~value.indexOf('>') || ~value.indexOf('+')) {
+          if (value.includes('>') || value.includes('+')) {
             compatible = isSupportedCached(cssSel2, browsers);
           }
         }
@@ -197,12 +191,12 @@ function ensureCompatibility(selectors, browsers, compatibilityCache) {
 
           if (value) {
             // [foo="bar"], [foo~="bar"], [foo|="bar"]
-            if (~['=', '~=', '|='].indexOf(node.operator)) {
+            if (['=', '~=', '|='].includes(node.operator)) {
               compatible = isSupportedCached(cssSel2, browsers);
             } // [foo^="bar"], [foo$="bar"], [foo*="bar"]
 
 
-            if (~['^=', '$=', '*='].indexOf(node.operator)) {
+            if (['^=', '$=', '*='].includes(node.operator)) {
               compatible = isSupportedCached(cssSel3, browsers);
             }
           } // [foo="bar" i]
@@ -222,7 +216,7 @@ function ensureCompatibility(selectors, browsers, compatibilityCache) {
     }).processSync(selector);
 
     if (compatibilityCache) {
-      compatibilityCache[selector] = compatible;
+      compatibilityCache.set(selector, compatible);
     }
 
     return compatible;

package/package.json

@@ -1,17 +1,12 @@
 {
   "name": "postcss-merge-rules",
-  "version": "5.0.1",
+  "version": "5.0.5",
   "description": "Merge CSS rules with PostCSS.",
   "main": "dist/index.js",
   "files": [
     "LICENSE-MIT",
     "dist"
   ],
-  "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"
-  },
   "keywords": [
     "css",
     "optimise",
@@ -27,11 +22,10 @@
   },
   "repository": "cssnano/cssnano",
   "dependencies": {
-    "browserslist": "^4.16.0",
+    "browserslist": "^4.16.6",
     "caniuse-api": "^3.0.0",
-    "cssnano-utils": "^2.0.1",
-    "postcss-selector-parser": "^6.0.5",
-    "vendors": "^1.0.3"
+    "cssnano-utils": "^3.0.1",
+    "postcss-selector-parser": "^6.0.5"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -40,10 +34,15 @@
     "node": "^10 || ^12 || >=14.0"
   },
   "devDependencies": {
-    "postcss": "^8.2.15"
+    "postcss": "^8.2.15",
+    "postcss-discard-comments": "^5.0.2"
   },
   "peerDependencies": {
     "postcss": "^8.2.15"
   },
-  "gitHead": "28c247175032fa03f04911cde56ad82d74d211cc"
-}
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "babel src --config-file ../../babel.config.json --out-dir dist --ignore \"**/__tests__/\""
+  },
+  "readme": "# [postcss][postcss]-merge-rules\n\n> Merge CSS rules with PostCSS.\n\n## Install\n\nWith [npm](https://npmjs.org/package/postcss-merge-rules) do:\n\n```\nnpm install postcss-merge-rules --save\n```\n\n## Examples\n\nThis module will attempt to merge *adjacent* CSS rules:\n\n### By declarations\n\n#### Input\n\n```css\na {\n    color: blue;\n    font-weight: bold\n}\n\np {\n    color: blue;\n    font-weight: bold\n}\n```\n\n#### Output\n\n```css\na,p {\n    color: blue;\n    font-weight: bold\n}\n```\n\n### By selectors\n\n#### Input\n\n```css\na {\n    color: blue\n}\n\na {\n    font-weight: bold\n}\n```\n\n#### Output\n\n```css\na {\n    color: blue;\n    font-weight: bold\n}\n```\n\n### By partial declarations\n\n#### Input\n\n```css\na {\n    font-weight: bold\n}\n\np {\n    color: blue;\n    font-weight: bold\n}\n```\n\n#### Output\n\n```css\na,p {\n    font-weight: bold\n}\n\np {\n    color: blue\n}\n```\n\n## Usage\n\nSee the [PostCSS documentation](https://github.com/postcss/postcss#usage) for\nexamples for your environment.\n\n## Contributors\n\nSee [CONTRIBUTORS.md](https://github.com/cssnano/cssnano/blob/master/CONTRIBUTORS.md).\n\n## License\n\nMIT © [Ben Briggs](http://beneb.info)\n\n[postcss]: https://github.com/postcss/postcss\n"
+}

package/CHANGELOG.md

@@ -1,87 +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.0.1](https://github.com/cssnano/cssnano/compare/postcss-merge-rules@5.0.0...postcss-merge-rules@5.0.1) (2021-05-19)
-
-
-### Bug Fixes
-
-* **postcss-merge-rules:** add some missing known pseudo classes. ([#1099](https://github.com/cssnano/cssnano/issues/1099)) ([4d7fe36](https://github.com/cssnano/cssnano/commit/4d7fe367bebab86c7b5664ed4621ee7586ca7d86))
-* **postcss-merge-rules:** prevent breaking rule merges ([#1072](https://github.com/cssnano/cssnano/issues/1072)) ([c5e0a5e](https://github.com/cssnano/cssnano/commit/c5e0a5eac171089ae994fcba21d9c565fb462577)), closes [#999](https://github.com/cssnano/cssnano/issues/999)
-
-
-
-
-
-# [5.0.0](https://github.com/cssnano/cssnano/compare/postcss-merge-rules@5.0.0-rc.2...postcss-merge-rules@5.0.0) (2021-04-06)
-
-**Note:** Version bump only for package postcss-merge-rules
-
-
-
-
-
-# [5.0.0-rc.2](https://github.com/cssnano/cssnano/compare/postcss-merge-rules@5.0.0-rc.1...postcss-merge-rules@5.0.0-rc.2) (2021-03-15)
-
-**Note:** Version bump only for package postcss-merge-rules
-
-
-
-
-
-# [5.0.0-rc.1](https://github.com/cssnano/cssnano/compare/postcss-merge-rules@5.0.0-rc.0...postcss-merge-rules@5.0.0-rc.1) (2021-03-04)
-
-**Note:** Version bump only for package postcss-merge-rules
-
-
-
-
-
-# 5.0.0-rc.0 (2021-02-19)
-
-
-### Bug Fixes
-
-* don't unsafe merge 'all' declaration ([#872](https://github.com/cssnano/cssnano/issues/872)) ([6ea9e5d](https://github.com/cssnano/cssnano/commit/6ea9e5dcad2d8ea22be7209332ee29d352c807de))
-* focus-visible issue ([#882](https://github.com/cssnano/cssnano/issues/882)) ([4cfcaaf](https://github.com/cssnano/cssnano/commit/4cfcaaf25b162ec2b0308907a408d7dba6a354c3))
-* **merge-rules, merge-idents:** add support for nested at-rules ([#719](https://github.com/cssnano/cssnano/issues/719)) ([cdedda7](https://github.com/cssnano/cssnano/commit/cdedda7f9d67873d872add044ad34c91616579f3))
-* **postcss-merge-rules:** don't change specificity of prefixed properties ([#723](https://github.com/cssnano/cssnano/issues/723)) ([863cf2b](https://github.com/cssnano/cssnano/commit/863cf2b3470d3172523a3165dc368abcfa18809c))
-
-
-### 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))
-* **postcss-merge-rules:** merge at-rules ([#722](https://github.com/cssnano/cssnano/issues/722)) ([8d4610a](https://github.com/cssnano/cssnano/commit/8d4610a6391ddab29bcb08ef0522d0b7ce2d6582))
-
-
-### 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-merge-rules:** increase perf ([#681](https://github.com/cssnano/cssnano/issues/681)) ([35bad2b](https://github.com/cssnano/cssnano/commit/35bad2b70fca5390c88eaabc24c25bb8d28b2f95))
-
-
-
-## 4.1.1 (2018-09-24)
-
-
-### Bug Fixes
-
-* handle uppercase `all` property in merge rules ([#611](https://github.com/cssnano/cssnano/issues/611)) ([0dfe335](https://github.com/cssnano/cssnano/commit/0dfe3355951fa4a080a04dca34c6d99420def7ac))
-* merge same atrules with difference case ([#605](https://github.com/cssnano/cssnano/issues/605)) ([ca350fd](https://github.com/cssnano/cssnano/commit/ca350fda779bab5ca2eadf70299d92f8e495a273))
-* **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)