@debbl/eslint-config 3.1.5 → 3.1.7

package/dist/index.cjs

@@ -80,6 +80,36 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/utils.ts
+var parserPlain = {
+  meta: {
+    name: "parser-plain"
+  },
+  parseForESLint: (code) => ({
+    ast: {
+      body: [],
+      comments: [],
+      loc: { end: code.length, start: 0 },
+      range: [0, code.length],
+      tokens: [],
+      type: "Program"
+    },
+    scopeManager: null,
+    services: { isPlain: true },
+    visitorKeys: {
+      Program: []
+    }
+  })
+};
+async function combine(...configs) {
+  const resolved = await Promise.all(configs);
+  return resolved.flat();
+}
+async function interopDefault(m) {
+  const resolved = await m;
+  return resolved.default || resolved;
+}
+
 // src/configs/comments.ts
 async function comments() {
   const pluginComments = await interopDefault(
@@ -201,36 +231,6 @@ var ignores = async (options) => {
   ];
 };
 
-// src/utils.ts
-var parserPlain = {
-  meta: {
-    name: "parser-plain"
-  },
-  parseForESLint: (code) => ({
-    ast: {
-      body: [],
-      comments: [],
-      loc: { end: code.length, start: 0 },
-      range: [0, code.length],
-      tokens: [],
-      type: "Program"
-    },
-    scopeManager: null,
-    services: { isPlain: true },
-    visitorKeys: {
-      Program: []
-    }
-  })
-};
-async function combine(...configs) {
-  const resolved = await Promise.all(configs);
-  return resolved.flat();
-}
-async function interopDefault(m) {
-  const resolved = await m;
-  return resolved.default || resolved;
-}
-
 // src/configs/imports.ts
 async function imports() {
   const pluginImport = await interopDefault(import("eslint-plugin-import-x"));
@@ -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
           }
@@ -1657,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

@@ -1,5 +1,5 @@
 import { ParserOptions } from '@typescript-eslint/parser';
-import { FlatESLintConfig } from 'eslint-define-config';
+import { Linter } from 'eslint';
 import { RequiredOptions } from 'prettier';
 
 type ReactConfig = (options: {
@@ -71,16 +71,14 @@ 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>;
 type GetConfigOption<T extends (...args: any) => any> = Parameters<T>[0];
-interface ConfigItem extends FlatESLintConfig {
-    /**
-     * Custom name of each config item
-     */
-    name?: string;
+interface ConfigItem extends Linter.FlatConfig {
     /**
      * An object containing a name-value mapping of plugin names to plugin objects. When `files` is specified, these plugins are only available to the matching files.
      *
@@ -184,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`
      * @default false
      */
-    tailwindcss?: boolean;
+    tailwindcss?: boolean | "prettier";
     /**
      * Custom config
      */

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { ParserOptions } from '@typescript-eslint/parser';
-import { FlatESLintConfig } from 'eslint-define-config';
+import { Linter } from 'eslint';
 import { RequiredOptions } from 'prettier';
 
 type ReactConfig = (options: {
@@ -71,16 +71,14 @@ 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>;
 type GetConfigOption<T extends (...args: any) => any> = Parameters<T>[0];
-interface ConfigItem extends FlatESLintConfig {
-    /**
-     * Custom name of each config item
-     */
-    name?: string;
+interface ConfigItem extends Linter.FlatConfig {
     /**
      * An object containing a name-value mapping of plugin names to plugin objects. When `files` is specified, these plugins are only available to the matching files.
      *
@@ -184,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`
      * @default false
      */
-    tailwindcss?: boolean;
+    tailwindcss?: boolean | "prettier";
     /**
      * Custom config
      */

package/dist/index.js

@@ -1,3 +1,33 @@
+// src/utils.ts
+var parserPlain = {
+  meta: {
+    name: "parser-plain"
+  },
+  parseForESLint: (code) => ({
+    ast: {
+      body: [],
+      comments: [],
+      loc: { end: code.length, start: 0 },
+      range: [0, code.length],
+      tokens: [],
+      type: "Program"
+    },
+    scopeManager: null,
+    services: { isPlain: true },
+    visitorKeys: {
+      Program: []
+    }
+  })
+};
+async function combine(...configs) {
+  const resolved = await Promise.all(configs);
+  return resolved.flat();
+}
+async function interopDefault(m) {
+  const resolved = await m;
+  return resolved.default || resolved;
+}
+
 // src/configs/comments.ts
 async function comments() {
   const pluginComments = await interopDefault(
@@ -119,36 +149,6 @@ var ignores = async (options) => {
   ];
 };
 
-// src/utils.ts
-var parserPlain = {
-  meta: {
-    name: "parser-plain"
-  },
-  parseForESLint: (code) => ({
-    ast: {
-      body: [],
-      comments: [],
-      loc: { end: code.length, start: 0 },
-      range: [0, code.length],
-      tokens: [],
-      type: "Program"
-    },
-    scopeManager: null,
-    services: { isPlain: true },
-    visitorKeys: {
-      Program: []
-    }
-  })
-};
-async function combine(...configs) {
-  const resolved = await Promise.all(configs);
-  return resolved.flat();
-}
-async function interopDefault(m) {
-  const resolved = await m;
-  return resolved.default || resolved;
-}
-
 // src/configs/imports.ts
 async function imports() {
   const pluginImport = await interopDefault(import("eslint-plugin-import-x"));
@@ -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
           }
@@ -1575,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.1.5",
+  "version": "3.1.7",
   "description": "Brendan Dash's ESLint config",
   "author": "Debbl <me@aiwan.run> (https://github.com/Debbl/)",
   "license": "MIT",
@@ -23,20 +23,13 @@
     "dist"
   ],
   "peerDependencies": {
-    "eslint": ">=8.40.0",
-    "eslint-plugin-tailwindcss": "^3.15.1"
-  },
-  "peerDependenciesMeta": {
-    "eslint-plugin-tailwindcss": {
-      "optional": true
-    }
+    "eslint": ">=8.40.0"
   },
   "dependencies": {
     "@next/eslint-plugin-next": "^14.2.3",
     "@typescript-eslint/eslint-plugin": "^7.8.0",
     "@typescript-eslint/parser": "^7.8.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-define-config": "^2.1.0",
     "eslint-mdx": "^3.1.5",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import-x": "^0.5.0",
@@ -51,6 +44,7 @@
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-react-refresh": "^0.4.6",
+    "eslint-plugin-tailwindcss": "^3.15.2",
     "eslint-plugin-toml": "^0.11.0",
     "eslint-plugin-unicorn": "^52.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
@@ -60,6 +54,7 @@
     "globals": "^15.1.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"
@@ -71,7 +66,6 @@
     "@types/react": "^18.3.1",
     "bumpp": "^9.4.1",
     "eslint": "^8.57.0",
-    "eslint-plugin-tailwindcss": "^3.15.1",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",