Skip to content

Commit

Permalink
build: fix compilation error with new version of stylelint (#24410)
Browse files Browse the repository at this point in the history
Fixes that one of our lint rules wasn't compiling with the latest version of Stylelint. This is breaking #24406.

(cherry picked from commit e6774f0)
  • Loading branch information
crisbeto authored and wagnermaciel committed Feb 15, 2022
1 parent 2c73b2d commit db65db3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"semver": "^7.3.5",
"send": "^0.17.2",
"shelljs": "^0.8.5",
"stylelint": "^14.3.0",
"stylelint": "^14.5.0",
"terser": "^5.10.0",
"ts-node": "^10.4.0",
"tsec": "0.2.1",
Expand Down
6 changes: 3 additions & 3 deletions tools/stylelint/no-prefixes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {NeedsPrefix} from './needs-prefix';
const parseSelector = require('stylelint/lib/utils/parseSelector');
const ruleName = 'material/no-prefixes';
const messages = utils.ruleMessages(ruleName, {
property: (property: string, browsers: string[]) => {
return `Unprefixed property "${property}" needs a prefix for browsers ${browsers.join(', ')}.`;
property: (property: string, browsers: string) => {
return `Unprefixed property "${property}" needs a prefix for browsers ${browsers}.`;
},
value: (property, value) => `Unprefixed value in "${property}: ${value}".`,
atRule: name => `Unprefixed @rule "${name}".`,
Expand Down Expand Up @@ -39,7 +39,7 @@ const plugin = createPlugin(ruleName, (isEnabled: boolean, {filePattern, browser
utils.report({
result,
ruleName,
message: messages.property(decl.prop, propertyPrefixes),
message: messages.property(decl.prop, propertyPrefixes.join(', ')),
node: decl,
index: (decl.raws.before || '').length,
});
Expand Down
19 changes: 12 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@

"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#53288ecf017db68dae5f3c3c5d7f083cb3cead66":
version "0.0.0-366b75358638462665784668cb763f3721ee8cc8"
uid "53288ecf017db68dae5f3c3c5d7f083cb3cead66"
resolved "https://github.com/angular/dev-infra-private-builds.git#53288ecf017db68dae5f3c3c5d7f083cb3cead66"
dependencies:
"@actions/core" "^1.4.0"
Expand Down Expand Up @@ -5774,6 +5773,11 @@ css-blank-pseudo@^3.0.2:
dependencies:
postcss-selector-parser "^6.0.9"

css-functions-list@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.0.1.tgz#1460df7fb584d1692c30b105151dbb988c8094f9"
integrity sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==

css-has-pseudo@^3.0.3:
version "3.0.4"
resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73"
Expand Down Expand Up @@ -12532,7 +12536,7 @@ postcss@8.4.5:
picocolors "^1.0.0"
source-map-js "^1.0.1"

postcss@8.4.6, postcss@^8.1.7, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.3.7, postcss@^8.4.5:
postcss@8.4.6, postcss@^8.1.7, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.3.7, postcss@^8.4.5, postcss@^8.4.6:
version "8.4.6"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1"
integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==
Expand Down Expand Up @@ -14503,14 +14507,15 @@ style-search@^0.1.0:
resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=

stylelint@^14.3.0:
version "14.3.0"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.3.0.tgz#26b62730da7b3dc320021fc469d80048d7b77ebe"
integrity sha512-PZXSwtJe4f4qBPWBwAbHL0M0Qjrv8iHN+cLpUNsffaVMS3YzpDDRI73+2lsqLAYfQEzxRwpll6BDKImREbpHWA==
stylelint@^14.5.0:
version "14.5.0"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.5.0.tgz#d94252027164bc918303a6b782652931421d8871"
integrity sha512-4dvQjrhAz2njLoE1OvUEZpryNWcmx2w5Lq5jlibxFv6b5W6O8/vob12M2ZzhX3Ndzs5f67F+BEYmhnQXOwfVYQ==
dependencies:
balanced-match "^2.0.0"
colord "^2.9.2"
cosmiconfig "^7.0.1"
css-functions-list "^3.0.0"
debug "^4.3.3"
execall "^2.0.0"
fast-glob "^3.2.11"
Expand All @@ -14532,7 +14537,7 @@ stylelint@^14.3.0:
normalize-path "^3.0.0"
normalize-selector "^0.2.0"
picocolors "^1.0.0"
postcss "^8.4.5"
postcss "^8.4.6"
postcss-media-query-parser "^0.2.3"
postcss-resolve-nested-selector "^0.1.1"
postcss-safe-parser "^6.0.0"
Expand Down

0 comments on commit db65db3

Please sign in to comment.