From a207a1f7dcf85b3cea24c016e0d35c4a8e308265 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 8 Aug 2024 21:22:16 +0200
Subject: [PATCH] Disable stylelint rules that are conflicting with Prettier
 (#31339)

---
 package.json        |  1 +
 stylelint.config.js |  2 +-
 yarn.lock           | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 26ee3570a..d183398f1 100644
--- a/package.json
+++ b/package.json
@@ -189,6 +189,7 @@
     "prettier": "^3.3.3",
     "react-test-renderer": "^18.2.0",
     "stylelint": "^16.0.2",
+    "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^13.0.0",
     "typescript": "^5.0.4",
     "webpack-dev-server": "^3.11.3"
diff --git a/stylelint.config.js b/stylelint.config.js
index 9f9509163..632463c59 100644
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  extends: ['stylelint-config-standard-scss'],
+  extends: ['stylelint-config-standard-scss', 'stylelint-config-prettier-scss'],
   ignoreFiles: [
     'app/javascript/styles/mastodon/reset.scss',
     'coverage/**/*',
diff --git a/yarn.lock b/yarn.lock
index ea934cac9..77fda4e40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2945,6 +2945,7 @@ __metadata:
     stacktrace-js: "npm:^2.0.2"
     stringz: "npm:^2.1.0"
     stylelint: "npm:^16.0.2"
+    stylelint-config-prettier-scss: "npm:^1.0.0"
     stylelint-config-standard-scss: "npm:^13.0.0"
     substring-trie: "npm:^1.0.2"
     terser-webpack-plugin: "npm:^4.2.3"
@@ -16595,6 +16596,18 @@ __metadata:
   languageName: node
   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":
   version: 14.0.0
   resolution: "stylelint-config-recommended-scss@npm:14.0.0"