Merge pull request #1007 from SlovakNationalGallery/prettier-fix

Make Prettier plugins work again
SlovakNationalGallery · Apr 26, 2024 · 012a5c0 · 012a5c0
2 parents 1f9067b + 4a52eb7
commit 012a5c0
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 107 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -4,12 +4,24 @@
     "singleQuote": true,
     "semi": false,
     "sortTailwindcssClasses": true,
+    "plugins": [
+        "prettier-plugin-tailwindcss",
+        "@prettier/plugin-php",
+        "@shufo/prettier-plugin-blade"
+    ],
     "overrides": [
         {
             "files": "*.yml",
             "options": {
                 "tabWidth": 2
             }
+        },
+        {
+            "files": ["*.blade.php"],
+            "options": {
+                "parser": "blade",
+                "tabWidth": 4
+            }
         }
     ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,8 +6,8 @@
         "build": "vite build"
     },
     "devDependencies": {
-        "@prettier/plugin-php": "^0.18.2",
-        "@shufo/prettier-plugin-blade": "^1.2.4",
+        "@prettier/plugin-php": "^0.22.2",
+        "@shufo/prettier-plugin-blade": "^1.14.1",
         "@tailwindcss/forms": "^0.5.3",
         "@tailwindcss/typography": "^0.5.2",
         "@vitejs/plugin-vue": "^5.0.4",
@@ -16,7 +16,8 @@
         "jquery": "^3.5.0",
         "laravel-vite-plugin": "^1.0.2",
         "postcss": "^8.4.31",
-        "prettier": "^2.5.1",
+        "prettier": "^3.2.5",
+        "prettier-plugin-tailwindcss": "^0.5.14",
         "tailwind-scrollbar": "^2.1.0-preview.0",
         "tailwindcss": "^3.0.15",
         "vite": "^5.2.6",