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.

Sign up for GitHub

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

Jump to bottom

fix(postcss-colormin): Strict color parsing #1122

Merged
merged 4 commits into from May 21, 2021
Merged

fix(postcss-colormin): Strict color parsing #1122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64d7099
Strict color parsing
omgovich May 21, 2021
40d5d99
Add more tests
omgovich May 21, 2021
2238c5d
Fix cssnano-preset-default snapshots
omgovich May 21, 2021
378a687
Fix cssnano-preset-advanced snapshots
omgovich May 21, 2021
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
2 changes: 1 addition & 1 deletion packages/postcss-colormin/package.json
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
"repository": "cssnano/cssnano",
"dependencies": {
"browserslist": "^4.16.0",
"colord": "^1.7.2",
"colord": "^2.0.0",
"postcss-value-parser": "^4.1.0"
},
"bugs": {
Expand Down
19 changes: 3 additions & 16 deletions packages/postcss-colormin/src/colours.js
View file
Open in desktop
@@ -1,28 +1,15 @@
import { colord, extend, getFormat } from 'colord';
import { colord, extend } from 'colord';
import namesPlugin from 'colord/plugins/names';
import toShorthand from './lib/toShorthand';

extend([namesPlugin]);

export default (colour, isLegacy = false) => {
if (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 = colord(colour);

const parsed = colord(colour.toLowerCase());
if (parsed.isValid()) {
const alpha = parsed.alpha();

if (alpha === 1) {
const toHex = toShorthand(parsed.toHex());
const toName = parsed.toName();
Expand Down
8 changes: 4 additions & 4 deletions packages/postcss-colormin/yarn.lock
View file
Open in desktop
Expand Up @@ -18,10 +18,10 @@ caniuse-lite@^1.0.30001165:
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001170.tgz#0088bfecc6a14694969e391cc29d7eb6362ca6a7"
integrity sha512-Dd4d/+0tsK0UNLrZs3CvNukqalnVTRrxb5mcQm8rHL49t7V5ZaTygwXkrq+FB+dVDf++4ri8eJnFEJAB8332PA==

colord@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/colord/-/colord-1.7.2.tgz#474f0e46333cb5c7a191dbd571edeee19a5f97b6"
integrity sha512-/sQCxy6PEhZbrAn1+NVRRefy3k4jkWQGxk7mo2o0CoNA24jq4ujDc2jXzJ5uXphm/TwfdGOP0w8U+H+9ys4Peg==
colord@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/colord/-/colord-2.0.0.tgz#f8c19f2526b7dc5b22d6e57ef102f03a2a43a3d8"
integrity sha512-WMDFJfoY3wqPZNpKUFdse3HhD5BHCbE9JCdxRzoVH+ywRITGOeWAHNkGEmyxLlErEpN9OLMWgdM9dWQtDk5dog==

colorette@^1.2.1, colorette@^1.2.2:
version "1.2.2"
Expand Down