eslint-config-un 0.2.2 → 0.2.3

package/dist/index.cjs

@@ -362,11 +362,12 @@ init_cjs_shims();
 var ERROR = 2;
 var WARNING = 1;
 var OFF = 0;
-var GLOB_JS_TS_EXTENSION = "?([cm])[jt]s?(x)";
-var GLOB_JS_TS = `**/*.${GLOB_JS_TS_EXTENSION}`;
+var GLOB_JS_TS_EXTENSION = "?([cm])[jt]s";
+var GLOB_JS_TS_X_EXTENSION = `${GLOB_JS_TS_EXTENSION}?(x)`;
+var GLOB_JS_TS = `**/*.${GLOB_JS_TS_X_EXTENSION}`;
 var GLOB_CONFIG_FILES = [
-  `**/*.config.${GLOB_JS_TS_EXTENSION}`,
-  `**/.*rc.${GLOB_JS_TS_EXTENSION}`
+  `**/*.config.${GLOB_JS_TS_X_EXTENSION}`,
+  `**/.*rc.${GLOB_JS_TS_X_EXTENSION}`
 ];
 var GLOB_TS = "**/*.?([cm])ts";
 var GLOB_TSX = `${GLOB_TS}x`;
@@ -379,7 +380,7 @@ var GLOB_YAML = `**/*.${GLOB_YAML_EXTENSION}`;
 var GLOB_TOML = "**/*.toml";
 var GLOB_PACKAGE_JSON = "**/package.json";
 var GLOB_SUPPORTED_EXTENSIONS = [
-  GLOB_JS_TS_EXTENSION,
+  GLOB_JS_TS_X_EXTENSION,
   "vue",
   "json",
   "jsonc",
@@ -395,6 +396,7 @@ var DEFAULT_GLOBAL_IGNORES = ["**/dist"];
 // src/utils.ts
 init_cjs_shims();
 var import_node_path = __toESM(require("path"), 1);
+var import_utils = require("@antfu/utils");
 var genFlatConfigEntryName = (name) => `eslint-config-un/${name}`;
 var createPluginObjectRenamer = (from, to) => {
   const fromRegex = new RegExp(`^${from}/`);
@@ -414,6 +416,7 @@ var joinPaths = (...paths) => (
   // eslint-disable-next-line unicorn/prefer-native-coercion-functions
   import_node_path.default.posix.join(...arraify(paths).filter((v) => Boolean(v)))
 );
+var maybeCall = (fnOrValue, ...args) => typeof fnOrValue === "function" ? fnOrValue(...args) : fnOrValue;
 var ConfigEntryBuilder = class {
   constructor(options, internalOptions) {
     this.options = options;
@@ -1010,12 +1013,38 @@ var sonarEslintConfig = (options = {}, internalOptions = {}) => {
 
 // src/configs/tailwind.ts
 init_cjs_shims();
+var import_utils15 = require("@antfu/utils");
 var import_eslint_plugin_tailwindcss = __toESM(require("eslint-plugin-tailwindcss"), 1);
+var DEFAULT_PLUGIN_SETTINGS = {
+  callees: ["classnames", "clsx", "ctl", "cva", "tv"],
+  ignoredKeys: ["compoundVariants", "defaultVariants"],
+  cssFiles: ["**/*.css", "!**/node_modules", "!**/.*", "!**/dist", "!**/build"]
+};
 var tailwindEslintConfig = (options = {}, internalOptions = {}) => {
+  const { settings } = options;
   const builder = new ConfigEntryBuilder(options, internalOptions);
   builder.addConfig(["tailwind", { includeDefaultFilesAndIgnores: true }], {
     plugins: {
       tailwindcss: import_eslint_plugin_tailwindcss.default
+    },
+    ...settings && {
+      settings: {
+        tailwindcss: {
+          ...settings,
+          ...(0, import_utils15.objectKeys)(DEFAULT_PLUGIN_SETTINGS).reduce(
+            (acc, settingKey) => {
+              if (settings[settingKey]) {
+                acc[settingKey] = maybeCall(
+                  settings[settingKey],
+                  DEFAULT_PLUGIN_SETTINGS[settingKey]
+                );
+              }
+              return acc;
+            },
+            {}
+          )
+        }
+      }
     }
   }).addBulkRules(import_eslint_plugin_tailwindcss.default.configs.recommended.rules).addRule("tailwindcss/classnames-order", WARNING).addRule("tailwindcss/enforces-negative-arbitrary-values", WARNING).addRule("tailwindcss/enforces-shorthand", WARNING).addRule("tailwindcss/migration-from-tailwind-2", WARNING).addRule("tailwindcss/no-custom-classname", OFF).addRule("tailwindcss/no-unnecessary-arbitrary-value", WARNING).addOverrides();
   return builder.getAllConfigs();
@@ -1463,8 +1492,12 @@ var vueEslintConfig = (options, internalOptions = {}) => {
   builder.addConfig("vue/allow-default-export", {
     files: [
       GLOB_VUE,
-      isNuxtEnabled && [inNuxtAppDir("plugins/**/*"), inNuxtAppDir("server/**/*")]
-    ].flat().filter((v) => v !== false)
+      isNuxtEnabled && [
+        inNuxtAppDir("plugins/**/*"),
+        inNuxtAppDir("server/**/*"),
+        inNuxtAppDir(`app/router.options.${GLOB_JS_TS_EXTENSION}`)
+      ]
+    ].flat().filter((v) => typeof v === "string")
   }).addAnyRule("import/no-default-export", OFF);
   const a11yConfig = builder.addConfig(
     [

package/dist/index.d.cts

@@ -27295,7 +27295,26 @@ interface RegexpEslintConfigOptions extends ConfigSharedOptions<'regexp'> {
 interface SecurityEslintConfigOptions extends ConfigSharedOptions<'security'> {
 }
 
+type OverwriteOrDeriveFromDefault<T> = T | ((defaultValue: T) => T);
+interface TailwindPluginSettings {
+    callees?: OverwriteOrDeriveFromDefault<string[]>;
+    ignoredKeys?: OverwriteOrDeriveFromDefault<string[]>;
+    config?: string[];
+    cssFiles?: OverwriteOrDeriveFromDefault<string[]>;
+    cssFilesRefreshRate?: number;
+    removeDuplicates?: boolean;
+    skipClassAttribute?: boolean;
+    whitelist?: string[];
+    tags?: string[];
+    classRegex?: string;
+}
 interface TailwindEslintConfigOptions extends ConfigSharedOptions<'tailwindcss'> {
+    /**
+     * Will be merged with the default [`eslint-plugin-tailwindcss` settings](https://github.com/francoismassart/eslint-plugin-tailwindcss?tab=readme-ov-file#more-settings).
+     *
+     * Actual default values can be found [here](https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/master/lib/util/settings.js).
+     */
+    settings?: PrettifyShallow<TailwindPluginSettings>;
 }
 
 declare const DEFAULT_FILES_TO_IGNORE$1: readonly ["Cargo.lock"];

package/dist/index.d.ts

@@ -27295,7 +27295,26 @@ interface RegexpEslintConfigOptions extends ConfigSharedOptions<'regexp'> {
 interface SecurityEslintConfigOptions extends ConfigSharedOptions<'security'> {
 }
 
+type OverwriteOrDeriveFromDefault<T> = T | ((defaultValue: T) => T);
+interface TailwindPluginSettings {
+    callees?: OverwriteOrDeriveFromDefault<string[]>;
+    ignoredKeys?: OverwriteOrDeriveFromDefault<string[]>;
+    config?: string[];
+    cssFiles?: OverwriteOrDeriveFromDefault<string[]>;
+    cssFilesRefreshRate?: number;
+    removeDuplicates?: boolean;
+    skipClassAttribute?: boolean;
+    whitelist?: string[];
+    tags?: string[];
+    classRegex?: string;
+}
 interface TailwindEslintConfigOptions extends ConfigSharedOptions<'tailwindcss'> {
+    /**
+     * Will be merged with the default [`eslint-plugin-tailwindcss` settings](https://github.com/francoismassart/eslint-plugin-tailwindcss?tab=readme-ov-file#more-settings).
+     *
+     * Actual default values can be found [here](https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/master/lib/util/settings.js).
+     */
+    settings?: PrettifyShallow<TailwindPluginSettings>;
 }
 
 declare const DEFAULT_FILES_TO_IGNORE$1: readonly ["Cargo.lock"];

package/dist/index.js

@@ -350,11 +350,12 @@ init_esm_shims();
 var ERROR = 2;
 var WARNING = 1;
 var OFF = 0;
-var GLOB_JS_TS_EXTENSION = "?([cm])[jt]s?(x)";
-var GLOB_JS_TS = `**/*.${GLOB_JS_TS_EXTENSION}`;
+var GLOB_JS_TS_EXTENSION = "?([cm])[jt]s";
+var GLOB_JS_TS_X_EXTENSION = `${GLOB_JS_TS_EXTENSION}?(x)`;
+var GLOB_JS_TS = `**/*.${GLOB_JS_TS_X_EXTENSION}`;
 var GLOB_CONFIG_FILES = [
-  `**/*.config.${GLOB_JS_TS_EXTENSION}`,
-  `**/.*rc.${GLOB_JS_TS_EXTENSION}`
+  `**/*.config.${GLOB_JS_TS_X_EXTENSION}`,
+  `**/.*rc.${GLOB_JS_TS_X_EXTENSION}`
 ];
 var GLOB_TS = "**/*.?([cm])ts";
 var GLOB_TSX = `${GLOB_TS}x`;
@@ -367,7 +368,7 @@ var GLOB_YAML = `**/*.${GLOB_YAML_EXTENSION}`;
 var GLOB_TOML = "**/*.toml";
 var GLOB_PACKAGE_JSON = "**/package.json";
 var GLOB_SUPPORTED_EXTENSIONS = [
-  GLOB_JS_TS_EXTENSION,
+  GLOB_JS_TS_X_EXTENSION,
   "vue",
   "json",
   "jsonc",
@@ -383,6 +384,7 @@ var DEFAULT_GLOBAL_IGNORES = ["**/dist"];
 // src/utils.ts
 init_esm_shims();
 import path from "node:path";
+import { objectEntries, objectKeys } from "@antfu/utils";
 var genFlatConfigEntryName = (name) => `eslint-config-un/${name}`;
 var createPluginObjectRenamer = (from, to) => {
   const fromRegex = new RegExp(`^${from}/`);
@@ -402,6 +404,7 @@ var joinPaths = (...paths) => (
   // eslint-disable-next-line unicorn/prefer-native-coercion-functions
   path.posix.join(...arraify(paths).filter((v) => Boolean(v)))
 );
+var maybeCall = (fnOrValue, ...args) => typeof fnOrValue === "function" ? fnOrValue(...args) : fnOrValue;
 var ConfigEntryBuilder = class {
   constructor(options, internalOptions) {
     this.options = options;
@@ -998,12 +1001,38 @@ var sonarEslintConfig = (options = {}, internalOptions = {}) => {
 
 // src/configs/tailwind.ts
 init_esm_shims();
+import { objectKeys as objectKeys2 } from "@antfu/utils";
 import eslintPluginTailwind from "eslint-plugin-tailwindcss";
+var DEFAULT_PLUGIN_SETTINGS = {
+  callees: ["classnames", "clsx", "ctl", "cva", "tv"],
+  ignoredKeys: ["compoundVariants", "defaultVariants"],
+  cssFiles: ["**/*.css", "!**/node_modules", "!**/.*", "!**/dist", "!**/build"]
+};
 var tailwindEslintConfig = (options = {}, internalOptions = {}) => {
+  const { settings } = options;
   const builder = new ConfigEntryBuilder(options, internalOptions);
   builder.addConfig(["tailwind", { includeDefaultFilesAndIgnores: true }], {
     plugins: {
       tailwindcss: eslintPluginTailwind
+    },
+    ...settings && {
+      settings: {
+        tailwindcss: {
+          ...settings,
+          ...objectKeys2(DEFAULT_PLUGIN_SETTINGS).reduce(
+            (acc, settingKey) => {
+              if (settings[settingKey]) {
+                acc[settingKey] = maybeCall(
+                  settings[settingKey],
+                  DEFAULT_PLUGIN_SETTINGS[settingKey]
+                );
+              }
+              return acc;
+            },
+            {}
+          )
+        }
+      }
     }
   }).addBulkRules(eslintPluginTailwind.configs.recommended.rules).addRule("tailwindcss/classnames-order", WARNING).addRule("tailwindcss/enforces-negative-arbitrary-values", WARNING).addRule("tailwindcss/enforces-shorthand", WARNING).addRule("tailwindcss/migration-from-tailwind-2", WARNING).addRule("tailwindcss/no-custom-classname", OFF).addRule("tailwindcss/no-unnecessary-arbitrary-value", WARNING).addOverrides();
   return builder.getAllConfigs();
@@ -1455,8 +1484,12 @@ var vueEslintConfig = (options, internalOptions = {}) => {
   builder.addConfig("vue/allow-default-export", {
     files: [
       GLOB_VUE,
-      isNuxtEnabled && [inNuxtAppDir("plugins/**/*"), inNuxtAppDir("server/**/*")]
-    ].flat().filter((v) => v !== false)
+      isNuxtEnabled && [
+        inNuxtAppDir("plugins/**/*"),
+        inNuxtAppDir("server/**/*"),
+        inNuxtAppDir(`app/router.options.${GLOB_JS_TS_EXTENSION}`)
+      ]
+    ].flat().filter((v) => typeof v === "string")
   }).addAnyRule("import/no-default-export", OFF);
   const a11yConfig = builder.addConfig(
     [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-un",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "A universal-ish ESLint config aiming to be reasonably strict and easily configurable.",
   "keywords": [
     "eslint",
@@ -43,6 +43,7 @@
     "prepublishOnly": "npm run test && npm run build"
   },
   "dependencies": {
+    "@antfu/utils": "0.7.10",
     "@eslint-community/eslint-plugin-eslint-comments": "4.4.1",
     "@eslint/markdown": "6.2.1",
     "@stylistic/eslint-plugin": "^2.10.1",