postcss-merge-rules 8.0.4 → 9.0.0

package/package.json

@@ -1,18 +1,12 @@
 {
   "name": "postcss-merge-rules",
-  "version": "8.0.4",
+  "version": "9.0.0",
   "description": "Merge CSS rules with PostCSS.",
   "exports": {
     ".": {
       "types": "./types/index.d.ts",
       "default": "./src/index.js"
-    },
-    "./src": "./src/index.js",
-    "./src/index": "./src/index.js",
-    "./src/index.js": "./src/index.js",
-    "./src/lib/ensureCompatibility.js": "./src/lib/ensureCompatibility.js",
-    "./src/lib/ensureCompatibility": "./src/lib/ensureCompatibility.js",
-    "./package.json": "./package.json"
+    }
   },
   "imports": {
     "#getBrowsersList": {
@@ -45,24 +39,25 @@
   "dependencies": {
     "browserslist": "^4.28.8",
     "caniuse-api": "^4.0.0",
-    "postcss-selector-parser": "^7.1.5",
-    "cssnano-utils": "^6.0.4"
+    "cssnano-utils": "^7.0.0",
+    "postcss-selector-parser": "^7.1.5"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
   },
   "engines": {
-    "node": "^22.11.0 || ^24.11.0 || >=26.0"
+    "node": "^22.22.3 || ^24.15.0 || >=26.0"
   },
   "devDependencies": {
-    "@webref/css": "8.7.1",
+    "@webref/css": "8.7.2",
     "postcss": "^8.5.26",
-    "postcss-simple-vars": "^7.0.1",
-    "postcss-discard-comments": "^8.0.4"
+    "postcss-discard-comments": "^9.0.0",
+    "postcss-simple-vars": "^7.0.1"
   },
   "peerDependencies": {
     "postcss": "^8.5.26"
   },
+  "type": "module",
   "scripts": {
     "acquire": "node ./script/acquire.mjs",
     "test": "node --test"

package/src/data/propertyGroups.json

@@ -636,6 +636,7 @@
     "rx",
     "ry",
     "scale",
+    "scroll-axis-lock",
     "scroll-behavior",
     "scroll-initial-target",
     "scroll-margin",

package/src/index.js

@@ -1,16 +1,14 @@
-'use strict';
-
-const getBrowsersList = require('#getBrowsersList');
-
-/** @import browserslist from 'browserslist' */
-
-const { sameParent } = require('cssnano-utils');
-const {
+import getBrowsersList from '#getBrowsersList';
+import cssnanoUtils from 'cssnano-utils';
+import {
   ensureCompatibility,
   sameVendor,
   noVendor,
-} = require('./lib/ensureCompatibility');
-const { isConflictingProp } = require('./lib/propertyRelations.js');
+} from './lib/ensureCompatibility.js';
+import { isConflictingProp } from './lib/propertyRelations.js';
+
+/** @import browserslist from 'browserslist' */
+const { sameParent } = cssnanoUtils;
 /** @import {Declaration, Rule} from 'postcss' */
 /**
  * @param {Declaration} a
@@ -716,8 +714,8 @@ function pluginCreator(opts = {}) {
     },
   };
 }
-
+/** @type {true} */
 pluginCreator.postcss = true;
-module.exports = /** @type {import('postcss').PluginCreator<Options>} */ (
-  pluginCreator
-);
+const moduleExports = pluginCreator;
+
+export { moduleExports as default, moduleExports as 'module.exports' };

package/src/lib/computeBrowsersToSupport.js

@@ -1,7 +1,8 @@
-'use strict';
+import { fileURLToPath } from 'node:url';
+import browserslist from 'browserslist';
+import nodepath from 'node:path';
 
-const browserslist = require('browserslist');
-const { dirname } = require('node:path');
+const { dirname } = nodepath;
 
 /**
  *
@@ -12,16 +13,13 @@ const { dirname } = require('node:path');
  * @param {browserslist.Options["env"]} [env]
  * @returns {string[]}
  */
-module.exports = function computeBrowsersToSupport(
-  options,
-  stats,
-  from,
-  file,
-  env
-) {
+function computeBrowsersToSupport(options, stats, from, file, env) {
   return browserslist(options.overrideBrowserslist, {
     stats: options.stats || stats,
-    path: options.path || dirname(from || file || __filename),
+    path:
+      options.path || dirname(from || file || fileURLToPath(import.meta.url)),
     env: options.env || env,
   });
-};
+}
+
+export default computeBrowsersToSupport;

package/src/lib/ensureCompatibility.js

@@ -1,7 +1,7 @@
-'use strict';
-const { isSupported } = require('caniuse-api');
-const selectorParser = require('postcss-selector-parser');
+import caniuseApi from 'caniuse-api';
+import selectorParser from 'postcss-selector-parser';
 
+const { isSupported } = caniuseApi;
 const simpleSelectorRe = /^#?[-._a-z0-9 ]+$/i;
 
 const cssSel2 = 'css-sel2';
@@ -130,22 +130,39 @@ function isHostPseudoClass(selector) {
   return selector.includes(':host');
 }
 
-const isSupportedCache = new Map();
+/** @type {WeakMap<string[], Map<string, boolean>>} */
+const isSupportedCache = new WeakMap();
+// Stable stand-in key when `browsers` is undefined, since a fresh `[]` on
+// every call would never hit the WeakMap.
+/** @type {string[]} */
+const noBrowsers = [];
 
 // Move to util in future
 /**
+ * `browsers` is the same array reference for an entire file's processing, so
+ * keying on it directly (rather than re-serializing it per call) avoids
+ * rebuilding a JSON string on every lookup, including cache hits.
+ *
  * @param {string} feature
  * @param {string[] | undefined} browsers
+ * @return {boolean}
  */
 function isSupportedCached(feature, browsers) {
-  const key = JSON.stringify({ feature, browsers });
-  let result = isSupportedCache.get(key);
+  const key = browsers ?? noBrowsers;
+  let byFeature = isSupportedCache.get(key);
+  if (!byFeature) {
+    byFeature = new Map();
+    isSupportedCache.set(key, byFeature);
+  }
 
-  if (!result) {
-    result = isSupported(feature, /** @type {string[]} */ (browsers));
-    isSupportedCache.set(key, result);
+  const cached = byFeature.get(feature);
+  if (cached !== undefined) {
+    return cached;
   }
 
+  const result = isSupported(feature, /** @type {string[]} */ (browsers));
+  byFeature.set(feature, result);
+
   return result;
 }
 
@@ -229,4 +246,4 @@ function ensureCompatibility(selectors, browsers, compatibilityCache) {
   });
 }
 
-module.exports = { sameVendor, noVendor, pseudoElements, ensureCompatibility };
+export { sameVendor, noVendor, pseudoElements, ensureCompatibility };

package/src/lib/getBrowsersForWebBuild.js

@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports = function () {
+export default (function () {
   return [
     'and_chr 150',
     'and_ff 152',
@@ -32,4 +30,4 @@ module.exports = function () {
     'samsung 30',
     'samsung 29',
   ];
-};
+});

package/src/lib/propertyRelations.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const data = require('../data/propertyGroups.json');
+import data from '../data/propertyGroups.json' with { type: 'json' };
 
 const vendorPrefixRegex = /^-\w+-/;
 /**
@@ -167,5 +165,4 @@ function isConflictingProp(propA, propB) {
   }
   return false;
 }
-
-module.exports = { isConflictingProp };
+export { isConflictingProp };

package/types/index.d.ts

@@ -1,5 +1,3 @@
-declare const _exports: import("postcss").PluginCreator<Options>;
-export = _exports;
 import type browserslist from 'browserslist';
 import type { Declaration } from 'postcss';
 export type RuleMeta = {
@@ -21,4 +19,19 @@ export type AutoprefixerOptions = {
 };
 export type BrowserslistOptions = Pick<browserslist.Options, 'stats' | 'path' | 'env'>;
 export type Options = AutoprefixerOptions & BrowserslistOptions;
+/**
+ * @typedef {{ overrideBrowserslist?: string | string[] }} AutoprefixerOptions
+ * @typedef {Pick<browserslist.Options, 'stats' | 'path' | 'env'>} BrowserslistOptions
+ * @typedef {AutoprefixerOptions & BrowserslistOptions} Options
+ */
+/**
+ * @param {Options} opts
+ * @return {import('postcss').Plugin}
+ */
+declare function pluginCreator(opts?: Options): import('postcss').Plugin;
+declare namespace pluginCreator {
+    var postcss: true;
+}
+declare const moduleExports: typeof pluginCreator;
+export { moduleExports as default, moduleExports as 'module.exports' };
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";;AAII,OAAQ,KAAA,YAAY,MAAM,cAAc,CAAA;AASxC,OAAQ,KAAA,EAAC,WAAW,EAAO,MAAM,SAAS,CAAA;AAmD3C,YAAkB,QAAQ,GAC1B;;;;IAAqB,SAAS,EAAnB,MAAM,EAAE,CACnB;;;;IAA0B,YAAY,EAA3B,WAAW,EAAE,CACxB;;;;IAAoB,KAAK,EAAd,OAAO,CACpB;CAAA,CAAA;AA8lBE,YAAwD,mBAAmB,GAAjE;IAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAqB;AAC3E,YAAgE,mBAAmB,GAAzE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,CAAqB;AACnF,YAAqD,OAAO,GAAlD,mBAAmB,GAAG,mBAAmB,CAAS"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AASI,OAAQ,KAAA,YAAY,MAAM,cAAc,CAAA;AAExC,OAAQ,KAAA,EAAC,WAAW,EAAO,MAAM,SAAS,CAAA;AAmD3C,YAAkB,QAAQ,GAC1B;;;;IAAqB,SAAS,EAAnB,MAAM,EAAE,CACnB;;;;IAA0B,YAAY,EAA3B,WAAW,EAAE,CACxB;;;;IAAoB,KAAK,EAAd,OAAO,CACpB;CAAA,CAAA;AA8lBE,YAAwD,mBAAmB,GAAjE;IAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAqB;AAC3E,YAAgE,mBAAmB,GAAzE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,CAAqB;AACnF,YAAqD,OAAO,GAAlD,mBAAmB,GAAG,mBAAmB,CAAS;AAH/D;;;;GAIG;AAEH;;;GAGG;AACH,iBAAS,aAAa,CAAC,IAAI,GAHhB,OAGqB,GAFpB,OAAO,SAAS,EAAE,MAAM,CAoCnC;kBAlCQ,aAAa;iBAmCX,IAAI;;AAEf,QAAA,MAAM,aAAa,sBAAgB,CAAC;AAEpC,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,aAAa,IAAI,gBAAgB,EAAE,CAAC"}

package/types/lib/computeBrowsersToSupport.d.ts

@@ -1,4 +1,4 @@
-export = computeBrowsersToSupport;
+import browserslist from 'browserslist';
 /**
  *
  * @param {{overrideBrowserslist?: string | string[] | undefined, stats?: browserslist.Options["stats"], path?: browserslist.Options["path"], env?: browserslist.Options["env"]}} options
@@ -14,5 +14,5 @@ declare function computeBrowsersToSupport(options: {
     path?: browserslist.Options["path"];
     env?: browserslist.Options["env"];
 }, stats: browserslist.Options["stats"], from: string | undefined, file?: string, env?: browserslist.Options["env"]): string[];
-import browserslist = require('browserslist');
+export default computeBrowsersToSupport;
 //# sourceMappingURL=computeBrowsersToSupport.d.ts.map

package/types/lib/computeBrowsersToSupport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeBrowsersToSupport.d.ts","sourceRoot":"","sources":["../../src/lib/computeBrowsersToSupport.js"],"names":[],"mappings":";AAKA;;;;;;;;GAQG;0CAED,OAAO,EARE;IAAC,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;IAAC,KAAK,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,IAAI,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAAC,GAAG,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;CAQtK,EACP,KAAK,EARI,YAAY,CAAC,OAAO,CAAC,OAAO,CAQhC,EACL,IAAI,EARK,MAAM,GAAC,SAQZ,EACJ,IAAI,AARH,CACA,EADQ,MAQL,EACJ,GAAG,AARF,CACA,EADQ,YAAY,CAAC,OAAO,CAAC,KAAK,CAQhC,GAPQ,MAAM,EAAE;OAVf,YAAY,WAAW,cAAc"}
+{"version":3,"file":"computeBrowsersToSupport.d.ts","sourceRoot":"","sources":["../../src/lib/computeBrowsersToSupport.js"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,cAAc,CAAC;AAKxC;;;;;;;;GAQG;AACH,iBAAS,wBAAwB,CAAC,OAAO,EAP9B;IAAC,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;IAAC,KAAK,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,IAAI,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAAC,GAAG,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;CAOtI,EAAE,KAAK,EANrC,YAAY,CAAC,OAAO,CAAC,OAAO,CAMS,EAAE,IAAI,EAL3C,MAAM,GAAC,SAKoC,EAAE,IAAI,AAJzD,CACA,EADQ,MAIiD,EAAE,GAAG,AAH9D,CACA,EADQ,YAAY,CAAC,OAAO,CAAC,KAAK,CAG4B,GAFpD,MAAM,EAAE,CASpB;eAEc,wBAAwB"}

package/types/lib/ensureCompatibility.d.ts

@@ -1,62 +1,3 @@
-declare const _exports: {
-    sameVendor: typeof sameVendor;
-    noVendor: typeof noVendor;
-    pseudoElements: {
-        ':active': string;
-        ':after': string;
-        ':any-link': string;
-        ':before': string;
-        ':checked': string;
-        ':default': string;
-        ':dir': string;
-        ':disabled': string;
-        ':empty': string;
-        ':enabled': string;
-        ':first-child': string;
-        ':first-letter': string;
-        ':first-line': string;
-        ':first-of-type': string;
-        ':focus': string;
-        ':focus-within': string;
-        ':focus-visible': string;
-        ':has': string;
-        ':hover': string;
-        ':in-range': string;
-        ':indeterminate': string;
-        ':invalid': string;
-        ':is': string;
-        ':lang': string;
-        ':last-child': string;
-        ':last-of-type': string;
-        ':link': string;
-        ':matches': string;
-        ':not': string;
-        ':nth-child': string;
-        ':nth-last-child': string;
-        ':nth-last-of-type': string;
-        ':nth-of-type': string;
-        ':only-child': string;
-        ':only-of-type': string;
-        ':optional': string;
-        ':out-of-range': string;
-        ':placeholder-shown': string;
-        ':required': string;
-        ':root': string;
-        ':target': string;
-        '::after': string;
-        '::backdrop': string;
-        '::before': string;
-        '::first-letter': string;
-        '::first-line': string;
-        '::marker': string;
-        '::placeholder': string;
-        '::selection': string;
-        ':valid': string;
-        ':visited': string;
-    };
-    ensureCompatibility: typeof ensureCompatibility;
-};
-export = _exports;
 /**
  * @param {string[]} selectorsA
  * @param {string[]} selectorsB
@@ -68,6 +9,59 @@ declare function sameVendor(selectorsA: string[], selectorsB: string[]): boolean
  * @return {boolean}
  */
 declare function noVendor(selector: string): boolean;
+declare const pseudoElements: {
+    ':active': string;
+    ':after': string;
+    ':any-link': string;
+    ':before': string;
+    ':checked': string;
+    ':default': string;
+    ':dir': string;
+    ':disabled': string;
+    ':empty': string;
+    ':enabled': string;
+    ':first-child': string;
+    ':first-letter': string;
+    ':first-line': string;
+    ':first-of-type': string;
+    ':focus': string;
+    ':focus-within': string;
+    ':focus-visible': string;
+    ':has': string;
+    ':hover': string;
+    ':in-range': string;
+    ':indeterminate': string;
+    ':invalid': string;
+    ':is': string;
+    ':lang': string;
+    ':last-child': string;
+    ':last-of-type': string;
+    ':link': string;
+    ':matches': string;
+    ':not': string;
+    ':nth-child': string;
+    ':nth-last-child': string;
+    ':nth-last-of-type': string;
+    ':nth-of-type': string;
+    ':only-child': string;
+    ':only-of-type': string;
+    ':optional': string;
+    ':out-of-range': string;
+    ':placeholder-shown': string;
+    ':required': string;
+    ':root': string;
+    ':target': string;
+    '::after': string;
+    '::backdrop': string;
+    '::before': string;
+    '::first-letter': string;
+    '::first-line': string;
+    '::marker': string;
+    '::placeholder': string;
+    '::selection': string;
+    ':valid': string;
+    ':visited': string;
+};
 /**
  * @param {string[]} selectors
  * @param{string[]=} browsers
@@ -75,4 +69,5 @@ declare function noVendor(selector: string): boolean;
  * @return {boolean}
  */
 declare function ensureCompatibility(selectors: string[], browsers?: string[] | undefined, compatibilityCache?: Map<string, boolean> | undefined): boolean;
+export { sameVendor, noVendor, pseudoElements, ensureCompatibility };
 //# sourceMappingURL=ensureCompatibility.d.ts.map

package/types/lib/ensureCompatibility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureCompatibility.d.ts","sourceRoot":"","sources":["../../src/lib/ensureCompatibility.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsCA;;;;GAIG;AACH,iBAAS,UAAU,CAAC,UAAU,EAJnB,MAAM,EAIa,EAAE,UAAU,EAH/B,MAAM,EAGyB,GAF9B,OAAO,CAWlB;AAED;;;GAGG;AACH,iBAAS,QAAQ,CAAC,QAAQ,EAHf,MAGe,GAFd,OAAO,CAIlB;AA2FD;;;;;GAKG;AACH,iBAAS,mBAAmB,CAAC,SAAS,EAL3B,MAAM,EAKqB,EAAE,QAAQ,AAJ7C,CACA,EADO,MAAM,EAAE,YAI8B,EAAE,kBAAkB,AAHjE,CACA,EADO,GAAG,CAAC,MAAM,EAAC,OAAO,CAAC,YAGuC,GAFxD,OAAO,CA0ElB"}
+{"version":3,"file":"ensureCompatibility.d.ts","sourceRoot":"","sources":["../../src/lib/ensureCompatibility.js"],"names":[],"mappings":"AAsCA;;;;GAIG;AACH,iBAAS,UAAU,CAAC,UAAU,EAJnB,MAAM,EAIa,EAAE,UAAU,EAH/B,MAAM,EAGyB,GAF9B,OAAO,CAWlB;AAED;;;GAGG;AACH,iBAAS,QAAQ,CAAC,QAAQ,EAHf,MAGe,GAFd,OAAO,CAIlB;AAED,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoDnB,CAAC;AAsDF;;;;;GAKG;AACH,iBAAS,mBAAmB,CAAC,SAAS,EAL3B,MAAM,EAKqB,EAAE,QAAQ,AAJ7C,CACA,EADO,MAAM,EAAE,YAI8B,EAAE,kBAAkB,AAHjE,CACA,EADO,GAAG,CAAC,MAAM,EAAC,OAAO,CAAC,YAGuC,GAFxD,OAAO,CA0ElB;AAED,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC"}

package/types/lib/getBrowsersForWebBuild.d.ts

@@ -1,3 +1,3 @@
-export = _exports;
-declare function _exports(): string[];
+export default _default;
+declare function _default(): string[];
 //# sourceMappingURL=getBrowsersForWebBuild.d.ts.map

package/types/lib/propertyRelations.d.ts

@@ -1,7 +1,3 @@
-declare const _exports: {
-    isConflictingProp: typeof isConflictingProp;
-};
-export = _exports;
 /**
  * True if declarations of `propA` and `propB` can set the same underlying
  * property, so that reordering them within a rule can change what the rule
@@ -14,4 +10,5 @@ export = _exports;
  * @return {boolean}
  */
 declare function isConflictingProp(propA: string, propB: string): boolean;
+export { isConflictingProp };
 //# sourceMappingURL=propertyRelations.d.ts.map

package/types/lib/propertyRelations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"propertyRelations.d.ts","sourceRoot":"","sources":["../../src/lib/propertyRelations.js"],"names":[],"mappings":";;;;AAwHA;;;;;;;;;;GAUG;AACH,iBAAS,iBAAiB,CAAC,KAAK,EAJrB,MAIqB,EAAE,KAAK,EAH5B,MAG4B,GAF3B,OAAO,CAuClB"}
+{"version":3,"file":"propertyRelations.d.ts","sourceRoot":"","sources":["../../src/lib/propertyRelations.js"],"names":[],"mappings":"AAsHA;;;;;;;;;;GAUG;AACH,iBAAS,iBAAiB,CAAC,KAAK,EAJrB,MAIqB,EAAE,KAAK,EAH5B,MAG4B,GAF3B,OAAO,CAuClB;AACD,OAAO,EAAE,iBAAiB,EAAE,CAAC"}