@fullstacksjs/eslint-config 12.2.0 → 12.3.1-next.1

package/README.md

@@ -69,7 +69,7 @@ interface Options {
   cypress?: boolean; // controls cypress plugin
   playwright?: boolean // controls playwright plugin
   storybook?: boolean; // controls storybook plugin
-  tailwind?: boolean | { callee?: string[] }; // controls tailwindcss plugin
+  tailwind?: false | TailwindConfig; // controls tailwindcss plugin
   next?: boolean; // controls next plugin
   prettier?: boolean; // controls prettier plugin
   disableExpensiveRules?: boolean; // controls expensive rules
@@ -177,7 +177,7 @@ export default defineConfig({
 * [eslint-plugin-promise](https://github.com/eslint-community/eslint-plugin-promise)
 * [eslint-plugin-react-hooks](https://www.npmjs.com/package/eslint-plugin-react-hooks)
 * [eslint-plugin-storybook](https://github.com/storybookjs/eslint-plugin-storybook#readme)
-* [eslint-plugin-tailwindcss](https://github.com/francoismassart/eslint-plugin-tailwindcss)
+* [eslint-plugin-better-tailwindcss](https://github.com/schoero/eslint-plugin-better-tailwindcss)
 * [eslint-plugin-vitest](https://www.npmjs.com/package/eslint-plugin-vitest)
 * [typescript-eslint](https://typescript-eslint.io/)
 

package/cjs/{option.d.ts → index.d.ts}

@@ -7,6 +7,13 @@ interface ProjectService {
   maximumDefaultProjectFileMatchCount_THIS_WILL_SLOW_DOWN_LINTING: number;
 }
 
+type TailwindConfig = {
+  callees: string[];
+  variables?: string[];
+  attributes?: string[];
+  tags?: string[];
+} & ({ entryPoint: string; tailwindConfig?: string } | { entryPoint?: string; tailwindConfig: string });
+
 export interface Options extends Linter.Config {
   /**
    * @default true if you have `react` or `react-dom` in your dependencies
@@ -23,10 +30,11 @@ export interface Options extends Linter.Config {
    */
   next?: boolean;
   /**
-   * @default true if you have `tailwind` in your dependencies
-   * Controls tailwind plugin.
+   * Controls Tailwind plugin.
+   * @default false
+   * @see https://github.com/schoero/eslint-plugin-better-tailwindcss/blob/main/docs/settings/settings.md
    */
-  tailwind?: boolean | { callees: string[] };
+  tailwind?: false | TailwindConfig;
   /**
    * @default false
    * Controls [node plugin](https://www.npmjs.com/package/eslint-plugin-n).
@@ -98,4 +106,6 @@ export interface Options extends Linter.Config {
   ignores?: string[];
 }
 
-export declare const init: (opts: Options) => import('eslint').Linter.Config[];
+export declare function defineConfig(initOptions?: Options, ...extend: Linter.Config[]): Linter.Config[];
+
+export declare const init: typeof defineConfig;

package/cjs/index.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defineConfig = defineConfig;
-exports.init = void 0;
 var _deepmerge = _interopRequireDefault(require("deepmerge"));
 var _config = require("eslint/config");
 var _localPkg = require("local-pkg");
@@ -30,7 +29,7 @@ const testPackages = ['jest', 'vitest', 'cypress', 'playwright'];
 
 /**
  * @typedef {import('eslint').Linter.Config} Config
- * @typedef {import('./option').Options} Options
+ * @typedef {import('./index.js').Options} Options
  * /
 
 /** @type {Options} */
@@ -50,7 +49,6 @@ const defaultOptions = {
   storybook: (0, _localPkg.isPackageExists)('storybook'),
   strict: false,
   tailwind: false,
-  // ISSUE: https://github.com/francoismassart/eslint-plugin-tailwindcss/issues/325,
   test: testPackages.some(p => (0, _localPkg.isPackageExists)(p)),
   typescript: (0, _localPkg.isPackageExists)('typescript') ? {
     projectService: true
@@ -66,9 +64,6 @@ const defaultOptions = {
  */
 function defineConfig(initOptions = {}, ...extend) {
   const options = (0, _deepmerge.default)(defaultOptions, initOptions);
-  if (options.tailwind === true) {
-    options.tailwind = {};
-  }
   if (options.import === true) {
     options.import = {};
   }
@@ -112,6 +107,3 @@ function defineConfig(initOptions = {}, ...extend) {
   if (extend) Array.prototype.push.apply(rules, extend);
   return (0, _config.defineConfig)(rules);
 }
-
-/** @deprecated Please use `defineConfig` from `@fullstacksjs/eslint-config` instead, this function will be removed in the next major release */
-const init = exports.init = defineConfig;

package/cjs/modules/base.js

@@ -8,7 +8,7 @@ var _globals = _interopRequireDefault(require("globals"));
 var _conditions = require("../utils/conditions.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function base(options = {}) {
@@ -19,7 +19,7 @@ function base(options = {}) {
       globals: {
         ..._globals.default.browser,
         ..._globals.default.node,
-        ..._globals.default.es2024
+        ..._globals.default.es2025
       },
       parserOptions: {
         ecmaVersion: 'latest',

package/cjs/modules/ignore.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 var _config = require("eslint/config");
 var _globs = require("../utils/globs.js");
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function ignores(options = {}) {

package/cjs/modules/imports.js

@@ -12,7 +12,7 @@ const jsExtensions = ['.mjs', '.js', '.jsx', '.cjs'];
 const allExtensions = [...jsExtensions, ...tsExtensions];
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function imports(options = {}) {

package/cjs/modules/jest.js

@@ -8,7 +8,7 @@ var _eslintPluginJest = _interopRequireDefault(require("eslint-plugin-jest"));
 var _globs = require("../utils/globs.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { import('eslint').Linter.Config } */
 function jest() {
   return {

package/cjs/modules/node.js

@@ -8,7 +8,7 @@ var _eslintPluginN = _interopRequireDefault(require("eslint-plugin-n"));
 var _conditions = require("../utils/conditions.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function node(options = {}) {

package/cjs/modules/stylistic.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 var _eslintPlugin = _interopRequireDefault(require("@stylistic/eslint-plugin"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { Promise<import('eslint').Linter.Config> }
  */
 function stylistic() {

package/cjs/modules/tailwind.js

@@ -5,28 +5,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { Promise<import('eslint').Linter.Config> }
  */
 async function tailwind(options = {}) {
-  const plugin = await Promise.resolve().then(() => require('eslint-plugin-tailwindcss'));
+  const plugin = await Promise.resolve().then(() => require('eslint-plugin-better-tailwindcss'));
   return {
     plugins: {
-      tailwindcss: plugin.default ?? plugin
+      'better-tailwindcss': plugin.default ?? plugin
     },
     settings: {
-      tailwindcss: {
-        callees: options.callees ?? ['cva', 'classnames', 'classNames', 'class', 'clsx', 'cn', 'cns', 'cx']
+      'better-tailwindcss': {
+        entryPoint: options.entryPoint,
+        tailwindConfig: options.tailwindConfig
       }
     },
     rules: {
-      'tailwindcss/classnames-order': 'warn',
-      'tailwindcss/enforces-negative-arbitrary-values': 'warn',
-      'tailwindcss/enforces-shorthand': 'warn',
-      'tailwindcss/migration-from-tailwind-2': 'warn',
-      'tailwindcss/no-arbitrary-value': 'off',
-      'tailwindcss/no-custom-classname': 'warn',
-      'tailwindcss/no-contradicting-classname': 'error'
+      'better-tailwindcss/sort-classes': 'warn',
+      'better-tailwindcss/no-duplicate-classes': 'error',
+      'better-tailwindcss/no-conflicting-classes': 'error',
+      'better-tailwindcss/no-unnecessary-whitespace': 'warn',
+      'better-tailwindcss/enforce-consistent-variable-syntax': 'error',
+      'better-tailwindcss/multiline': ['error', {
+        printWidth: 140
+      }]
     }
   };
 }

package/cjs/modules/tests.js

@@ -10,7 +10,7 @@ var _conditions = require("../utils/conditions.js");
 var _globs = require("../utils/globs.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function tests(options = {}) {

package/cjs/modules/typescript.js

@@ -9,7 +9,7 @@ var _conditions = require("../utils/conditions.js");
 var _globs = require("../utils/globs.js");
 var _namingConvention = require("../utils/naming-convention.js");
 /**
- * @param { import('../option').Options } options
+ * @param { import('../index.js').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function typescript(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fullstacksjs/eslint-config",
-  "version": "12.2.0",
+  "version": "12.3.1-next.1",
   "license": "MIT",
   "author": "fullstacks <fullstacksjs@gmail.com>",
   "description": "fullstacks eslint config",
@@ -30,7 +30,8 @@
   "exports": {
     ".": {
       "import": "./src/index.mjs",
-      "require": "./cjs/index.js"
+      "require": "./cjs/index.js",
+      "types": "./src/index.d.ts"
     }
   },
   "dependencies": {
@@ -38,6 +39,7 @@
     "@next/eslint-plugin-next": "15.3.2",
     "@stylistic/eslint-plugin": "4.4.0",
     "deepmerge": "4.3.1",
+    "eslint-plugin-better-tailwindcss": "3.2.1",
     "eslint-plugin-cypress": "4.3.0",
     "eslint-plugin-import-x": "4.13.3",
     "eslint-plugin-jest": "28.11.0",
@@ -50,7 +52,6 @@
     "eslint-plugin-promise": "7.2.1",
     "eslint-plugin-react-hooks": "5.2.0",
     "eslint-plugin-storybook": "0.12.0",
-    "eslint-plugin-tailwindcss": "3.18.0",
     "eslint-plugin-vitest": "0.5.4",
     "globals": "16.2.0",
     "local-pkg": "1.1.1",

package/src/{option.d.ts → index.d.ts}

@@ -7,6 +7,13 @@ interface ProjectService {
   maximumDefaultProjectFileMatchCount_THIS_WILL_SLOW_DOWN_LINTING: number;
 }
 
+type TailwindConfig = {
+  callees: string[];
+  variables?: string[];
+  attributes?: string[];
+  tags?: string[];
+} & ({ entryPoint: string; tailwindConfig?: string } | { entryPoint?: string; tailwindConfig: string });
+
 export interface Options extends Linter.Config {
   /**
    * @default true if you have `react` or `react-dom` in your dependencies
@@ -23,10 +30,11 @@ export interface Options extends Linter.Config {
    */
   next?: boolean;
   /**
-   * @default true if you have `tailwind` in your dependencies
-   * Controls tailwind plugin.
+   * Controls Tailwind plugin.
+   * @default false
+   * @see https://github.com/schoero/eslint-plugin-better-tailwindcss/blob/main/docs/settings/settings.md
    */
-  tailwind?: boolean | { callees: string[] };
+  tailwind?: false | TailwindConfig;
   /**
    * @default false
    * Controls [node plugin](https://www.npmjs.com/package/eslint-plugin-n).
@@ -98,4 +106,6 @@ export interface Options extends Linter.Config {
   ignores?: string[];
 }
 
-export declare const init: (opts: Options) => import('eslint').Linter.Config[];
+export declare function defineConfig(initOptions?: Options, ...extend: Linter.Config[]): Linter.Config[];
+
+export declare const init: typeof defineConfig;

package/src/index.mjs

@@ -24,7 +24,7 @@ const testPackages = ['jest', 'vitest', 'cypress', 'playwright'];
 
 /**
  * @typedef {import('eslint').Linter.Config} Config
- * @typedef {import('./option').Options} Options
+ * @typedef {import('.').Options} Options
  * /
 
 /** @type {Options} */
@@ -43,7 +43,7 @@ const defaultOptions = {
   react: isPackageExists('react'),
   storybook: isPackageExists('storybook'),
   strict: false,
-  tailwind: false, // ISSUE: https://github.com/francoismassart/eslint-plugin-tailwindcss/issues/325,
+  tailwind: false,
   test: testPackages.some(p => isPackageExists(p)),
   typescript: isPackageExists('typescript') ? { projectService: true } : false,
   vitest: isPackageExists('vitest'),
@@ -58,9 +58,6 @@ const defaultOptions = {
 export function defineConfig(initOptions = {}, ...extend) {
   const options = merge(defaultOptions, initOptions);
 
-  if (options.tailwind === true) {
-    options.tailwind = {};
-  }
   if (options.import === true) {
     options.import = {};
   }
@@ -109,6 +106,3 @@ export function defineConfig(initOptions = {}, ...extend) {
 
   return eslintConfig(rules);
 }
-
-/** @deprecated Please use `defineConfig` from `@fullstacksjs/eslint-config` instead, this function will be removed in the next major release */
-export const init = defineConfig;

package/src/modules/base.mjs

@@ -3,7 +3,7 @@ import globals from 'globals';
 import { strict } from '../utils/conditions.mjs';
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function base(options = {}) {
@@ -14,7 +14,7 @@ function base(options = {}) {
       globals: {
         ...globals.browser,
         ...globals.node,
-        ...globals.es2024,
+        ...globals.es2025,
       },
       parserOptions: {
         ecmaVersion: 'latest',

package/src/modules/ignore.mjs

@@ -2,7 +2,7 @@ import { globalIgnores } from 'eslint/config';
 
 import { ignoreGlobs } from '../utils/globs.mjs';
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function ignores(options = {}) {

package/src/modules/imports.mjs

@@ -7,7 +7,7 @@ const jsExtensions = ['.mjs', '.js', '.jsx', '.cjs'];
 const allExtensions = [...jsExtensions, ...tsExtensions];
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function imports(options = {}) {

package/src/modules/jest.mjs

@@ -3,7 +3,7 @@ import plugin from 'eslint-plugin-jest';
 import { globs } from '../utils/globs.mjs';
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { import('eslint').Linter.Config } */
 function jest() {
   return {

package/src/modules/node.mjs

@@ -3,7 +3,7 @@ import plugin from 'eslint-plugin-n';
 import { strict } from '../utils/conditions.mjs';
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function node(options = {}) {

package/src/modules/stylistic.mjs

@@ -1,7 +1,7 @@
 import stylisticPlugin from '@stylistic/eslint-plugin';
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { Promise<import('eslint').Linter.Config> }
  */
 function stylistic() {

package/src/modules/tailwind.mjs

@@ -1,24 +1,24 @@
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { Promise<import('eslint').Linter.Config> }
  */
 async function tailwind(options = {}) {
-  const plugin = await import('eslint-plugin-tailwindcss');
+  const plugin = await import('eslint-plugin-better-tailwindcss');
   return {
-    plugins: { tailwindcss: plugin.default ?? plugin },
+    plugins: { 'better-tailwindcss': plugin.default ?? plugin },
     settings: {
-      tailwindcss: {
-        callees: options.callees ?? ['cva', 'classnames', 'classNames', 'class', 'clsx', 'cn', 'cns', 'cx'],
+      'better-tailwindcss': {
+        entryPoint: options.entryPoint,
+        tailwindConfig: options.tailwindConfig,
       },
     },
     rules: {
-      'tailwindcss/classnames-order': 'warn',
-      'tailwindcss/enforces-negative-arbitrary-values': 'warn',
-      'tailwindcss/enforces-shorthand': 'warn',
-      'tailwindcss/migration-from-tailwind-2': 'warn',
-      'tailwindcss/no-arbitrary-value': 'off',
-      'tailwindcss/no-custom-classname': 'warn',
-      'tailwindcss/no-contradicting-classname': 'error',
+      'better-tailwindcss/sort-classes': 'warn',
+      'better-tailwindcss/no-duplicate-classes': 'error',
+      'better-tailwindcss/no-conflicting-classes': 'error',
+      'better-tailwindcss/no-unnecessary-whitespace': 'warn',
+      'better-tailwindcss/enforce-consistent-variable-syntax': 'error',
+      'better-tailwindcss/multiline': ['error', { printWidth: 140 }],
     },
   };
 }

package/src/modules/tests.mjs

@@ -5,7 +5,7 @@ import { predicate } from '../utils/conditions.mjs';
 import { globs } from '../utils/globs.mjs';
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function tests(options = {}) {

package/src/modules/typescript.mjs

@@ -5,7 +5,7 @@ import { globs } from '../utils/globs.mjs';
 import { namingConvention } from '../utils/naming-convention.mjs';
 
 /**
- * @param { import('../option').Options } options
+ * @param { import('..').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function typescript(options = {}) {