postcss-merge-rules 2.0.10 → 2.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -0
- package/dist/index.js +39 -28
- package/dist/lib/clone.js +2 -3
- package/dist/lib/ensureCompatibility.js +140 -0
- package/package.json +31 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,29 @@
|
|
|
1
|
+
# 2.1.2
|
|
2
|
+
|
|
3
|
+
* Performance improvements; no compatibility checking for simple selectors,
|
|
4
|
+
cached compatibility lookups, and early exit on compatibility mismatches
|
|
5
|
+
(thanks to @akx).
|
|
6
|
+
|
|
7
|
+
# 2.1.1
|
|
8
|
+
|
|
9
|
+
* Resolves an issue with `2.1.0` where `browserslist` was not being installed
|
|
10
|
+
correctly on older Node versions.
|
|
11
|
+
|
|
12
|
+
# 2.1.0
|
|
13
|
+
|
|
14
|
+
* Rules are now merged based on supported browsers, which uses `browserslist`
|
|
15
|
+
& `caniuse-api`. The browsers should be supplied by the standard means of
|
|
16
|
+
[configuring `browserslist`][browserslist], either using config files or
|
|
17
|
+
via environment variables.
|
|
18
|
+
|
|
19
|
+
[browserslist]: https://github.com/ai/browserslist#config-file
|
|
20
|
+
|
|
21
|
+
# 2.0.11
|
|
22
|
+
|
|
23
|
+
* Resolves an issue where partially identical properties would be removed from
|
|
24
|
+
a rule erroneously; for example `color: #fff` would be removed if the other
|
|
25
|
+
rule contained `background-color: #fff`.
|
|
26
|
+
|
|
1
27
|
# 2.0.10
|
|
2
28
|
|
|
3
29
|
* Replaces the internal list of vendor prefixes with the `vendors` module
|
package/dist/index.js
CHANGED
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _browserslist = require('browserslist');
|
|
6
|
+
|
|
7
|
+
var _browserslist2 = _interopRequireDefault(_browserslist);
|
|
6
8
|
|
|
7
9
|
var _postcss = require('postcss');
|
|
8
10
|
|
|
@@ -16,9 +18,11 @@ var _clone = require('./lib/clone');
|
|
|
16
18
|
|
|
17
19
|
var _clone2 = _interopRequireDefault(_clone);
|
|
18
20
|
|
|
19
|
-
|
|
21
|
+
var _ensureCompatibility = require('./lib/ensureCompatibility');
|
|
22
|
+
|
|
23
|
+
var _ensureCompatibility2 = _interopRequireDefault(_ensureCompatibility);
|
|
20
24
|
|
|
21
|
-
|
|
25
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
22
26
|
|
|
23
27
|
var prefixes = _vendors2.default.map(function (v) {
|
|
24
28
|
return '-' + v + '-';
|
|
@@ -59,9 +63,15 @@ function sameParent(ruleA, ruleB) {
|
|
|
59
63
|
return hasParent ? sameType : true;
|
|
60
64
|
}
|
|
61
65
|
|
|
62
|
-
function canMerge(ruleA, ruleB) {
|
|
63
|
-
var a =
|
|
64
|
-
var b =
|
|
66
|
+
function canMerge(ruleA, ruleB, browsers, compatibilityCache) {
|
|
67
|
+
var a = ruleA.selectors;
|
|
68
|
+
var b = ruleB.selectors;
|
|
69
|
+
|
|
70
|
+
var selectors = a.concat(b);
|
|
71
|
+
|
|
72
|
+
if (!(0, _ensureCompatibility2.default)(selectors, browsers, compatibilityCache)) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
65
75
|
|
|
66
76
|
var parent = sameParent(ruleA, ruleB);
|
|
67
77
|
var name = ruleA.parent.name;
|
|
@@ -69,7 +79,7 @@ function canMerge(ruleA, ruleB) {
|
|
|
69
79
|
if (parent && name && ~name.indexOf('keyframes')) {
|
|
70
80
|
return false;
|
|
71
81
|
}
|
|
72
|
-
return parent && (
|
|
82
|
+
return parent && (selectors.every(noVendor) || sameVendor(a, b));
|
|
73
83
|
}
|
|
74
84
|
|
|
75
85
|
var getDecls = function getDecls(rule) {
|
|
@@ -202,12 +212,12 @@ function partialMerge(first, second) {
|
|
|
202
212
|
}
|
|
203
213
|
}
|
|
204
214
|
|
|
205
|
-
function selectorMerger() {
|
|
215
|
+
function selectorMerger(browsers, compatibilityCache) {
|
|
206
216
|
var cache = null;
|
|
207
217
|
return function (rule) {
|
|
208
218
|
// Prime the cache with the first rule, or alternately ensure that it is
|
|
209
219
|
// safe to merge both declarations before continuing
|
|
210
|
-
if (!cache || !canMerge(rule, cache)) {
|
|
220
|
+
if (!cache || !canMerge(rule, cache, browsers, compatibilityCache)) {
|
|
211
221
|
cache = rule;
|
|
212
222
|
return;
|
|
213
223
|
}
|
|
@@ -228,21 +238,15 @@ function selectorMerger() {
|
|
|
228
238
|
// Merge when both selectors are exactly equal
|
|
229
239
|
// e.g. a { color: blue } a { font-weight: bold }
|
|
230
240
|
if (cache.selector === rule.selector) {
|
|
231
|
-
var
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
return {
|
|
241
|
-
v: void 0
|
|
242
|
-
};
|
|
243
|
-
}();
|
|
244
|
-
|
|
245
|
-
if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
|
|
241
|
+
var cached = getDecls(cache);
|
|
242
|
+
rule.walk(function (decl) {
|
|
243
|
+
if (~cached.indexOf(String(decl))) {
|
|
244
|
+
return decl.remove();
|
|
245
|
+
}
|
|
246
|
+
decl.moveTo(cache);
|
|
247
|
+
});
|
|
248
|
+
rule.remove();
|
|
249
|
+
return;
|
|
246
250
|
}
|
|
247
251
|
// Partial merge: check if the rule contains a subset of the last; if
|
|
248
252
|
// so create a joined selector with the subset, if smaller.
|
|
@@ -251,9 +255,16 @@ function selectorMerger() {
|
|
|
251
255
|
}
|
|
252
256
|
|
|
253
257
|
exports.default = _postcss2.default.plugin('postcss-merge-rules', function () {
|
|
254
|
-
return function (css) {
|
|
255
|
-
|
|
258
|
+
return function (css, result) {
|
|
259
|
+
var opts = result.opts;
|
|
260
|
+
|
|
261
|
+
var browsers = (0, _browserslist2.default)(null, {
|
|
262
|
+
stats: opts && opts.stats,
|
|
263
|
+
path: opts && opts.from,
|
|
264
|
+
env: opts && opts.env
|
|
265
|
+
});
|
|
266
|
+
var compatibilityCache = {};
|
|
267
|
+
css.walkRules(selectorMerger(browsers, compatibilityCache));
|
|
256
268
|
};
|
|
257
269
|
});
|
|
258
|
-
module.exports = exports['default'];
|
|
259
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/index.js"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import postcss from 'postcss';\nimport vendors from 'vendors';\nimport clone from './lib/clone';\n\nconst {list} = postcss;\nconst prefixes = vendors.map(v => `-${v}-`);\n\nfunction intersect (a, b, not) {\n    return a.filter(c => {\n        const index = ~b.indexOf(c);\n        return not ? !index : index;\n    });\n}\n\nconst different = (a, b) => intersect(a, b, true).concat(intersect(b, a, true));\nconst filterPrefixes = selector => intersect(prefixes, selector);\n\nfunction sameVendor (selectorsA, selectorsB) {\n    let same = selectors => selectors.map(filterPrefixes).join();\n    return same(selectorsA) === same(selectorsB);\n}\n\nconst noVendor = selector => !filterPrefixes(selector).length;\n\nfunction sameParent (ruleA, ruleB) {\n    const hasParent = ruleA.parent && ruleB.parent;\n    let sameType = hasParent && ruleA.parent.type === ruleB.parent.type;\n    // If an at rule, ensure that the parameters are the same\n    if (hasParent && ruleA.parent.type !== 'root' && ruleB.parent.type !== 'root') {\n        sameType = sameType &&\n                   ruleA.parent.params === ruleB.parent.params &&\n                   ruleA.parent.name === ruleB.parent.name;\n    }\n    return hasParent ? sameType : true;\n}\n\nfunction canMerge (ruleA, ruleB) {\n    const a = list.comma(ruleA.selector);\n    const b = list.comma(ruleB.selector);\n\n    const parent = sameParent(ruleA, ruleB);\n    const {name} = ruleA.parent;\n    if (parent && name && ~name.indexOf('keyframes')) {\n        return false;\n    }\n    return parent && (a.concat(b).every(noVendor) || sameVendor(a, b));\n}\n\nconst getDecls = rule => rule.nodes ? rule.nodes.map(String) : [];\nconst joinSelectors = (...rules) => rules.map(s => s.selector).join();\n\nfunction ruleLength (...rules) {\n    return rules.map(r => r.nodes.length ? String(r) : '').join('').length;\n}\n\nfunction splitProp (prop) {\n    const parts = prop.split('-');\n    let base, rest;\n    // Treat vendor prefixed properties as if they were unprefixed;\n    // moving them when combined with non-prefixed properties can\n    // cause issues. e.g. moving -webkit-background-clip when there\n    // is a background shorthand definition.\n    if (prop[0] === '-') {\n        base = parts[2];\n        rest = parts.slice(3);\n    } else {\n        base = parts[0];\n        rest = parts.slice(1);\n    }\n    return [base, rest];\n}\n\nfunction isConflictingProp (propA, propB) {\n    if (propA === propB) {\n        return true;\n    }\n    const a = splitProp(propA);\n    const b = splitProp(propB);\n    return a[0] === b[0] && a[1].length !== b[1].length;\n}\n\nfunction hasConflicts (declProp, notMoved) {\n    return notMoved.some(prop => isConflictingProp(prop, declProp));\n}\n\nfunction partialMerge (first, second) {\n    let intersection = intersect(getDecls(first), getDecls(second));\n    if (!intersection.length) {\n        return second;\n    }\n    let nextRule = second.next();\n    if (nextRule && nextRule.type === 'rule' && canMerge(second, nextRule)) {\n        let nextIntersection = intersect(getDecls(second), getDecls(nextRule));\n        if (nextIntersection.length > intersection.length) {\n            first = second; second = nextRule; intersection = nextIntersection;\n        }\n    }\n    const recievingBlock = clone(second);\n    recievingBlock.selector = joinSelectors(first, second);\n    recievingBlock.nodes = [];\n    second.parent.insertBefore(second, recievingBlock);\n    const difference = different(getDecls(first), getDecls(second));\n    const filterConflicts = (decls, intersectn) => {\n        let willNotMove = [];\n        return decls.reduce((willMove, decl) => {\n            let intersects = ~intersectn.indexOf(decl);\n            let prop = decl.split(':')[0];\n            let base = prop.split('-')[0];\n            let canMove = difference.every(d => d.split(':')[0] !== base);\n            if (intersects && canMove && !hasConflicts(prop, willNotMove)) {\n                willMove.push(decl);\n            } else {\n                willNotMove.push(prop);\n            }\n            return willMove;\n        }, []);\n    };\n    intersection = filterConflicts(getDecls(first).reverse(), intersection);\n    intersection = filterConflicts((getDecls(second)), intersection);\n    const firstClone = clone(first);\n    const secondClone = clone(second);\n    const moveDecl = callback => {\n        return decl => {\n            if (~intersection.indexOf(String(decl))) {\n                callback.call(this, decl);\n            }\n        };\n    };\n    firstClone.walkDecls(moveDecl(decl => {\n        decl.remove();\n        recievingBlock.append(decl);\n    }));\n    secondClone.walkDecls(moveDecl(decl => decl.remove()));\n    const merged = ruleLength(firstClone, recievingBlock, secondClone);\n    const original = ruleLength(first, second);\n    if (merged < original) {\n        first.replaceWith(firstClone);\n        second.replaceWith(secondClone);\n        [firstClone, recievingBlock, secondClone].forEach(r => {\n            if (!r.nodes.length) {\n                r.remove();\n            }\n        });\n        if (!secondClone.parent) {\n            return recievingBlock;\n        }\n        return secondClone;\n    } else {\n        recievingBlock.remove();\n        return second;\n    }\n}\n\nfunction selectorMerger () {\n    let cache = null;\n    return function (rule) {\n        // Prime the cache with the first rule, or alternately ensure that it is\n        // safe to merge both declarations before continuing\n        if (!cache || !canMerge(rule, cache)) {\n            cache = rule;\n            return;\n        }\n        // Ensure that we don't deduplicate the same rule; this is sometimes\n        // caused by a partial merge\n        if (cache === rule) {\n            cache = rule;\n            return;\n        }\n        // Merge when declarations are exactly equal\n        // e.g. h1 { color: red } h2 { color: red }\n        if (getDecls(rule).join(';') === getDecls(cache).join(';')) {\n            rule.selector = joinSelectors(cache, rule);\n            cache.remove();\n            cache = rule;\n            return;\n        }\n        // Merge when both selectors are exactly equal\n        // e.g. a { color: blue } a { font-weight: bold }\n        if (cache.selector === rule.selector) {\n            const toString = String(cache);\n            rule.walk(decl => {\n                if (~toString.indexOf(String(decl))) {\n                    return decl.remove();\n                }\n                decl.moveTo(cache);\n            });\n            rule.remove();\n            return;\n        }\n        // Partial merge: check if the rule contains a subset of the last; if\n        // so create a joined selector with the subset, if smaller.\n        cache = partialMerge(cache, rule);\n    };\n}\n\nexport default postcss.plugin('postcss-merge-rules', () => {\n    return css => css.walkRules(selectorMerger());\n});\n"]}
|
|
270
|
+
module.exports = exports['default'];
|
package/dist/lib/clone.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
|
|
5
|
-
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
|
|
5
|
+
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
|
|
6
6
|
|
|
7
7
|
var clone = function clone(obj, parent) {
|
|
8
8
|
if ((typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) !== 'object' || obj === null) {
|
|
@@ -32,5 +32,4 @@ var clone = function clone(obj, parent) {
|
|
|
32
32
|
};
|
|
33
33
|
|
|
34
34
|
exports.default = clone;
|
|
35
|
-
module.exports = exports['default'];
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvY2xvbmUuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsSUFBTSxRQUFRLFNBQVIsS0FBUSxDQUFDLEdBQUQsRUFBTSxNQUFOLEVBQWlCO0FBQzNCLFFBQUksUUFBTyxHQUFQLHlDQUFPLEdBQVAsT0FBZSxRQUFmLElBQTJCLFFBQVEsSUFBdkMsRUFBNkM7QUFDekMsZUFBTyxHQUFQO0FBQ0g7QUFDRCxRQUFNLFNBQVMsSUFBSSxJQUFJLFdBQVIsRUFBZjtBQUNBLFNBQUssSUFBSSxDQUFULElBQWMsR0FBZCxFQUFtQjtBQUNmLFlBQUksQ0FBRSxHQUFHLGNBQUgsQ0FBa0IsSUFBbEIsQ0FBdUIsR0FBdkIsRUFBNEIsQ0FBNUIsQ0FBTixFQUF1QztBQUNuQztBQUNIO0FBQ0QsWUFBSSxRQUFRLElBQUksQ0FBSixDQUFaO0FBQ0EsWUFBSSxNQUFNLFFBQU4sSUFBa0IsUUFBTyxLQUFQLHlDQUFPLEtBQVAsT0FBaUIsUUFBdkMsRUFBaUQ7QUFDN0MsZ0JBQUksTUFBSixFQUFZO0FBQ1IsdUJBQU8sQ0FBUCxJQUFZLE1BQVo7QUFDSDtBQUNKLFNBSkQsTUFJTyxJQUFJLE1BQU0sUUFBVixFQUFvQjtBQUN2QixtQkFBTyxDQUFQLElBQVksS0FBWjtBQUNILFNBRk0sTUFFQSxJQUFJLGlCQUFpQixLQUFyQixFQUE0QjtBQUMvQixtQkFBTyxDQUFQLElBQVksTUFBTSxHQUFOLENBQVU7QUFBQSx1QkFBSyxNQUFNLENBQU4sRUFBUyxNQUFULENBQUw7QUFBQSxhQUFWLENBQVo7QUFDSCxTQUZNLE1BRUE7QUFDSCxtQkFBTyxDQUFQLElBQVksTUFBTSxLQUFOLEVBQWEsTUFBYixDQUFaO0FBQ0g7QUFDSjtBQUNELFdBQU8sTUFBUDtBQUNILENBdkJEOztrQkF5QmUsSyIsImZpbGUiOiJjbG9uZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImNvbnN0IGNsb25lID0gKG9iaiwgcGFyZW50KSA9PiB7XG4gICAgaWYgKHR5cGVvZiBvYmogIT09ICdvYmplY3QnIHx8IG9iaiA9PT0gbnVsbCkge1xuICAgICAgICByZXR1cm4gb2JqO1xuICAgIH1cbiAgICBjb25zdCBjbG9uZWQgPSBuZXcgb2JqLmNvbnN0cnVjdG9yKCk7XG4gICAgZm9yIChsZXQgaSBpbiBvYmopIHtcbiAgICAgICAgaWYgKCEoe30uaGFzT3duUHJvcGVydHkuY2FsbChvYmosIGkpKSkge1xuICAgICAgICAgICAgY29udGludWU7XG4gICAgICAgIH1cbiAgICAgICAgbGV0IHZhbHVlID0gb2JqW2ldO1xuICAgICAgICBpZiAoaSA9PT0gJ3BhcmVudCcgJiYgdHlwZW9mIHZhbHVlID09PSAnb2JqZWN0Jykge1xuICAgICAgICAgICAgaWYgKHBhcmVudCkge1xuICAgICAgICAgICAgICAgIGNsb25lZFtpXSA9IHBhcmVudDtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSBlbHNlIGlmIChpID09PSAnc291cmNlJykge1xuICAgICAgICAgICAgY2xvbmVkW2ldID0gdmFsdWU7XG4gICAgICAgIH0gZWxzZSBpZiAodmFsdWUgaW5zdGFuY2VvZiBBcnJheSkge1xuICAgICAgICAgICAgY2xvbmVkW2ldID0gdmFsdWUubWFwKGogPT4gY2xvbmUoaiwgY2xvbmVkKSk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICBjbG9uZWRbaV0gPSBjbG9uZSh2YWx1ZSwgY2xvbmVkKTtcbiAgICAgICAgfVxuICAgIH1cbiAgICByZXR1cm4gY2xvbmVkO1xufTtcblxuZXhwb3J0IGRlZmF1bHQgY2xvbmU7XG4iXX0=
|
|
35
|
+
module.exports = exports['default'];
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
exports.__esModule = true;
|
|
4
|
+
exports.pseudoElements = undefined;
|
|
5
|
+
exports.default = ensureCompatibility;
|
|
6
|
+
|
|
7
|
+
var _caniuseApi = require('caniuse-api');
|
|
8
|
+
|
|
9
|
+
var _postcssSelectorParser = require('postcss-selector-parser');
|
|
10
|
+
|
|
11
|
+
var _postcssSelectorParser2 = _interopRequireDefault(_postcssSelectorParser);
|
|
12
|
+
|
|
13
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
|
+
|
|
15
|
+
var simpleSelectorRe = /^#?[-._a-z0-9 ]+$/i;
|
|
16
|
+
|
|
17
|
+
var cssSel2 = 'css-sel2';
|
|
18
|
+
var cssSel3 = 'css-sel3';
|
|
19
|
+
var cssGencontent = 'css-gencontent';
|
|
20
|
+
var cssFirstLetter = 'css-first-letter';
|
|
21
|
+
var cssFirstLine = 'css-first-line';
|
|
22
|
+
var cssInOutOfRange = 'css-in-out-of-range';
|
|
23
|
+
|
|
24
|
+
var pseudoElements = exports.pseudoElements = {
|
|
25
|
+
':active': cssSel2,
|
|
26
|
+
':after': cssGencontent,
|
|
27
|
+
':before': cssGencontent,
|
|
28
|
+
':checked': cssSel3,
|
|
29
|
+
':default': 'css-default-pseudo',
|
|
30
|
+
':dir': 'css-dir-pseudo',
|
|
31
|
+
':disabled': cssSel3,
|
|
32
|
+
':empty': cssSel3,
|
|
33
|
+
':enabled': cssSel3,
|
|
34
|
+
':first-child': cssSel2,
|
|
35
|
+
':first-letter': cssFirstLetter,
|
|
36
|
+
':first-line': cssFirstLine,
|
|
37
|
+
':first-of-type': cssSel3,
|
|
38
|
+
':focus': cssSel2,
|
|
39
|
+
':focus-within': 'css-focus-within',
|
|
40
|
+
':has': 'css-has',
|
|
41
|
+
':hover': cssSel2,
|
|
42
|
+
':in-range': cssInOutOfRange,
|
|
43
|
+
':indeterminate': 'css-indeterminate-pseudo',
|
|
44
|
+
':lang': cssSel2,
|
|
45
|
+
':last-child': cssSel3,
|
|
46
|
+
':last-of-type': cssSel3,
|
|
47
|
+
':matches': 'css-matches-pseudo',
|
|
48
|
+
':not': cssSel3,
|
|
49
|
+
':nth-child': cssSel3,
|
|
50
|
+
':nth-last-child': cssSel3,
|
|
51
|
+
':nth-last-of-type': cssSel3,
|
|
52
|
+
':nth-of-type': cssSel3,
|
|
53
|
+
':only-child': cssSel3,
|
|
54
|
+
':only-of-type': cssSel3,
|
|
55
|
+
':optional': 'css-optional-pseudo',
|
|
56
|
+
':out-of-range': cssInOutOfRange,
|
|
57
|
+
':placeholder-shown': 'css-placeholder-shown',
|
|
58
|
+
':root': cssSel3,
|
|
59
|
+
':target': cssSel3,
|
|
60
|
+
'::after': cssGencontent,
|
|
61
|
+
'::backdrop': 'dialog',
|
|
62
|
+
'::before': cssGencontent,
|
|
63
|
+
'::first-letter': cssFirstLetter,
|
|
64
|
+
'::first-line': cssFirstLine,
|
|
65
|
+
'::marker': 'css-marker-pseudo',
|
|
66
|
+
'::placeholder': 'css-placeholder',
|
|
67
|
+
'::selection': 'css-selection'
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
function isCssMixin(selector) {
|
|
71
|
+
return selector[selector.length - 1] === ':';
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function ensureCompatibility(selectors, browsers, compatibilityCache) {
|
|
75
|
+
// Should not merge mixins
|
|
76
|
+
if (selectors.some(isCssMixin)) {
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
return selectors.every(function (selector) {
|
|
80
|
+
if (simpleSelectorRe.test(selector)) {
|
|
81
|
+
return true;
|
|
82
|
+
}
|
|
83
|
+
if (compatibilityCache && selector in compatibilityCache) {
|
|
84
|
+
return compatibilityCache[selector];
|
|
85
|
+
}
|
|
86
|
+
var compatible = true;
|
|
87
|
+
(0, _postcssSelectorParser2.default)(function (ast) {
|
|
88
|
+
ast.walk(function (node) {
|
|
89
|
+
var type = node.type,
|
|
90
|
+
value = node.value;
|
|
91
|
+
|
|
92
|
+
if (type === 'pseudo') {
|
|
93
|
+
var entry = pseudoElements[value];
|
|
94
|
+
if (entry && compatible) {
|
|
95
|
+
compatible = (0, _caniuseApi.isSupported)(entry, browsers);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
if (type === 'combinator') {
|
|
99
|
+
if (~value.indexOf('~')) {
|
|
100
|
+
compatible = (0, _caniuseApi.isSupported)(cssSel3, browsers);
|
|
101
|
+
}
|
|
102
|
+
if (~value.indexOf('>') || ~value.indexOf('+')) {
|
|
103
|
+
compatible = (0, _caniuseApi.isSupported)(cssSel2, browsers);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
if (type === 'attribute' && node.attribute) {
|
|
107
|
+
// [foo]
|
|
108
|
+
if (!node.operator) {
|
|
109
|
+
compatible = (0, _caniuseApi.isSupported)(cssSel2, browsers);
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
if (value) {
|
|
113
|
+
// [foo="bar"], [foo~="bar"], [foo|="bar"]
|
|
114
|
+
if (~['=', '~=', '|='].indexOf(node.operator)) {
|
|
115
|
+
compatible = (0, _caniuseApi.isSupported)(cssSel2, browsers);
|
|
116
|
+
}
|
|
117
|
+
// [foo^="bar"], [foo$="bar"], [foo*="bar"]
|
|
118
|
+
if (~['^=', '$=', '*='].indexOf(node.operator)) {
|
|
119
|
+
compatible = (0, _caniuseApi.isSupported)(cssSel3, browsers);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
// [foo="bar" i]
|
|
124
|
+
if (node.insensitive) {
|
|
125
|
+
compatible = (0, _caniuseApi.isSupported)('css-case-insensitive', browsers);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
if (!compatible) {
|
|
129
|
+
// If this node was not compatible,
|
|
130
|
+
// break out early from walking the rest
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
133
|
+
});
|
|
134
|
+
}).process(selector);
|
|
135
|
+
if (compatibilityCache) {
|
|
136
|
+
compatibilityCache[selector] = compatible;
|
|
137
|
+
}
|
|
138
|
+
return compatible;
|
|
139
|
+
});
|
|
140
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "postcss-merge-rules",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.1.2",
|
|
4
4
|
"description": "Merge CSS rules with PostCSS.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -9,9 +9,10 @@
|
|
|
9
9
|
],
|
|
10
10
|
"scripts": {
|
|
11
11
|
"pretest": "eslint src",
|
|
12
|
-
"prepublish": "babel src --out-dir dist --ignore /__tests__/",
|
|
13
|
-
"
|
|
14
|
-
"test
|
|
12
|
+
"prepublish": "del-cli dist && cross-env BABEL_ENV=publish babel src --out-dir dist --ignore /__tests__/",
|
|
13
|
+
"report": "nyc report --reporter=html",
|
|
14
|
+
"test": "cross-env BABEL_ENV=test nyc ava src/__tests__",
|
|
15
|
+
"test-012": "cross-env BABEL_ENV=test nyc ava src/__tests__"
|
|
15
16
|
},
|
|
16
17
|
"keywords": [
|
|
17
18
|
"css",
|
|
@@ -21,19 +22,22 @@
|
|
|
21
22
|
],
|
|
22
23
|
"license": "MIT",
|
|
23
24
|
"devDependencies": {
|
|
24
|
-
"ava": "^0.
|
|
25
|
+
"ava": "^0.17.0",
|
|
25
26
|
"babel-cli": "^6.3.17",
|
|
26
27
|
"babel-core": "^6.3.26",
|
|
27
28
|
"babel-plugin-add-module-exports": "^0.2.1",
|
|
29
|
+
"babel-plugin-istanbul": "^2.0.0",
|
|
28
30
|
"babel-preset-es2015": "^6.3.13",
|
|
29
31
|
"babel-preset-es2015-loose": "^7.0.0",
|
|
30
32
|
"babel-preset-stage-0": "^6.3.13",
|
|
31
33
|
"babel-register": "^6.9.0",
|
|
34
|
+
"cross-env": "^2.0.1",
|
|
32
35
|
"del-cli": "^0.2.0",
|
|
33
36
|
"eslint": "^3.0.0",
|
|
34
37
|
"eslint-config-cssnano": "^3.0.0",
|
|
35
38
|
"eslint-plugin-babel": "^3.3.0",
|
|
36
|
-
"eslint-plugin-import": "^
|
|
39
|
+
"eslint-plugin-import": "^2.0.1",
|
|
40
|
+
"nyc": "^10.0.0",
|
|
37
41
|
"postcss-discard-comments": "^2.0.4",
|
|
38
42
|
"postcss-simple-vars": "^3.0.0"
|
|
39
43
|
},
|
|
@@ -45,7 +49,10 @@
|
|
|
45
49
|
},
|
|
46
50
|
"repository": "ben-eb/postcss-merge-rules",
|
|
47
51
|
"dependencies": {
|
|
52
|
+
"browserslist": "^1.5.2",
|
|
53
|
+
"caniuse-api": "^1.5.2",
|
|
48
54
|
"postcss": "^5.0.4",
|
|
55
|
+
"postcss-selector-parser": "^2.2.2",
|
|
49
56
|
"vendors": "^1.0.0"
|
|
50
57
|
},
|
|
51
58
|
"eslintConfig": {
|
|
@@ -53,5 +60,23 @@
|
|
|
53
60
|
},
|
|
54
61
|
"ava": {
|
|
55
62
|
"require": "babel-register"
|
|
63
|
+
},
|
|
64
|
+
"nyc": {
|
|
65
|
+
"sourceMap": false,
|
|
66
|
+
"instrument": false
|
|
67
|
+
},
|
|
68
|
+
"browserslist": {
|
|
69
|
+
"chrome58": [
|
|
70
|
+
"Chrome 58"
|
|
71
|
+
],
|
|
72
|
+
"edge15": [
|
|
73
|
+
"Edge 15"
|
|
74
|
+
],
|
|
75
|
+
"ie6": [
|
|
76
|
+
"IE 6"
|
|
77
|
+
],
|
|
78
|
+
"ie7": [
|
|
79
|
+
"IE 7"
|
|
80
|
+
]
|
|
56
81
|
}
|
|
57
82
|
}
|