@aiou/eslint-config 3.2.0 → 3.3.0

package/dist/index.mjs

@@ -1112,13 +1112,17 @@ const stylistic = () => {
 const require = createRequire(import.meta.url);
 const tailwindcss = () => {
   const pluginTailwindcss = require("eslint-plugin-tailwindcss");
+  const recommended = pluginTailwindcss.configs.recommended;
+  const configs = Array.isArray(recommended) ? recommended : [recommended];
+  const rules = {
+    ...configs.find((c) => c.rules)?.rules,
+    "tailwindcss/no-custom-classname": "off"
+  };
   const config = [
-    ...pluginTailwindcss.configs["flat/recommended"],
+    ...configs,
     {
-      rules: {
-        ...pluginTailwindcss.configs.recommended.rules,
-        "tailwindcss/no-custom-classname": "off"
-      }
+      plugins: { tailwindcss: pluginTailwindcss.default ?? pluginTailwindcss },
+      rules
     }
   ];
   return config;

package/dts/typegen.d.ts

@@ -5781,43 +5781,38 @@ export interface Rules {
      */
     'storybook/use-storybook-testing-library'?: Linter.RuleEntry<[]>;
     /**
-     * Enforce a consistent and logical order of the Tailwind CSS classnames
-     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/tree/master/docs/rules/classnames-order.md
+     * Enforces a consistent order for the Tailwind CSS classnames, based on the compiler.
+     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/alpha/v4-basic-files/docs/rules/classnames-order.md
      */
     'tailwindcss/classnames-order'?: Linter.RuleEntry<TailwindcssClassnamesOrder>;
     /**
-     * Warns about dash prefixed classnames using arbitrary values
-     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/tree/master/docs/rules/enforces-negative-arbitrary-values.md
+     * Warns about `-` prefixed classnames using arbitrary values.
+     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/alpha/v4-basic-files/docs/rules/enforces-negative-arbitrary-values.md
      */
     'tailwindcss/enforces-negative-arbitrary-values'?: Linter.RuleEntry<TailwindcssEnforcesNegativeArbitraryValues>;
     /**
-     * Enforces the usage of shorthand Tailwind CSS classnames
-     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/tree/master/docs/rules/enforces-shorthand.md
+     * Avoid using multiple Tailwind CSS classnames when not required.
+     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/alpha/v4-basic-files/docs/rules/enforces-shorthand.md
      */
     'tailwindcss/enforces-shorthand'?: Linter.RuleEntry<TailwindcssEnforcesShorthand>;
     /**
-     * Detect obsolete classnames when upgrading to Tailwind CSS v3
-     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/tree/master/docs/rules/migration-from-tailwind-2.md
-     */
-    'tailwindcss/migration-from-tailwind-2'?: Linter.RuleEntry<TailwindcssMigrationFromTailwind2>;
-    /**
-     * Forbid using arbitrary values in classnames
-     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/tree/master/docs/rules/no-arbitrary-value.md
+     * Forbid using arbitrary values in classnames.
+     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/alpha/v4-basic-files/docs/rules/no-arbitrary-value.md
      */
     'tailwindcss/no-arbitrary-value'?: Linter.RuleEntry<TailwindcssNoArbitraryValue>;
     /**
-     * Avoid contradicting Tailwind CSS classnames (e.g. "w-3 w-5")
-     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/tree/master/docs/rules/no-contradicting-classname.md
+     * Avoid contradicting Tailwind CSS classnames.
+     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/alpha/v4-basic-files/docs/rules/no-contradicting-classname.md
      */
     'tailwindcss/no-contradicting-classname'?: Linter.RuleEntry<TailwindcssNoContradictingClassname>;
     /**
-     * Detect classnames which do not belong to Tailwind CSS
-     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/tree/master/docs/rules/no-custom-classname.md
+     * Detects classnames which do not belong to Tailwind CSS.
+     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/alpha/v4-basic-files/docs/rules/no-custom-classname.md
      */
     'tailwindcss/no-custom-classname'?: Linter.RuleEntry<TailwindcssNoCustomClassname>;
     /**
-     * Forbid using arbitrary values in classnames when an equivalent preset exists
-     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/tree/master/docs/rules/no-unnecessary-arbitrary-value.md
+     * Avoid unjustified arbitrary classnames.
+     * @see https://github.com/francoismassart/eslint-plugin-tailwindcss/blob/alpha/v4-basic-files/docs/rules/no-unnecessary-arbitrary-value.md
      */
     'tailwindcss/no-unnecessary-arbitrary-value'?: Linter.RuleEntry<TailwindcssNoUnnecessaryArbitraryValue>;
     /**
@@ -13530,98 +13525,17 @@ type StorybookNoUninstalledAddons = [] | [
         ignore?: string[];
     }
 ];
-type TailwindcssClassnamesOrder = [] | [
-    {
-        callees?: string[];
-        ignoredKeys?: string[];
-        config?: (string | {
-            [k: string]: unknown | undefined;
-        });
-        removeDuplicates?: boolean;
-        tags?: string[];
-        [k: string]: unknown | undefined;
-    }
-];
-type TailwindcssEnforcesNegativeArbitraryValues = [] | [
-    {
-        callees?: string[];
-        ignoredKeys?: string[];
-        config?: (string | {
-            [k: string]: unknown | undefined;
-        });
-        tags?: string[];
-        [k: string]: unknown | undefined;
-    }
-];
-type TailwindcssEnforcesShorthand = [] | [
-    {
-        callees?: string[];
-        ignoredKeys?: string[];
-        config?: (string | {
-            [k: string]: unknown | undefined;
-        });
-        tags?: string[];
-        [k: string]: unknown | undefined;
-    }
-];
-type TailwindcssMigrationFromTailwind2 = [] | [
-    {
-        callees?: string[];
-        ignoredKeys?: string[];
-        config?: (string | {
-            [k: string]: unknown | undefined;
-        });
-        tags?: string[];
-        [k: string]: unknown | undefined;
-    }
-];
-type TailwindcssNoArbitraryValue = [] | [
-    {
-        callees?: string[];
-        ignoredKeys?: string[];
-        config?: (string | {
-            [k: string]: unknown | undefined;
-        });
-        tags?: string[];
-        [k: string]: unknown | undefined;
-    }
-];
-type TailwindcssNoContradictingClassname = [] | [
-    {
-        callees?: string[];
-        ignoredKeys?: string[];
-        config?: (string | {
-            [k: string]: unknown | undefined;
-        });
-        tags?: string[];
-        [k: string]: unknown | undefined;
-    }
-];
+type TailwindcssClassnamesOrder = [] | [{}];
+type TailwindcssEnforcesNegativeArbitraryValues = [] | [{}];
+type TailwindcssEnforcesShorthand = [] | [{}];
+type TailwindcssNoArbitraryValue = [] | [{}];
+type TailwindcssNoContradictingClassname = [] | [{}];
 type TailwindcssNoCustomClassname = [] | [
     {
-        callees?: string[];
-        ignoredKeys?: string[];
-        config?: (string | {
-            [k: string]: unknown | undefined;
-        });
-        cssFiles?: string[];
-        cssFilesRefreshRate?: number;
-        tags?: string[];
         whitelist?: string[];
-        [k: string]: unknown | undefined;
-    }
-];
-type TailwindcssNoUnnecessaryArbitraryValue = [] | [
-    {
-        callees?: string[];
-        ignoredKeys?: string[];
-        config?: (string | {
-            [k: string]: unknown | undefined;
-        });
-        tags?: string[];
-        [k: string]: unknown | undefined;
     }
 ];
+type TailwindcssNoUnnecessaryArbitraryValue = [] | [{}];
 type TomlArrayBracketNewline = [] | [
     (("always" | "never" | "consistent") | {
         multiline?: boolean;
@@ -14309,5 +14223,5 @@ type YmlSpacedComment = [] | [("always" | "never")] | [
         markers?: string[];
     }
 ];
-export type ConfigNames = 'markdown/recommended/plugin' | 'markdown/recommended/processor' | 'markdown/recommended/code-blocks' | 'storybook:recommended:setup' | 'storybook:recommended:stories-rules' | 'storybook:recommended:main-rules' | 'tailwindcss:base' | 'tailwindcss:rules' | 'storybook:recommended:setup' | 'storybook:recommended:stories-rules' | 'storybook:recommended:main-rules';
+export type ConfigNames = 'markdown/recommended/plugin' | 'markdown/recommended/processor' | 'markdown/recommended/code-blocks' | 'storybook:recommended:setup' | 'storybook:recommended:stories-rules' | 'storybook:recommended:main-rules' | 'tailwindcss/recommended' | 'storybook:recommended:setup' | 'storybook:recommended:stories-rules' | 'storybook:recommended:main-rules';
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiou/eslint-config",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "type": "module",
   "description": "eslint config for JW",
   "keywords": [],
@@ -35,7 +35,13 @@
     "access": "public"
   },
   "peerDependencies": {
-    "eslint": ">=10"
+    "eslint": ">=10",
+    "tailwindcss": "^4.0.0"
+  },
+  "peerDependenciesMeta": {
+    "tailwindcss": {
+      "optional": true
+    }
   },
   "dependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
@@ -56,7 +62,7 @@
     "eslint-plugin-react-refresh": "^0.5.2",
     "eslint-plugin-regexp": "^3.1.0",
     "eslint-plugin-storybook": "^10.4.0",
-    "eslint-plugin-tailwindcss": "^4.0.0-alpha.5",
+    "eslint-plugin-tailwindcss": "4.0.0-alpha.6",
     "eslint-plugin-toml": "^1.3.1",
     "eslint-plugin-unicorn": "^64.0.0",
     "eslint-plugin-unused-imports": "^4.4.1",
@@ -65,7 +71,7 @@
     "jsonc-eslint-parser": "^3.1.0",
     "local-pkg": "^1.1.2",
     "yaml-eslint-parser": "^2.0.0",
-    "@aiou/eslint-ignore": "0.6.2",
+    "@aiou/eslint-ignore": "0.6.3",
     "@aiou/eslint-plugin-progress": "0.4.0"
   },
   "devDependencies": {
@@ -84,6 +90,7 @@
     "rollup-plugin-esbuild": "^5.0.0",
     "rollup-plugin-filesize": "9.1.2",
     "rollup-plugin-node-externals": "5.1.2",
+    "tailwindcss": "^4.3.1",
     "tsx": "^4.20.0"
   },
   "scripts": {