Skip to content

Commit a207a1f

Browse files
authored
Disable stylelint rules that are conflicting with Prettier (mastodon#31339)
1 parent 664bef3 commit a207a1f

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
"prettier": "^3.3.3",
190190
"react-test-renderer": "^18.2.0",
191191
"stylelint": "^16.0.2",
192+
"stylelint-config-prettier-scss": "^1.0.0",
192193
"stylelint-config-standard-scss": "^13.0.0",
193194
"typescript": "^5.0.4",
194195
"webpack-dev-server": "^3.11.3"

stylelint.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
extends: ['stylelint-config-standard-scss'],
2+
extends: ['stylelint-config-standard-scss', 'stylelint-config-prettier-scss'],
33
ignoreFiles: [
44
'app/javascript/styles/mastodon/reset.scss',
55
'coverage/**/*',

yarn.lock

+13
Original file line numberDiff line numberDiff line change
@@ -2945,6 +2945,7 @@ __metadata:
29452945
stacktrace-js: "npm:^2.0.2"
29462946
stringz: "npm:^2.1.0"
29472947
stylelint: "npm:^16.0.2"
2948+
stylelint-config-prettier-scss: "npm:^1.0.0"
29482949
stylelint-config-standard-scss: "npm:^13.0.0"
29492950
substring-trie: "npm:^1.0.2"
29502951
terser-webpack-plugin: "npm:^4.2.3"
@@ -16595,6 +16596,18 @@ __metadata:
1659516596
languageName: node
1659616597
linkType: hard
1659716598

16599+
"stylelint-config-prettier-scss@npm:^1.0.0":
16600+
version: 1.0.0
16601+
resolution: "stylelint-config-prettier-scss@npm:1.0.0"
16602+
peerDependencies:
16603+
stylelint: ">=15.0.0"
16604+
bin:
16605+
stylelint-config-prettier-scss: bin/check.js
16606+
stylelint-config-prettier-scss-check: bin/check.js
16607+
checksum: 10c0/4d5e1d1c200d4611b5b7bd2d2528cc9e301f26645802a2774aec192c4c2949cbf5a0147eba8b2e6e4ff14a071b03024f3034bb1b4fda37a8ed5a0081a9597d4d
16608+
languageName: node
16609+
linkType: hard
16610+
1659816611
"stylelint-config-recommended-scss@npm:^14.0.0":
1659916612
version: 14.0.0
1660016613
resolution: "stylelint-config-recommended-scss@npm:14.0.0"

0 commit comments

Comments
 (0)