From e0c6cf23bae41667ed49a7345dd69780eb12df23 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sun, 10 Dec 2023 19:21:21 -0500 Subject: Resolve stylelint deprecations (#353) * Install stylelint-stylistic * Update rules * Alphabetize --- .stylelintrc.json | 72 +++++++++++++++++++++++++++++-------------------------- package-lock.json | 42 ++++++++++++++++++++++++++++++++ package.json | 1 + 3 files changed, 81 insertions(+), 34 deletions(-) diff --git a/.stylelintrc.json b/.stylelintrc.json index 04d59126..7e900cfd 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -1,58 +1,62 @@ { "extends": "stylelint-config-recommended", + "plugins": [ + "stylelint-stylistic" + ], "ignoreFiles": [ "ext/lib/**/*.css" ], "rules": { - "font-family-name-quotes": "always-where-recommended", - "string-quotes": "single", + "at-rule-empty-line-before": null, + "block-no-empty": true, + "color-hex-length": null, "color-named": "never", + "custom-property-empty-line-before": null, "declaration-no-important": true, + "font-family-name-quotes": "always-where-recommended", + "font-weight-notation": "named-where-possible", "function-calc-no-unspaced-operator": true, + "function-name-case": "lower", + "length-zero-no-unit": null, + "no-descending-specificity": null, + "no-duplicate-selectors": null, + "no-invalid-double-slash-comments": true, + "rule-empty-line-before": null, + "selector-type-no-unknown": null, + "selector-pseudo-element-colon-notation": "double", "string-no-newline": true, "unit-no-unknown": true, - "block-no-empty": true, - "no-extra-semicolons": true, - "no-invalid-double-slash-comments": true, - "font-weight-notation": "named-where-possible", - "color-hex-case": "lower", - "function-comma-space-after": "always", - "function-comma-space-before": "never", - "function-name-case": "lower", - "function-parentheses-space-inside": "never", - "function-whitespace-after": "always", - "number-leading-zero": "always", - "number-no-trailing-zeros": true, - "unit-case": "lower", "value-keyword-case": [ "lower", { "camelCaseSvgKeywords": true } ], - "property-case": "lower", - "indentation": 4, - "max-empty-lines": 2, - "selector-type-no-unknown": null, - "no-descending-specificity": null, - "no-duplicate-selectors": null, - "selector-combinator-space-before": "never", - "selector-combinator-space-after": "never", - "selector-list-comma-newline-after": "always-multi-line", - "rule-empty-line-before": null, - "block-opening-brace-space-before": [ + + "stylistic/block-opening-brace-space-after": "always-single-line", + "stylistic/block-opening-brace-space-before": [ "always", { "ignoreSelectors": "/^\\.icon/" } ], - "block-opening-brace-space-after": "always-single-line", - "color-hex-length": null, - "declaration-colon-space-before": "never", - "declaration-colon-space-after": "always-single-line", - "length-zero-no-unit": null, - "selector-pseudo-element-colon-notation": "double", - "custom-property-empty-line-before": null, - "at-rule-empty-line-before": null + "stylistic/color-hex-case": "lower", + "stylistic/declaration-colon-space-after": "always-single-line", + "stylistic/declaration-colon-space-before": "never", + "stylistic/function-comma-space-after": "always", + "stylistic/function-comma-space-before": "never", + "stylistic/function-parentheses-space-inside": "never", + "stylistic/function-whitespace-after": "always", + "stylistic/indentation": 4, + "stylistic/max-empty-lines": 2, + "stylistic/no-extra-semicolons": true, + "stylistic/number-leading-zero": "always", + "stylistic/number-no-trailing-zeros": true, + "stylistic/property-case": "lower", + "stylistic/selector-combinator-space-after": "never", + "stylistic/selector-combinator-space-before": "never", + "stylistic/selector-list-comma-newline-after": "always-multi-line", + "stylistic/string-quotes": "single", + "stylistic/unit-case": "lower" } } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ee23f622..1e291cf2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,6 +51,7 @@ "license-report": "^6.5.0", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", + "stylelint-stylistic": "^0.4.3", "typescript": "5.3.3", "vitest": "^0.34.6" } @@ -4574,6 +4575,12 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/postcss-media-query-parser": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", + "dev": true + }, "node_modules/postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -5436,6 +5443,22 @@ "stylelint": "^15.10.0" } }, + "node_modules/stylelint-stylistic": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/stylelint-stylistic/-/stylelint-stylistic-0.4.3.tgz", + "integrity": "sha512-WphmneK3MRrm5ixvRPWy7+c9+EQUh0FPvNMXW/N9VD85vyqtpxUejpD+mxubVVht0fRgidcqBxtW3s3tU2Ujhw==", + "dev": true, + "dependencies": { + "is-plain-object": "^5.0.0", + "postcss": "^8.4.21", + "postcss-media-query-parser": "^0.2.3", + "postcss-value-parser": "^4.2.0", + "style-search": "^0.1.0" + }, + "peerDependencies": { + "stylelint": "^15.0.0" + } + }, "node_modules/stylelint/node_modules/balanced-match": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", @@ -9406,6 +9429,12 @@ "source-map-js": "^1.0.2" } }, + "postcss-media-query-parser": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", + "dev": true + }, "postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -10086,6 +10115,19 @@ "dev": true, "requires": {} }, + "stylelint-stylistic": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/stylelint-stylistic/-/stylelint-stylistic-0.4.3.tgz", + "integrity": "sha512-WphmneK3MRrm5ixvRPWy7+c9+EQUh0FPvNMXW/N9VD85vyqtpxUejpD+mxubVVht0fRgidcqBxtW3s3tU2Ujhw==", + "dev": true, + "requires": { + "is-plain-object": "^5.0.0", + "postcss": "^8.4.21", + "postcss-media-query-parser": "^0.2.3", + "postcss-value-parser": "^4.2.0", + "style-search": "^0.1.0" + } + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", diff --git a/package.json b/package.json index b908e2f6..e277ce48 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "license-report": "^6.5.0", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", + "stylelint-stylistic": "^0.4.3", "typescript": "5.3.3", "vitest": "^0.34.6" }, -- cgit v1.2.3