Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(postcss-merge-rules): prevent breaking rule merges #1072

Merged
merged 5 commits into from May 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion .all-contributorsrc
Expand Up @@ -620,7 +620,17 @@
"contributions": [
"maintenance"
]
},
{
"login": "MapTo0",
"name": "Martin",
"avatar_url": "https://avatars.githubusercontent.com/u/5821279?v=4",
"profile": "https://github.com/MapTo0",
"contributions": [
"code"
]
}
],
"repoType": "github"
"repoType": "github",
"commitConvention": "none"
}
3 changes: 3 additions & 0 deletions CONTRIBUTORS.md
Expand Up @@ -87,6 +87,9 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
<td align="center"><a href="https://genemecija.com"><img src="https://avatars2.githubusercontent.com/u/39816902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Gene Mecija</b></sub></a><br /><a href="https://github.com/cssnano/cssnano/issues?q=author%3Agenemecija" title="Bug reports">🐛</a> <a href="https://github.com/cssnano/cssnano/commits?author=genemecija" title="Code">💻</a> <a href="https://github.com/cssnano/cssnano/commits?author=genemecija" title="Tests">⚠️</a></td>
<td align="center"><a href="https://www.ludofischer.com"><img src="https://avatars1.githubusercontent.com/u/43557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ludovico Fischer</b></sub></a><br /><a href="#maintenance-ludofischer" title="Maintenance">🚧</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/MapTo0"><img src="https://avatars.githubusercontent.com/u/5821279?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin</b></sub></a><br /><a href="https://github.com/cssnano/cssnano/commits?author=MapTo0" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-restore -->
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions packages/postcss-merge-rules/src/__tests__/index.js
Expand Up @@ -619,6 +619,19 @@ test('should not crash when node.raws.value is null (2)', () => {
);
});

test(
'should not merge :host(tagname) with tagname',
processCSS(
':host(tag){display:block}tag{display:block}',
':host(tag){display:block}tag{display:block}'
)
);

test(
'should not merge unknown and known selector',
passthroughCSS('p {color: blue}:nonsense {color: blue}')
);

test(
'should merge multiple media queries',
processCSS(
Expand Down
40 changes: 5 additions & 35 deletions packages/postcss-merge-rules/src/index.js
@@ -1,10 +1,10 @@
import browserslist from 'browserslist';
import vendors from 'vendors';
import { sameParent } from 'cssnano-utils';
import ensureCompatibility from './lib/ensureCompatibility';

/** @type {string[]} */
const prefixes = vendors.map((v) => `-${v}-`);
import {
ensureCompatibility,
sameVendor,
noVendor,
} from './lib/ensureCompatibility';

/**
* @param {postcss.Declaration} a
Expand Down Expand Up @@ -52,36 +52,6 @@ function sameDeclarationsAndOrder(a, b) {
return a.every((d, index) => declarationIsEqual(d, b[index]));
}

// Internet Explorer use :-ms-input-placeholder.
// Microsoft Edge use ::-ms-input-placeholder.
const findMsInputPlaceholder = (selector) =>
~selector.search(/-ms-input-placeholder/i);

/**
* @param {string} selector
* @return {string[]}
*/
function filterPrefixes(selector) {
return prefixes.filter((prefix) => selector.indexOf(prefix) !== -1);
}

function sameVendor(selectorsA, selectorsB) {
let same = (selectors) => selectors.map(filterPrefixes).join();
let findMsVendor = (selectors) => selectors.find(findMsInputPlaceholder);
return (
same(selectorsA) === same(selectorsB) &&
!(findMsVendor(selectorsA) && findMsVendor(selectorsB))
);
}

/**
* @param {string} selector
* @return {boolean}
*/
function noVendor(selector) {
return !filterPrefixes(selector).length;
}

/**
* @param {postcss.Rule} ruleA
* @param {postcss.Rule} ruleB
Expand Down
52 changes: 47 additions & 5 deletions packages/postcss-merge-rules/src/lib/ensureCompatibility.js
@@ -1,5 +1,6 @@
import { isSupported } from 'caniuse-api';
import selectorParser from 'postcss-selector-parser';
import vendors from 'vendors';

const simpleSelectorRe = /^#?[-._a-z0-9 ]+$/i;

Expand All @@ -10,6 +11,39 @@ const cssFirstLetter = 'css-first-letter';
const cssFirstLine = 'css-first-line';
const cssInOutOfRange = 'css-in-out-of-range';

/** @type {string[]} */
const prefixes = vendors.map((v) => `-${v}-`);

/**
* @param {string} selector
* @return {string[]}
*/
export function filterPrefixes(selector) {
return prefixes.filter((prefix) => selector.indexOf(prefix) !== -1);
}

// Internet Explorer use :-ms-input-placeholder.
// Microsoft Edge use ::-ms-input-placeholder.
const findMsInputPlaceholder = (selector) =>
~selector.search(/-ms-input-placeholder/i);

export function sameVendor(selectorsA, selectorsB) {
let same = (selectors) => selectors.map(filterPrefixes).join();
let findMsVendor = (selectors) => selectors.find(findMsInputPlaceholder);
return (
same(selectorsA) === same(selectorsB) &&
!(findMsVendor(selectorsA) && findMsVendor(selectorsB))
);
}

/**
* @param {string} selector
* @return {boolean}
*/
export function noVendor(selector) {
return !filterPrefixes(selector).length;
}

export const pseudoElements = {
':active': cssSel2,
':after': cssGencontent,
Expand Down Expand Up @@ -61,6 +95,10 @@ function isCssMixin(selector) {
return selector[selector.length - 1] === ':';
}

function isHostPseudoClass(selector) {
return selector.includes(':host');
}

const isSupportedCache = {};

// Move to util in future
Expand All @@ -76,15 +114,16 @@ function isSupportedCached(feature, browsers) {
return result;
}

export default function ensureCompatibility(
selectors,
browsers,
compatibilityCache
) {
export function ensureCompatibility(selectors, browsers, compatibilityCache) {
// Should not merge mixins
if (selectors.some(isCssMixin)) {
return false;
}

// Should not merge :host selector https://github.com/angular/angular-cli/issues/18672
if (selectors.some(isHostPseudoClass)) {
return false;
}
return selectors.every((selector) => {
if (simpleSelectorRe.test(selector)) {
return true;
Expand All @@ -98,6 +137,9 @@ export default function ensureCompatibility(
const { type, value } = node;
if (type === 'pseudo') {
const entry = pseudoElements[value];
if (!entry && noVendor(value)) {
compatible = false;
}
if (entry && compatible) {
compatible = isSupportedCached(entry, browsers);
}
Expand Down