mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 07:05:23 +01:00
Disable stylelint rules that are conflicting with Prettier (#31339)
This commit is contained in:
parent
664bef3573
commit
a207a1f7dc
3 changed files with 15 additions and 1 deletions
|
@ -189,6 +189,7 @@
|
||||||
"prettier": "^3.3.3",
|
"prettier": "^3.3.3",
|
||||||
"react-test-renderer": "^18.2.0",
|
"react-test-renderer": "^18.2.0",
|
||||||
"stylelint": "^16.0.2",
|
"stylelint": "^16.0.2",
|
||||||
|
"stylelint-config-prettier-scss": "^1.0.0",
|
||||||
"stylelint-config-standard-scss": "^13.0.0",
|
"stylelint-config-standard-scss": "^13.0.0",
|
||||||
"typescript": "^5.0.4",
|
"typescript": "^5.0.4",
|
||||||
"webpack-dev-server": "^3.11.3"
|
"webpack-dev-server": "^3.11.3"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
module.exports = {
|
module.exports = {
|
||||||
extends: ['stylelint-config-standard-scss'],
|
extends: ['stylelint-config-standard-scss', 'stylelint-config-prettier-scss'],
|
||||||
ignoreFiles: [
|
ignoreFiles: [
|
||||||
'app/javascript/styles/mastodon/reset.scss',
|
'app/javascript/styles/mastodon/reset.scss',
|
||||||
'coverage/**/*',
|
'coverage/**/*',
|
||||||
|
|
13
yarn.lock
13
yarn.lock
|
@ -2945,6 +2945,7 @@ __metadata:
|
||||||
stacktrace-js: "npm:^2.0.2"
|
stacktrace-js: "npm:^2.0.2"
|
||||||
stringz: "npm:^2.1.0"
|
stringz: "npm:^2.1.0"
|
||||||
stylelint: "npm:^16.0.2"
|
stylelint: "npm:^16.0.2"
|
||||||
|
stylelint-config-prettier-scss: "npm:^1.0.0"
|
||||||
stylelint-config-standard-scss: "npm:^13.0.0"
|
stylelint-config-standard-scss: "npm:^13.0.0"
|
||||||
substring-trie: "npm:^1.0.2"
|
substring-trie: "npm:^1.0.2"
|
||||||
terser-webpack-plugin: "npm:^4.2.3"
|
terser-webpack-plugin: "npm:^4.2.3"
|
||||||
|
@ -16595,6 +16596,18 @@ __metadata:
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
"stylelint-config-prettier-scss@npm:^1.0.0":
|
||||||
|
version: 1.0.0
|
||||||
|
resolution: "stylelint-config-prettier-scss@npm:1.0.0"
|
||||||
|
peerDependencies:
|
||||||
|
stylelint: ">=15.0.0"
|
||||||
|
bin:
|
||||||
|
stylelint-config-prettier-scss: bin/check.js
|
||||||
|
stylelint-config-prettier-scss-check: bin/check.js
|
||||||
|
checksum: 10c0/4d5e1d1c200d4611b5b7bd2d2528cc9e301f26645802a2774aec192c4c2949cbf5a0147eba8b2e6e4ff14a071b03024f3034bb1b4fda37a8ed5a0081a9597d4d
|
||||||
|
languageName: node
|
||||||
|
linkType: hard
|
||||||
|
|
||||||
"stylelint-config-recommended-scss@npm:^14.0.0":
|
"stylelint-config-recommended-scss@npm:^14.0.0":
|
||||||
version: 14.0.0
|
version: 14.0.0
|
||||||
resolution: "stylelint-config-recommended-scss@npm:14.0.0"
|
resolution: "stylelint-config-recommended-scss@npm:14.0.0"
|
||||||
|
|
Loading…
Reference in a new issue