Merge pull request #20 from media-code/enhancement/change-blade-forma…

…tter change blade formatter
media-code · Dec 4, 2024 · 1a60513 · 1a60513
2 parents 9a80879 + 79012ee
commit 1a60513
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 9 deletions.
diff --git a/src/Integrations/PrettierBlade/.blade.format.json b/src/Integrations/PrettierBlade/.blade.format.json
@@ -0,0 +1,75 @@
+{
+    "useLaravelPint": true,
+    "formatJsAttributes": true,
+    "attributeJsOptions": {
+        "semi": false,
+        "printWidth": 800
+    },
+    "safeWrappingJsAttributes": [
+        "^x-data",
+        "^x-init"
+    ],
+    "ignoreDirectives": [
+        "media",
+        "charset",
+        "import",
+        "namespace",
+        "supports",
+        "document",
+        "page",
+        "font-face",
+        "keyframes",
+        "viewport",
+        "counter-style",
+        "font-feature-values",
+        "swash",
+        "ornaments",
+        "annotation",
+        "stylistic",
+        "styleset",
+        "character-variant",
+        "font-variant-alternates",
+        "property",
+        "color-profile",
+        "click",
+        "submit",
+        "scroll",
+        "keydown",
+        "keypress",
+        "keyup",
+        "blur",
+        "change",
+        "contextmenu",
+        "copy",
+        "cut",
+        "paste",
+        "dblclick",
+        "drag",
+        "dragend",
+        "dragenter",
+        "dragleave",
+        "dragover",
+        "dragstart",
+        "drop",
+        "focus",
+        "focusin",
+        "focusout",
+        "input",
+        "mousedown",
+        "mouseenter",
+        "mouseleave",
+        "mousemove",
+        "mouseover",
+        "mouseout",
+        "mouseup",
+        "mousewheel",
+        "resize",
+        "select",
+        "touchcancel",
+        "touchend",
+        "touchmove",
+        "touchstart",
+        "wheel",
+        "verbatim"
+    ]
+}
diff --git a/src/Integrations/PrettierBlade/.prettierrc.json b/src/Integrations/PrettierBlade/.prettierrc.json
@@ -1,12 +1,8 @@
 {
-    "plugins": [
-        "@shufo/prettier-plugin-blade"
-    ],
+    "plugins": ["prettier-plugin-blade", "prettier-plugin-tailwindcss"],
     "overrides": [
         {
-            "files": [
-                "*.blade.php"
-            ],
+            "files": ["*.blade.php"],
             "options": {
                 "parser": "blade",
                 "tabWidth": 4
@@ -15,9 +11,8 @@
     ],
 
     "htmlWhitespaceSensitivity": "css",
-    "sortTailwindcssClasses": true,
     "singleAttributePerLine": true,
     "bracketSameLine": false,
     "printWidth": 600,
     "tabWidth": 4
- }
+}
diff --git a/src/Integrations/PrettierBlade/PrettierBlade.php b/src/Integrations/PrettierBlade/PrettierBlade.php
@@ -11,15 +11,18 @@ public function __invoke()
         $this
             ->npmInstallDev([
                 'prettier@^3',
-                '@shufo/prettier-plugin-blade',
+                'prettier-plugin-blade@^2',
+                'prettier-plugin-tailwindcss',
             ])
             ->npmUpdate([
                 'prettier',
                 'prettier-plugin-blade',
+                'prettier-plugin-tailwindcss',
             ])
 
             ->publishesConfigs([
                 '.prettierrc.json' => '.prettierrc.json',
+                '.blade.format.json' => '.blade.format.json',
             ])
 
             ->provideDusterLintConfig([