build: fix stylelint violations and bump stylelint version (#18023)

crisbeto · mmalerba · commit dda6af77d7d4 · 2019-12-29T17:36:14.000-05:00
We had missed some stylelint violations, because we had a very well hidden `stylelint-disable` in one place. These changes fix the linting issues and bump us to the latest version of Stylelint.
diff --git a/package.json b/package.json
@@ -141,7 +141,7 @@
     "semver": "^6.3.0",
     "send": "^0.17.1",
     "shelljs": "^0.8.3",
-    "stylelint": "^10.1.0",
+    "stylelint": "^12.0.0",
     "terser": "^4.3.9",
     "ts-api-guardian": "^0.4.6",
     "ts-node": "^3.0.4",
diff --git a/src/cdk/a11y/_a11y.scss b/src/cdk/a11y/_a11y.scss
@@ -26,7 +26,8 @@
 //    `white-on-black` or `black-on-white`.
 @mixin cdk-high-contrast($target: active) {
   @if ($target != 'active' and $target != 'black-on-white' and $target != 'white-on-black') {
-    @error 'Unknown cdk-high-contrast value "#{$target}" provided. Allowed values are "active", "black-on-white", and "white-on-black"'; // stylelint-disable
+    @error 'Unknown cdk-high-contrast value "#{$target}" provided. ' +
+           'Allowed values are "active", "black-on-white", and "white-on-black"';
   }
 
   // If the selector context has multiple parts, such as `.section, .region`, just doing
@@ -36,10 +37,11 @@
     $selector-context: #{&};
     .cdk-high-contrast-#{$target} {
       @if ($selector-context == '') {
-        @content
-      } @else {
+        @content;
+      }
+      @else {
         #{$selector-context} {
-          @content
+          @content;
         }
       }
     }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@`
`26`	`26`	// `white-on-black` or `black-on-white`.
`27`	`27`	`@mixin cdk-high-contrast($target: active) {`
`28`	`28`	`@if ($target != 'active' and $target != 'black-on-white' and $target != 'white-on-black') {`
`29`		`- @error 'Unknown cdk-high-contrast value "#{$target}" provided. Allowed values are "active", "black-on-white", and "white-on-black"'; // stylelint-disable`
	`29`	`+ @error 'Unknown cdk-high-contrast value "#{$target}" provided. ' +`
	`30`	`+ 'Allowed values are "active", "black-on-white", and "white-on-black"';`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	// If the selector context has multiple parts, such as `.section, .region`, just doing
`@@ -36,10 +37,11 @@`
`36`	`37`	`$selector-context: #{&};`
`37`	`38`	`.cdk-high-contrast-#{$target} {`
`38`	`39`	`@if ($selector-context == '') {`
`39`		`- @content`
`40`		`- } @else {`
	`40`	`+ @content;`
	`41`	`+ }`
	`42`	`+ @else {`
`41`	`43`	`#{$selector-context} {`
`42`		`- @content`
	`44`	`+ @content;`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`	`}`