@vheissulabs/prettier-config 1.7.0 → 1.8.1

package/.prettierrc

@@ -0,0 +1,5 @@
+{
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true
+}

package/eslint.config.js

@@ -1,52 +1,62 @@
 const vue = require('eslint-plugin-vue')
-
-// Try to load typescript-eslint if available
-let tseslint = null
-try {
-  tseslint = require('typescript-eslint')
-} catch (e) {
-  // typescript-eslint not installed, skip TS support
-}
+const tseslint = require('typescript-eslint')
+const prettierPlugin = require('eslint-plugin-prettier')
+const prettierConfig = require('eslint-config-prettier')
 
 const baseConfig = [
+  // Vue recommended rules
   ...vue.configs['flat/recommended'],
+
+  // Disable ESLint rules that conflict with Prettier
+  prettierConfig,
+
+  // Run Prettier as an ESLint rule
   {
+    plugins: {
+      prettier: prettierPlugin,
+    },
     rules: {
-      // Force element content to new line
-      'vue/singleline-html-element-content-newline': ['error', {
-        ignoreWhenNoAttributes: false,
-        ignoreWhenEmpty: true,
-      }],
-      // Force closing bracket to new line
-      'vue/html-closing-bracket-newline': ['error', {
-        singleline: 'never',
-        multiline: 'always',
-      }],
-      // Max attributes per line
-      'vue/max-attributes-per-line': ['error', {
-        singleline: 1,
-        multiline: 1,
-      }],
-      // Consistent indentation in templates
-      'vue/html-indent': ['error', 4],
-      // Disable rules that conflict with Prettier
-      'vue/html-self-closing': 'off',
-      // Allow single-word component names (common in page components)
-      'vue/multi-word-component-names': 'off',
+      'prettier/prettier': 'error',
     },
   },
 ]
 
-// Add TypeScript support for Vue files if typescript-eslint is available
-if (tseslint) {
-  baseConfig.push({
-    files: ['**/*.vue'],
-    languageOptions: {
-      parserOptions: {
-        parser: tseslint.parser,
-      },
+// Vue-specific rules that run AFTER Prettier
+// These fix template formatting that Prettier doesn't handle well
+baseConfig.push({
+  rules: {
+    // Force element content to new line
+    'vue/singleline-html-element-content-newline': ['error', {
+      ignoreWhenNoAttributes: false,
+      ignoreWhenEmpty: true,
+    }],
+    // Force closing bracket to new line
+    'vue/html-closing-bracket-newline': ['error', {
+      singleline: 'never',
+      multiline: 'always',
+    }],
+    // Max attributes per line
+    'vue/max-attributes-per-line': ['error', {
+      singleline: 1,
+      multiline: 1,
+    }],
+    // Consistent indentation in templates
+    'vue/html-indent': ['error', 4],
+    // Disable rules that conflict with Prettier
+    'vue/html-self-closing': 'off',
+    // Allow single-word component names (common in page components)
+    'vue/multi-word-component-names': 'off',
+  },
+})
+
+// Add TypeScript support for Vue files
+baseConfig.push({
+  files: ['**/*.vue'],
+  languageOptions: {
+    parserOptions: {
+      parser: tseslint.parser,
     },
-  })
-}
+  },
+})
 
 module.exports = baseConfig

package/index.js

@@ -8,7 +8,7 @@ module.exports = {
   printWidth: 100,
   plugins: [
     '@trivago/prettier-plugin-sort-imports',
-    'prettier-plugin-tailwindcss'
+    'prettier-plugin-tailwindcss',
   ],
   tailwindFunctions: ['clsx', 'cn', 'cva'],
   importOrder: [
@@ -16,10 +16,11 @@ module.exports = {
     '^@vue(.*)$',
     '^@inertiajs(.*)$',
     '^@laravel/(.*)$',
+    '<THIRD_PARTY_MODULES>',
     '^@/layouts/(.*)$',
     '^@/components/(.*)$',
     '^@/(.*)$',
-    '^[./]'
+    '^[./]',
   ],
   importOrderSeparation: false,
   importOrderSortSpecifiers: true,
@@ -27,8 +28,8 @@ module.exports = {
     {
       files: '**/*.yml',
       options: {
-        tabWidth: 2
-      }
-    }
-  ]
+        tabWidth: 2,
+      },
+    },
+  ],
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vheissulabs/prettier-config",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "Shared Prettier and ESLint configuration for VheissuLabs projects",
   "main": "index.js",
   "exports": {
@@ -25,27 +25,15 @@
     "url": "https://github.com/VheissuLabs/PrettierConfig.git"
   },
   "peerDependencies": {
-    "prettier": ">=3.0.0",
-    "prettier-plugin-tailwindcss": ">=0.5.0",
-    "eslint": ">=9.0.0",
-    "eslint-plugin-vue": ">=9.0.0",
-    "typescript-eslint": ">=8.0.0"
-  },
-  "peerDependenciesMeta": {
-    "prettier-plugin-tailwindcss": {
-      "optional": true
-    },
-    "eslint": {
-      "optional": true
-    },
-    "eslint-plugin-vue": {
-      "optional": true
-    },
-    "typescript-eslint": {
-      "optional": true
-    }
+    "prettier": ">=3.0.0"
   },
   "dependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^5.0.0"
+    "@trivago/prettier-plugin-sort-imports": "^5.0.0",
+    "prettier-plugin-tailwindcss": "^0.6.0",
+    "eslint": "^9.0.0",
+    "eslint-plugin-vue": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-config-prettier": "^9.0.0",
+    "typescript-eslint": "^8.0.0"
   }
 }