@debbl/eslint-config 3.2.0-beta.3 → 3.2.0-beta.4

package/dist/index.cjs

@@ -1383,7 +1383,7 @@ async function perfectionist() {
 }
 
 // src/configs/prettier.ts
-var prettier = async (options) => {
+var prettier = async ({ tailwindcss: tailwindcss2, ...options }) => {
   const [pluginPrettier, configPrettier] = await Promise.all([
     interopDefault(import("eslint-plugin-prettier")),
     // @ts-expect-error missing types
@@ -1458,11 +1458,18 @@ var prettier = async (options) => {
       name: "eslint/prettier/rules",
       ignores: [GLOB_TOML],
       rules: {
+        // disable rules with prettier conflicts
         ...configPrettier.rules,
-        ...pluginPrettier.configs.recommended.rules,
+        // eslint-plugin-prettier recommended rules
+        ...{
+          "prettier/prettier": "error",
+          "arrow-body-style": "off",
+          "prefer-arrow-callback": "off"
+        },
         "prettier/prettier": [
           "warn",
           {
+            plugins: tailwindcss2 ? ["prettier-plugin-tailwindcss"] : [],
             quoteProps: "consistent",
             ...options
           }
@@ -1513,11 +1520,7 @@ async function next() {
   ];
 }
 var react = async (options) => {
-  const {
-    next: enableNext = false,
-    reactCompiler: enableReactCompiler = false,
-    overrides = {}
-  } = options;
+  const { next: enableNext = false, overrides = {} } = options;
   const [pluginReact, pluginReactHooks, pluginReactRefresh] = await Promise.all(
     [
       // @ts-expect-error missing types
@@ -1570,24 +1573,6 @@ var react = async (options) => {
       }
     }
   ];
-  const reactCompiler = [
-    {
-      name: "eslint/react/compiler",
-      files: [GLOB_TSX, GLOB_JSX],
-      plugins: {
-        "react-compiler": await interopDefault(
-          // @ts-expect-error missing types
-          import("eslint-plugin-react-compiler")
-        )
-      },
-      rules: {
-        "react-compiler/react-compiler": "error"
-      }
-    }
-  ];
-  if (enableReactCompiler) {
-    _react.push(...reactCompiler);
-  }
   return combine(_react, enableNext ? next() : []);
 };
 
@@ -1679,11 +1664,16 @@ function config(options = {}) {
       })
     );
   }
-  if (enableTailwindcss) {
+  if (typeof enableTailwindcss === "boolean" && enableTailwindcss) {
     configs.push(tailwindcss());
   }
   if (options.prettier ?? true) {
-    configs.push(prettier(getConfigOption(options.prettier)));
+    configs.push(
+      prettier({
+        ...getConfigOption(options.prettier),
+        tailwindcss: enableTailwindcss === "prettier"
+      })
+    );
   }
   const merged = combine(...configs, options.customConfig ?? []);
   return merged;

package/dist/index.d.cts

@@ -4,8 +4,6 @@ import { RequiredOptions } from 'prettier';
 
 type ReactConfig = (options: {
     next?: boolean;
-    /** only work in react@19 */
-    reactCompiler?: boolean;
 } & OptionsOverrides) => ReturnType<ConfigFn>;
 
 declare function comments(): Promise<ConfigItem[]>;
@@ -73,7 +71,9 @@ declare const test: TestConfig;
 declare function perfectionist(): Promise<ConfigItem[]>;
 
 type PrettierRequiredOptions = Partial<RequiredOptions>;
-type PrettierConfig = (options: PrettierRequiredOptions) => Promise<ConfigItem[]>;
+type PrettierConfig = ({ options, }: PrettierRequiredOptions & {
+    tailwindcss?: boolean;
+}) => Promise<ConfigItem[]>;
 declare const prettier: PrettierConfig;
 
 type Awaitable<T> = T | Promise<T>;
@@ -182,12 +182,13 @@ interface OptionsConfig extends OptionsComponentExts {
      *
      * @default true
      */
-    prettier?: boolean | GetConfigOption<PrettierConfig>;
+    prettier?: boolean | Omit<GetConfigOption<PrettierConfig>, "tailwindcss">;
     /**
      * Enable Tailwind CSS support.
+     * if set to "prettier", it will use `prettier-plugin-tailwindcss` @see https://github.com/tailwindlabs/prettier-plugin-tailwindcss
      * @default false
      */
-    tailwindcss?: boolean;
+    tailwindcss?: boolean | "prettier";
     /**
      * Custom config
      */

package/dist/index.d.ts

@@ -4,8 +4,6 @@ import { RequiredOptions } from 'prettier';
 
 type ReactConfig = (options: {
     next?: boolean;
-    /** only work in react@19 */
-    reactCompiler?: boolean;
 } & OptionsOverrides) => ReturnType<ConfigFn>;
 
 declare function comments(): Promise<ConfigItem[]>;
@@ -73,7 +71,9 @@ declare const test: TestConfig;
 declare function perfectionist(): Promise<ConfigItem[]>;
 
 type PrettierRequiredOptions = Partial<RequiredOptions>;
-type PrettierConfig = (options: PrettierRequiredOptions) => Promise<ConfigItem[]>;
+type PrettierConfig = ({ options, }: PrettierRequiredOptions & {
+    tailwindcss?: boolean;
+}) => Promise<ConfigItem[]>;
 declare const prettier: PrettierConfig;
 
 type Awaitable<T> = T | Promise<T>;
@@ -182,12 +182,13 @@ interface OptionsConfig extends OptionsComponentExts {
      *
      * @default true
      */
-    prettier?: boolean | GetConfigOption<PrettierConfig>;
+    prettier?: boolean | Omit<GetConfigOption<PrettierConfig>, "tailwindcss">;
     /**
      * Enable Tailwind CSS support.
+     * if set to "prettier", it will use `prettier-plugin-tailwindcss` @see https://github.com/tailwindlabs/prettier-plugin-tailwindcss
      * @default false
      */
-    tailwindcss?: boolean;
+    tailwindcss?: boolean | "prettier";
     /**
      * Custom config
      */

package/dist/index.js

@@ -1301,7 +1301,7 @@ async function perfectionist() {
 }
 
 // src/configs/prettier.ts
-var prettier = async (options) => {
+var prettier = async ({ tailwindcss: tailwindcss2, ...options }) => {
   const [pluginPrettier, configPrettier] = await Promise.all([
     interopDefault(import("eslint-plugin-prettier")),
     // @ts-expect-error missing types
@@ -1376,11 +1376,18 @@ var prettier = async (options) => {
       name: "eslint/prettier/rules",
       ignores: [GLOB_TOML],
       rules: {
+        // disable rules with prettier conflicts
         ...configPrettier.rules,
-        ...pluginPrettier.configs.recommended.rules,
+        // eslint-plugin-prettier recommended rules
+        ...{
+          "prettier/prettier": "error",
+          "arrow-body-style": "off",
+          "prefer-arrow-callback": "off"
+        },
         "prettier/prettier": [
           "warn",
           {
+            plugins: tailwindcss2 ? ["prettier-plugin-tailwindcss"] : [],
             quoteProps: "consistent",
             ...options
           }
@@ -1431,11 +1438,7 @@ async function next() {
   ];
 }
 var react = async (options) => {
-  const {
-    next: enableNext = false,
-    reactCompiler: enableReactCompiler = false,
-    overrides = {}
-  } = options;
+  const { next: enableNext = false, overrides = {} } = options;
   const [pluginReact, pluginReactHooks, pluginReactRefresh] = await Promise.all(
     [
       // @ts-expect-error missing types
@@ -1488,24 +1491,6 @@ var react = async (options) => {
       }
     }
   ];
-  const reactCompiler = [
-    {
-      name: "eslint/react/compiler",
-      files: [GLOB_TSX, GLOB_JSX],
-      plugins: {
-        "react-compiler": await interopDefault(
-          // @ts-expect-error missing types
-          import("eslint-plugin-react-compiler")
-        )
-      },
-      rules: {
-        "react-compiler/react-compiler": "error"
-      }
-    }
-  ];
-  if (enableReactCompiler) {
-    _react.push(...reactCompiler);
-  }
   return combine(_react, enableNext ? next() : []);
 };
 
@@ -1597,11 +1582,16 @@ function config(options = {}) {
       })
     );
   }
-  if (enableTailwindcss) {
+  if (typeof enableTailwindcss === "boolean" && enableTailwindcss) {
     configs.push(tailwindcss());
   }
   if (options.prettier ?? true) {
-    configs.push(prettier(getConfigOption(options.prettier)));
+    configs.push(
+      prettier({
+        ...getConfigOption(options.prettier),
+        tailwindcss: enableTailwindcss === "prettier"
+      })
+    );
   }
   const merged = combine(...configs, options.customConfig ?? []);
   return merged;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@debbl/eslint-config",
   "type": "module",
-  "version": "3.2.0-beta.3",
+  "version": "3.2.0-beta.4",
   "description": "Brendan Dash's ESLint config",
   "author": "Debbl <me@aiwan.run> (https://github.com/Debbl/)",
   "license": "MIT",
@@ -55,6 +55,7 @@
     "globals": "^15.2.0",
     "jsonc-eslint-parser": "^2.4.0",
     "prettier": "^3.2.5",
+    "prettier-plugin-tailwindcss": "^0.5.14",
     "toml-eslint-parser": "^0.9.3",
     "vue-eslint-parser": "^9.4.2",
     "yaml-eslint-parser": "^1.2.2"