Chore(stylelint): Use the latest shared Stylelint config to resolve c…

…ompatibility with Stylelint 14
lmc-eu · Jan 20, 2022 · ab0080a · ab0080a
1 parent b1699d0
commit ab0080a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 46 deletions.
diff --git a/.stylelintrc b/.stylelintrc
@@ -1,6 +1,7 @@
 {
   "extends": [
     "@lmc-eu/stylelint-config",
-    "@lmc-eu/stylelint-config/optional"
+    "@lmc-eu/stylelint-config/optional",
+    "stylelint-config-prettier"
   ]
 }
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "@lmc-eu/conventional-changelog-lmc-github": "1.0.1",
     "@lmc-eu/eslint-config-base": "1.1.1",
     "@lmc-eu/prettier-config": "1.2.1",
-    "@lmc-eu/stylelint-config": "2.0.2",
+    "@lmc-eu/stylelint-config": "3.0.0",
     "@types/jest": "27.4.0",
     "@typescript-eslint/eslint-plugin": "5.9.1",
     "@typescript-eslint/parser": "5.9.1",
@@ -102,8 +102,8 @@
     "prettier": "2.5.1",
     "replace-in-file": "6.3.2",
     "sass": "1.48.0",
-    "stylelint": "14.2.0",
-    "stylelint-order": "5.0.0",
+    "stylelint": "^14.2.0",
+    "stylelint-config-prettier": "^9.0.3",
     "ts-jest": "27.1.3",
     "ts-node": "10.4.0",
     "typescript": "4.5.4"

diff --git a/src/scss/_style.scss b/src/scss/_style.scss
@@ -7,8 +7,7 @@
 @use 'settings';
 @use 'tools';
 
-// Original CSS heavily relies on ID selectors.
-/* stylelint-disable selector-max-id */
+// stylelint-disable selector-max-id -- Original CSS heavily relies on ID selectors.
 
 //
 // Shared Styles
@@ -54,8 +53,6 @@
 }
 
 #c-ttl {
-    // Stylelint and Prettier are clashing on the following line. Let's prefer Stylelint.
-    /* prettier-ignore */
     margin-bottom: tools.rem2em(tokens.$space-6, tools.rem2em(tokens.$heading-small-desktop));
     font-size: tools.rem2em(tokens.$heading-small-desktop);
     line-height: tokens.$line-height-small;
@@ -96,8 +93,7 @@
 
 #cc--main {
     // Use maximum permissible value for `z-index` to overlap UI of other third-party plugins. Sorry!
-    // Allow !important to override inline style injected by the plugin.
-    // stylelint-disable-next-line declaration-no-important
+    // stylelint-disable-next-line declaration-no-important -- Override inline style injected by original library.
     z-index: 2147483647 !important;
 }
 

diff --git a/src/scss/_theme.scss b/src/scss/_theme.scss
@@ -11,9 +11,6 @@
 @use '@tokens' as tokens;
 @use 'tools';
 
-// Stylelint and Prettier are clashing on long lines. Let's prefer Stylelint.
-/* prettier-ignore */
-
 :root {
     //
     // Common Settings
@@ -53,9 +50,6 @@
 // Dark Mode
 // =========
 
-// Stylelint and Prettier are clashing on long lines. Let's prefer Stylelint.
-/* prettier-ignore */
-
 .c_darkmode {
     --lmcccm-p-bg: var(--lmcccm-bg, #{tokens.$background-inverted});
     --lmcccm-p-text: var(--lmcccm-text, #{tokens.$text-secondary-inverted-default});

diff --git a/yarn.lock b/yarn.lock
@@ -1646,12 +1646,12 @@
   resolved "https://registry.yarnpkg.com/@lmc-eu/spirit-design-tokens/-/spirit-design-tokens-0.5.0.tgz#479949f25d1d7708fc87d82688a461d8cbb7fa14"
   integrity sha512-+bQeAXhNkmM7rKzMZpl+zTyAc3XJ5hu6e+ff09InlGaXxU4n7540pEMaC5TC0OQgvNs+bHhLM+ugmeRraVMzGA==
 
-"@lmc-eu/stylelint-config@2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@lmc-eu/stylelint-config/-/stylelint-config-2.0.2.tgz#d68cf3e46f54dfa368d5827eb0f347a08805f50b"
-  integrity sha512-v8vIq4s1BwGr0PFVu9sxdmSdJ/c1gvAkIxAUWn0/eF1KorodlfE+bHj5eQ9VrGA3gVakUZiMWgM2glENLX1QBQ==
+"@lmc-eu/stylelint-config@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lmc-eu/stylelint-config/-/stylelint-config-3.0.0.tgz#362e6a155e0b99133ff1511a96cd6907bbb43c0f"
+  integrity sha512-/gzgKllmSTepmY3ZYwtApauB9ryr2QEfItFgvZVboYor3F32lcSAjB9du9EvFwWsk2RJcDwMKNBTfiUl2BhOeA==
   dependencies:
-    stylelint-config-standard "^20.0.0"
+    postcss-scss "^4.0.3"
     stylelint-order "^4.1.0"
 
 "@nodelib/fs.scandir@2.1.5":
@@ -5367,6 +5367,11 @@ postcss-safe-parser@^6.0.0:
   resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
   integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
 
+postcss-scss@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.3.tgz#36c23c19a804274e722e83a54d20b838ab4767ac"
+  integrity sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==
+
 postcss-selector-parser@^6.0.7:
   version "6.0.8"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz#f023ed7a9ea736cd7ef70342996e8e78645a7914"
@@ -5383,11 +5388,6 @@ postcss-sorting@^5.0.1:
     lodash "^4.17.14"
     postcss "^7.0.17"
 
-postcss-sorting@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-7.0.1.tgz#923b5268451cf2d93ebf8835e17a6537757049a5"
-  integrity sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==
-
 postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
@@ -6036,25 +6036,10 @@ 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-config-recommended@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
-  integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
-
-stylelint-config-standard@^20.0.0:
-  version "20.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz#06135090c9e064befee3d594289f50e295b5e20d"
-  integrity sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==
-  dependencies:
-    stylelint-config-recommended "^3.0.0"
-
-stylelint-order@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-5.0.0.tgz#abd20f6b85ac640774cbe40e70d3fe9c6fdf4400"
-  integrity sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==
-  dependencies:
-    postcss "^8.3.11"
-    postcss-sorting "^7.0.1"
+stylelint-config-prettier@^9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.3.tgz#0dccebeff359dcc393c9229184408b08964d561c"
+  integrity sha512-5n9gUDp/n5tTMCq1GLqSpA30w2sqWITSSEiAWQlpxkKGAUbjcemQ0nbkRvRUa0B1LgD3+hCvdL7B1eTxy1QHJg==
 
 stylelint-order@^4.1.0:
   version "4.1.0"
@@ -6065,7 +6050,7 @@ stylelint-order@^4.1.0:
     postcss "^7.0.31"
     postcss-sorting "^5.0.1"
 
-stylelint@14.2.0:
+stylelint@^14.2.0:
   version "14.2.0"
   resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.2.0.tgz#da4f0f4580e66911c38c376ed82447b78e32b0fb"
   integrity sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==