Tweak stylelint config (#38228)

* rename to .stylelintrc.json
* add reportInvalidScopeDisables to config
* move reportNeedlessDisables to config
* merge the two configs
* remove unneeded disabled rules from the examples config

diff --git a/.stylelintrc b/.stylelintrc
deleted file mode 100644 (file)
index 7a7ca3f..0000000
--- a/.stylelintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "extends": [
-    "stylelint-config-twbs-bootstrap"
-  ],
-  "rules": {
-    "declaration-property-value-disallowed-list": {
-      "border": "none",
-      "outline": "none"
-    },
-    "function-disallowed-list": [
-      "calc",
-      "lighten",
-      "darken"
-    ],
-    "property-disallowed-list": [
-      "border-radius",
-      "border-top-left-radius",
-      "border-top-right-radius",
-      "border-bottom-right-radius",
-      "border-bottom-left-radius",
-      "transition"
-    ],
-    "scss/dollar-variable-default": [
-      true,
-      {
-        "ignore": "local"
-      }
-    ],
-    "scss/selector-no-union-class-name": true
-  },
-  "overrides": [
-    {
-      "files": "scss/**/*.{test,spec}.scss",
-      "rules": {
-        "scss/dollar-variable-default": null,
-        "declaration-no-important": null
-      }
-    }
-  ]
-}

diff --git a/.stylelintrc.json b/.stylelintrc.json
new file mode 100644 (file)
index 0000000..589884a
--- /dev/null
+++ b/.stylelintrc.json
@@ -0,0 +1,60 @@
+{
+  "extends": [
+    "stylelint-config-twbs-bootstrap"
+  ],
+  "reportInvalidScopeDisables": true,
+  "reportNeedlessDisables": true,
+  "overrides": [
+    {
+      "files": "**/*.scss",
+      "rules": {
+        "declaration-property-value-disallowed-list": {
+          "border": "none",
+          "outline": "none"
+        },
+        "function-disallowed-list": [
+          "calc",
+          "lighten",
+          "darken"
+        ],
+        "property-disallowed-list": [
+          "border-radius",
+          "border-top-left-radius",
+          "border-top-right-radius",
+          "border-bottom-right-radius",
+          "border-bottom-left-radius",
+          "transition"
+        ],
+        "scss/dollar-variable-default": [
+          true,
+          {
+            "ignore": "local"
+          }
+        ],
+        "scss/selector-no-union-class-name": true
+      }
+    },
+    {
+      "files": "scss/**/*.{test,spec}.scss",
+      "rules": {
+        "scss/dollar-variable-default": null,
+        "declaration-no-important": null
+      }
+    },
+    {
+      "files": "site/**/*.scss",
+      "rules": {
+        "scss/dollar-variable-default": null
+      }
+    },
+    {
+      "files": "site/**/examples/**/*.css",
+      "rules": {
+        "comment-empty-line-before": null,
+        "property-no-vendor-prefix": null,
+        "selector-no-qualifying-type": null,
+        "value-no-vendor-prefix": null
+      }
+    }
+  ]
+}

diff --git a/package.json b/package.json
index 396f0dede52387480fa02abf43ae16f65aef5dd2..b3bb7caa97f4fa0fb6bb3ec045edd296204a3e9c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "css-compile": "sass --style expanded --source-map --embed-sources --no-error-css scss/:dist/css/",
     "css-rtl": "cross-env NODE_ENV=RTL postcss --config build/postcss.config.js --dir \"dist/css\" --ext \".rtl.css\" \"dist/css/*.css\" \"!dist/css/*.min.css\" \"!dist/css/*.rtl.css\"",
     "css-lint": "npm-run-all --aggregate-output --continue-on-error --parallel css-lint-*",
-    "css-lint-stylelint": "stylelint \"**/*.{css,scss}\" --cache --cache-location .cache/.stylelintcache --rd",
+    "css-lint-stylelint": "stylelint \"**/*.{css,scss}\" --cache --cache-location .cache/.stylelintcache",
     "css-lint-vars": "fusv scss/ site/assets/scss/",
     "css-minify": "npm-run-all --aggregate-output --parallel css-minify-*",
     "css-minify-main": "cleancss -O1 --format breakWith=lf --with-rebase --source-map --source-map-inline-sources --output dist/css/ --batch --batch-suffix \".min\" \"dist/css/*.css\" \"!dist/css/*.min.css\" \"!dist/css/*rtl*.css\"",

diff --git a/site/assets/scss/_variables.scss b/site/assets/scss/_variables.scss
index 2be53499464238d5843d790a67f392476103a4f1..3770e81d8f60c93d229519e6a3793d4459254249 100644 (file)
--- a/site/assets/scss/_variables.scss
+++ b/site/assets/scss/_variables.scss
@@ -1,5 +1,3 @@
-// stylelint-disable scss/dollar-variable-default
-
 // Local docs variables
 $bd-purple:        #4c0bce;
 $bd-violet:        lighten(saturate($bd-purple, 5%), 15%); // stylelint-disable-line function-disallowed-list

diff --git a/site/assets/scss/docs.scss b/site/assets/scss/docs.scss
index fb85262e78b567f6e5b1cf027fc2ffa64fd39a6d..4ab417e96be29ad1192989119273e4e3444cbcc4 100644 (file)
--- a/site/assets/scss/docs.scss
+++ b/site/assets/scss/docs.scss
@@ -28,8 +28,8 @@
 @import "../../../scss/mixins";
 
 // fusv-disable
-$enable-grid-classes: false; // stylelint-disable-line scss/dollar-variable-default
-$enable-cssgrid: true; // stylelint-disable-line scss/dollar-variable-default
+$enable-grid-classes: false;
+$enable-cssgrid: true;
 // fusv-enable
 @import "../../../scss/grid";
 

diff --git a/site/content/docs/5.3/examples/.stylelintrc b/site/content/docs/5.3/examples/.stylelintrc
deleted file mode 100644 (file)
index 79ea92d..0000000
--- a/site/content/docs/5.3/examples/.stylelintrc
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "extends": [
-    "stylelint-config-twbs-bootstrap"
-  ],
-  "rules": {
-    "at-rule-no-vendor-prefix": null,
-    "comment-empty-line-before": null,
-    "media-feature-name-no-vendor-prefix": null,
-    "property-disallowed-list": null,
-    "property-no-vendor-prefix": null,
-    "selector-no-qualifying-type": null,
-    "selector-no-vendor-prefix": null,
-    "value-no-vendor-prefix": null
-  }
-}