aberlaas-lint 2.25.0 → 2.27.0

package/configs/eslint/vue.js

@@ -19,11 +19,14 @@ export default [
     processor: 'vue/vue',
     rules: {
       ...rules,
+      'vue/attribute-hyphenation': ['error', 'never'],
       'vue/component-api-style': ['error', ['script-setup']],
       'vue/define-macros-order': ['error'],
+      'vue/no-undef-components': ['error'],
 
       // Rules that conflict with Pretttier
       'vue/html-indent': ['off'],
+      'vue/html-closing-bracket-newline': ['off'],
       'vue/html-self-closing': [
         'error',
         {

package/configs/prettier.js

@@ -1,4 +1,15 @@
+import { fileURLToPath } from 'node:url';
+
+// We use the full absolute path to the plugin so it can be used even from
+// outside of aberlaas, for example when calling Prettier directly.
+const tailwindcssPlugin = fileURLToPath(
+  import.meta.resolve('prettier-plugin-tailwindcss'),
+);
+
 export default {
-  singleQuote: true,
+  bracketSameLine: true,
   printWidth: 80,
+  singleQuote: true,
+  plugins: [tailwindcssPlugin],
+  tailwindFunctions: ['clsx'],
 };

package/configs/stylelint.js

@@ -5,7 +5,7 @@ export default {
     'at-rule-no-unknown': [
       true,
       {
-        ignoreAtRules: ['screen', 'tailwind'],
+        ignoreAtRules: ['screen', 'tailwind', 'theme'],
       },
     ],
     'block-no-empty': true,

package/lib/css.js

@@ -1,6 +1,6 @@
 import { _ } from 'golgoth';
 import { firostError } from 'firost';
-import { findHostPackageFiles, getConfig } from 'aberlaas-helper';
+import { findHostFiles, getConfig } from 'aberlaas-helper';
 import stylelint from 'stylelint';
 import stylelintConfig from '../configs/stylelint.js';
 import { prettierFix } from './helpers/prettierFix.js';
@@ -72,7 +72,7 @@ __ = {
     const filePatterns = _.isEmpty(userPatterns)
       ? ['./**/*.css']
       : userPatterns;
-    return await findHostPackageFiles(filePatterns, ['.css']);
+    return await findHostFiles(filePatterns, ['.css']);
   },
 
   prettierFix,

package/lib/helpers/prettierFix.js

@@ -2,6 +2,7 @@ import { _, pMap } from 'golgoth';
 import { firostError, read, write } from 'firost';
 import { getConfig } from 'aberlaas-helper';
 import { format as prettierFormat } from 'prettier';
+import * as prettierTailwindPlugin from 'prettier-plugin-tailwindcss';
 import prettierConfig from '../../configs/prettier.js';
 
 /**
@@ -12,6 +13,9 @@ export async function prettierFix(inputFiles) {
   // Config file
   const config = await getConfig(null, 'prettier.config.js', prettierConfig);
 
+  // Plugins
+  const plugins = [prettierTailwindPlugin];
+
   const errors = [];
 
   // Read all files, run them through the formatter and save them back to disk
@@ -21,7 +25,7 @@ export async function prettierFix(inputFiles) {
     async (filepath) => {
       try {
         const content = await read(filepath);
-        const options = { ...config, filepath };
+        const options = { ...config, plugins, filepath };
         const result = await prettierFormat(content, options);
         await write(result, filepath);
       } catch (error) {

package/lib/html.js

@@ -0,0 +1,48 @@
+import { _ } from 'golgoth';
+import { findHostFiles } from 'aberlaas-helper';
+import { prettierFix } from './helpers/prettierFix.js';
+
+export let __;
+
+/**
+ * Lint HTML files
+ * @returns {boolean} True on success
+ */
+export async function run() {
+  // We do not currently have an HTML Linter, only a Formatter
+  return true;
+}
+
+/**
+ * Autofix HTML files in place
+ * @param {Array} userPatterns Patterns to narrow the search down
+ * @returns {boolean} True on success
+ */
+export async function fix(userPatterns) {
+  const files = await __.getInputFiles(userPatterns);
+  if (_.isEmpty(files)) {
+    return true;
+  }
+  await __.prettierFix(files);
+}
+
+__ = {
+  /**
+   * Find all relevant HTML files
+   * @param {Array} userPatterns Patterns to narrow the search down
+   * @returns {Array} Array of files
+   */
+  async getInputFiles(userPatterns) {
+    const filePatterns = _.isEmpty(userPatterns)
+      ? ['./**/*.html']
+      : userPatterns;
+    return await findHostFiles(filePatterns, ['.html']);
+  },
+
+  prettierFix,
+};
+
+export default {
+  run,
+  fix,
+};

package/lib/js.js

@@ -1,6 +1,6 @@
 import { _ } from 'golgoth';
 import { firostError } from 'firost';
-import { findHostPackageFiles } from 'aberlaas-helper';
+import { findHostFiles } from 'aberlaas-helper';
 import { eslintRun } from './helpers/eslintRun.js';
 
 export let __;
@@ -45,7 +45,7 @@ __ = {
       : userPatterns;
     const allowedExtensions = ['.js', '.jsx', '.ts', '.tsx', '.vue'];
 
-    return await findHostPackageFiles(filePatterns, allowedExtensions);
+    return await findHostFiles(filePatterns, allowedExtensions);
   },
 };
 

package/lib/json.js

@@ -1,6 +1,6 @@
 import { _ } from 'golgoth';
 import { firostError } from 'firost';
-import { findHostPackageFiles } from 'aberlaas-helper';
+import { findHostFiles } from 'aberlaas-helper';
 import { eslintRun } from './helpers/eslintRun.js';
 import { prettierFix } from './helpers/prettierFix.js';
 
@@ -57,7 +57,7 @@ __ = {
     const filePatterns = _.isEmpty(userPatterns)
       ? ['./**/*.json']
       : userPatterns;
-    return await findHostPackageFiles(filePatterns, ['.json']);
+    return await findHostFiles(filePatterns, ['.json']);
   },
 
   prettierFix,

package/lib/main.js

@@ -55,6 +55,7 @@ __ = {
   linters: {
     circleci: './circleci.js',
     css: './css.js',
+    html: './html.js',
     json: './json.js',
     js: './js.js',
     yml: './yml.js',

package/lib/yml.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { _, pMap } from 'golgoth';
 import { firostError, read } from 'firost';
-import { findHostPackageFiles, hostGitRoot } from 'aberlaas-helper';
+import { findHostFiles, hostGitRoot } from 'aberlaas-helper';
 import yamlLint from 'yaml-lint';
 import { prettierFix } from './helpers/prettierFix.js';
 
@@ -61,7 +61,7 @@ __ = {
     const filePatterns = _.isEmpty(userPatterns)
       ? ['./**/*.yml', './**/*.yaml']
       : userPatterns;
-    return await findHostPackageFiles(filePatterns, ['.yml', '.yaml']);
+    return await findHostFiles(filePatterns, ['.yml', '.yaml']);
   },
 
   prettierFix,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aberlaas-lint",
-  "version": "2.25.0",
+  "version": "2.27.0",
   "type": "module",
   "description": "aberlaas lint command: Lint files",
   "author": "Tim Carry <tim@pixelastic.com>",
@@ -29,8 +29,8 @@
     "@eslint/json": "1.0.0",
     "@typescript-eslint/utils": "8.55.0",
     "@vitest/eslint-plugin": "1.6.7",
-    "aberlaas-helper": "2.25.0",
-    "aberlaas-versions": "2.25.0",
+    "aberlaas-helper": "2.27.0",
+    "aberlaas-versions": "2.27.0",
     "ci-info": "4.4.0",
     "eslint": "9.39.2",
     "eslint-config-prettier": "10.1.8",
@@ -46,6 +46,7 @@
     "golgoth": "3.1.0",
     "jsonc-eslint-parser": "2.4.2",
     "prettier": "3.8.1",
+    "prettier-plugin-tailwindcss": "0.7.2",
     "stylelint": "17.2.0",
     "typescript": "5.9.3",
     "vue-eslint-parser": "10.4.0",