@debbl/eslint-config 3.1.8 → 3.2.0-beta.1

package/dist/index.cjs

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

package/dist/index.d.cts

@@ -4,6 +4,7 @@ import { RequiredOptions } from 'prettier';
 
 type ReactConfig = (options: {
     next?: boolean;
+    reactCompiler?: boolean;
 } & OptionsOverrides) => ReturnType<ConfigFn>;
 
 declare function comments(): Promise<ConfigItem[]>;
@@ -71,9 +72,7 @@ declare const test: TestConfig;
 declare function perfectionist(): Promise<ConfigItem[]>;
 
 type PrettierRequiredOptions = Partial<RequiredOptions>;
-type PrettierConfig = ({ options, }: PrettierRequiredOptions & {
-    tailwindcss?: boolean;
-}) => Promise<ConfigItem[]>;
+type PrettierConfig = (options: PrettierRequiredOptions) => Promise<ConfigItem[]>;
 declare const prettier: PrettierConfig;
 
 type Awaitable<T> = T | Promise<T>;
@@ -182,13 +181,12 @@ interface OptionsConfig extends OptionsComponentExts {
      *
      * @default true
      */
-    prettier?: boolean | Omit<GetConfigOption<PrettierConfig>, "tailwindcss">;
+    prettier?: boolean | GetConfigOption<PrettierConfig>;
     /**
      * 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 | "prettier";
+    tailwindcss?: boolean;
     /**
      * Custom config
      */

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import { RequiredOptions } from 'prettier';
 
 type ReactConfig = (options: {
     next?: boolean;
+    reactCompiler?: boolean;
 } & OptionsOverrides) => ReturnType<ConfigFn>;
 
 declare function comments(): Promise<ConfigItem[]>;
@@ -71,9 +72,7 @@ declare const test: TestConfig;
 declare function perfectionist(): Promise<ConfigItem[]>;
 
 type PrettierRequiredOptions = Partial<RequiredOptions>;
-type PrettierConfig = ({ options, }: PrettierRequiredOptions & {
-    tailwindcss?: boolean;
-}) => Promise<ConfigItem[]>;
+type PrettierConfig = (options: PrettierRequiredOptions) => Promise<ConfigItem[]>;
 declare const prettier: PrettierConfig;
 
 type Awaitable<T> = T | Promise<T>;
@@ -182,13 +181,12 @@ interface OptionsConfig extends OptionsComponentExts {
      *
      * @default true
      */
-    prettier?: boolean | Omit<GetConfigOption<PrettierConfig>, "tailwindcss">;
+    prettier?: boolean | GetConfigOption<PrettierConfig>;
     /**
      * 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 | "prettier";
+    tailwindcss?: boolean;
     /**
      * Custom config
      */

package/dist/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@debbl/eslint-config",
   "type": "module",
-  "version": "3.1.8",
+  "version": "3.2.0-beta.1",
   "description": "Brendan Dash's ESLint config",
   "author": "Debbl <me@aiwan.run> (https://github.com/Debbl/)",
   "license": "MIT",
@@ -23,38 +23,43 @@
     "dist"
   ],
   "peerDependencies": {
-    "eslint": ">=8.40.0"
+    "eslint": ">=8.40.0",
+    "eslint-plugin-tailwindcss": "^3.15.1"
+  },
+  "peerDependenciesMeta": {
+    "eslint-plugin-tailwindcss": {
+      "optional": true
+    }
   },
   "dependencies": {
     "@next/eslint-plugin-next": "^14.2.3",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.9.0",
+    "@typescript-eslint/parser": "^7.9.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-mdx": "^3.1.5",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import-x": "^0.5.0",
-    "eslint-plugin-jsdoc": "^48.2.3",
+    "eslint-plugin-jsdoc": "^48.2.5",
     "eslint-plugin-jsonc": "^2.15.1",
     "eslint-plugin-markdown": "^5.0.0",
     "eslint-plugin-mdx": "^3.1.5",
-    "eslint-plugin-n": "^17.5.1",
+    "eslint-plugin-n": "^17.7.0",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.10.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.34.1",
+    "eslint-plugin-react-compiler": "0.0.0-experimental-c8b3f72-20240517",
     "eslint-plugin-react-hooks": "4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.6",
-    "eslint-plugin-tailwindcss": "^3.15.2",
+    "eslint-plugin-react-refresh": "^0.4.7",
     "eslint-plugin-toml": "^0.11.0",
-    "eslint-plugin-unicorn": "^52.0.0",
+    "eslint-plugin-unicorn": "^53.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
     "eslint-plugin-vitest": "^0.5.4",
-    "eslint-plugin-vue": "^9.25.0",
+    "eslint-plugin-vue": "^9.26.0",
     "eslint-plugin-yml": "^1.14.0",
-    "globals": "^15.1.0",
+    "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"
@@ -62,11 +67,12 @@
   "devDependencies": {
     "@eslint/config-inspector": "^0.4.8",
     "@types/eslint": "^8.56.10",
-    "@types/node": "^20.12.10",
-    "@types/react": "^18.3.1",
+    "@types/node": "^20.12.12",
+    "@types/react": "^18.3.2",
     "bumpp": "^9.4.1",
     "eslint": "^8.57.0",
-    "execa": "^8.0.1",
+    "eslint-plugin-tailwindcss": "^3.15.2",
+    "execa": "^9.1.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
     "react": "^18.3.1",