@coderwyd/eslint-config 2.5.0-beta.2 → 2.5.1

package/dist/cli.cjs

@@ -46,7 +46,7 @@ var import_parse_gitignore = __toESM(require("parse-gitignore"), 1);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "2.5.0-beta.2";
+var version = "2.5.1";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
   "@eslint-react/eslint-plugin": "^1.5.12",
@@ -57,17 +57,18 @@ var devDependencies = {
   "@types/node": "^20.12.12",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.60.2",
+  "@unocss/eslint-plugin": "^0.60.3",
   bumpp: "^9.4.1",
   eslint: "^9.3.0",
   "eslint-plugin-react": "^7.34.1",
   "eslint-plugin-react-hooks": "^4.6.2",
   "eslint-plugin-react-refresh": "^0.4.7",
   "eslint-plugin-svelte": "2.39.0",
+  "eslint-plugin-tailwindcss": "^3.16.0",
   execa: "^9.1.0",
   "fast-glob": "^3.3.2",
   "fs-extra": "^11.2.0",
-  "lint-staged": "^15.2.2",
+  "lint-staged": "^15.2.4",
   rimraf: "^5.0.7",
   "simple-git-hooks": "^2.11.1",
   svelte: "^4.2.17",

package/dist/cli.js

@@ -17,7 +17,7 @@ import parse from "parse-gitignore";
 import c from "picocolors";
 
 // package.json
-var version = "2.5.0-beta.2";
+var version = "2.5.1";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
   "@eslint-react/eslint-plugin": "^1.5.12",
@@ -28,17 +28,18 @@ var devDependencies = {
   "@types/node": "^20.12.12",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.60.2",
+  "@unocss/eslint-plugin": "^0.60.3",
   bumpp: "^9.4.1",
   eslint: "^9.3.0",
   "eslint-plugin-react": "^7.34.1",
   "eslint-plugin-react-hooks": "^4.6.2",
   "eslint-plugin-react-refresh": "^0.4.7",
   "eslint-plugin-svelte": "2.39.0",
+  "eslint-plugin-tailwindcss": "^3.16.0",
   execa: "^9.1.0",
   "fast-glob": "^3.3.2",
   "fs-extra": "^11.2.0",
-  "lint-staged": "^15.2.2",
+  "lint-staged": "^15.2.4",
   rimraf: "^5.0.7",
   "simple-git-hooks": "^2.11.1",
   svelte: "^4.2.17",

package/dist/index.cjs

@@ -76,6 +76,8 @@ async function comments() {
 // src/constants/glob.ts
 var GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
 var GLOB_SRC = "**/*.?([cm])[jt]s?(x)";
+var GLOB_JS = "**/*.?([cm])js";
+var GLOB_JSX = "**/*.?([cm])jsx";
 var GLOB_TS = "**/*.?([cm])ts";
 var GLOB_TSX = "**/*.?([cm])tsx";
 var GLOB_VUE = "**/*.vue";
@@ -1454,8 +1456,20 @@ async function perfectionist() {
 }
 
 // src/configs/react.ts
+var import_local_pkg3 = require("local-pkg");
+
+// src/env.ts
+var import_node_process3 = __toESM(require("process"), 1);
 var import_local_pkg2 = require("local-pkg");
-var ReactRefreshAllowConstantExportPackages = ["vite"];
+var isInEditor = !!((import_node_process3.default.env.VSCODE_PID || import_node_process3.default.env.VSCODE_CWD || import_node_process3.default.env.JETBRAINS_IDE || import_node_process3.default.env.VIM) && !import_node_process3.default.env.CI);
+var hasTypeScript = (0, import_local_pkg2.isPackageExists)("typescript");
+var VueJsPackages = [
+  "vue",
+  "nuxt",
+  "vitepress",
+  "@slidev/cli"
+];
+var hasVue = hasPackages(VueJsPackages);
 var RemixPackages = [
   "@remix-run/node",
   "@remix-run/react",
@@ -1463,8 +1477,16 @@ var RemixPackages = [
   "@remix-run/dev"
 ];
 var NextJsPackages = ["next"];
+var isUsingRemix = hasPackages(RemixPackages);
+var isUsingNext = hasPackages(NextJsPackages);
+function hasPackages(packages) {
+  return packages.some((name) => (0, import_local_pkg2.isPackageExists)(name));
+}
+
+// src/configs/react.ts
+var ReactRefreshAllowConstantExportPackages = ["vite"];
 async function react(options = {}) {
-  const { files = [GLOB_TS, GLOB_TSX], overrides = {} } = options;
+  const { files = [GLOB_JS, GLOB_JSX, GLOB_TS, GLOB_TSX], overrides = {} } = options;
   await ensurePackages([
     "@eslint-react/eslint-plugin",
     "eslint-plugin-react-hooks",
@@ -1479,10 +1501,8 @@ async function react(options = {}) {
     interopDefault(import("@typescript-eslint/parser"))
   ]);
   const isAllowConstantExport = ReactRefreshAllowConstantExportPackages.some(
-    (i) => (0, import_local_pkg2.isPackageExists)(i)
+    (i) => (0, import_local_pkg3.isPackageExists)(i)
   );
-  const isUsingRemix = RemixPackages.some((i) => (0, import_local_pkg2.isPackageExists)(i));
-  const isUsingNext = NextJsPackages.some((i) => (0, import_local_pkg2.isPackageExists)(i));
   const plugins = pluginReact.configs.all.plugins;
   return [
     {
@@ -1816,6 +1836,7 @@ async function svelte(options = {}) {
 // src/configs/tailwindcss.ts
 async function tailwindcss(options = {}) {
   const { overrides } = options;
+  await ensurePackages(["eslint-plugin-tailwindcss"]);
   const pluginTailwindcss = await interopDefault(
     import("eslint-plugin-tailwindcss")
   );
@@ -1831,7 +1852,7 @@ async function tailwindcss(options = {}) {
         "tailwindcss/enforces-shorthand": "warn",
         "tailwindcss/migration-from-tailwind-2": "warn",
         "tailwindcss/no-arbitrary-value": "off",
-        "tailwindcss/no-contradicting-classname": "error",
+        "tailwindcss/no-contradicting-classname": "warn",
         "tailwindcss/no-custom-classname": "off",
         "tailwindcss/no-unnecessary-arbitrary-value": "warn",
         ...overrides
@@ -1876,15 +1897,6 @@ async function regexp(options = {}) {
   ];
 }
 
-// src/env.ts
-var import_node_process3 = __toESM(require("process"), 1);
-var import_local_pkg3 = require("local-pkg");
-var isInEditor = !!((import_node_process3.default.env.VSCODE_PID || import_node_process3.default.env.VSCODE_CWD || import_node_process3.default.env.JETBRAINS_IDE || import_node_process3.default.env.VIM) && !import_node_process3.default.env.CI);
-var hasTypeScript = (0, import_local_pkg3.isPackageExists)("typescript");
-var hasVue = (0, import_local_pkg3.isPackageExists)("vue") || (0, import_local_pkg3.isPackageExists)("nuxt") || (0, import_local_pkg3.isPackageExists)("vitepress") || (0, import_local_pkg3.isPackageExists)("@slidev/cli");
-var hasUnocss = (0, import_local_pkg3.isPackageExists)("unocss") || (0, import_local_pkg3.isPackageExists)("@unocss/webpack") || (0, import_local_pkg3.isPackageExists)("@unocss/nuxt");
-var hasTailwindCSS = (0, import_local_pkg3.isPackageExists)("tailwindcss") && !hasUnocss;
-
 // src/index.ts
 var flatConfigProps = [
   "name",
@@ -1922,7 +1934,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     react: enableReact = false,
     regexp: enableRegexp = true,
     svelte: enableSvelte = false,
-    tailwindcss: enableTailwindCSS = hasTailwindCSS,
+    tailwindcss: enableTailwindCSS = false,
     typescript: enableTypeScript = hasTypeScript,
     unocss: enableUnoCSS = false,
     vue: enableVue = hasVue

package/dist/index.d.cts

@@ -12664,6 +12664,8 @@ type TsSortTypeConstituents = []|[{
   
   checkUnions?: boolean
   
+  caseSensitive?: boolean
+  
   groupOrder?: ("conditional" | "function" | "import" | "intersection" | "keyword" | "nullish" | "literal" | "named" | "object" | "operator" | "tuple" | "union")[]
 }]
 // ----- ts/space-before-blocks -----

package/dist/index.d.ts

@@ -12664,6 +12664,8 @@ type TsSortTypeConstituents = []|[{
   
   checkUnions?: boolean
   
+  caseSensitive?: boolean
+  
   groupOrder?: ("conditional" | "function" | "import" | "intersection" | "keyword" | "nullish" | "literal" | "named" | "object" | "operator" | "tuple" | "union")[]
 }]
 // ----- ts/space-before-blocks -----

package/dist/index.js

@@ -31,6 +31,8 @@ async function comments() {
 // src/constants/glob.ts
 var GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
 var GLOB_SRC = "**/*.?([cm])[jt]s?(x)";
+var GLOB_JS = "**/*.?([cm])js";
+var GLOB_JSX = "**/*.?([cm])jsx";
 var GLOB_TS = "**/*.?([cm])ts";
 var GLOB_TSX = "**/*.?([cm])tsx";
 var GLOB_VUE = "**/*.vue";
@@ -1409,8 +1411,20 @@ async function perfectionist() {
 }
 
 // src/configs/react.ts
+import { isPackageExists as isPackageExists3 } from "local-pkg";
+
+// src/env.ts
+import process3 from "node:process";
 import { isPackageExists as isPackageExists2 } from "local-pkg";
-var ReactRefreshAllowConstantExportPackages = ["vite"];
+var isInEditor = !!((process3.env.VSCODE_PID || process3.env.VSCODE_CWD || process3.env.JETBRAINS_IDE || process3.env.VIM) && !process3.env.CI);
+var hasTypeScript = isPackageExists2("typescript");
+var VueJsPackages = [
+  "vue",
+  "nuxt",
+  "vitepress",
+  "@slidev/cli"
+];
+var hasVue = hasPackages(VueJsPackages);
 var RemixPackages = [
   "@remix-run/node",
   "@remix-run/react",
@@ -1418,8 +1432,16 @@ var RemixPackages = [
   "@remix-run/dev"
 ];
 var NextJsPackages = ["next"];
+var isUsingRemix = hasPackages(RemixPackages);
+var isUsingNext = hasPackages(NextJsPackages);
+function hasPackages(packages) {
+  return packages.some((name) => isPackageExists2(name));
+}
+
+// src/configs/react.ts
+var ReactRefreshAllowConstantExportPackages = ["vite"];
 async function react(options = {}) {
-  const { files = [GLOB_TS, GLOB_TSX], overrides = {} } = options;
+  const { files = [GLOB_JS, GLOB_JSX, GLOB_TS, GLOB_TSX], overrides = {} } = options;
   await ensurePackages([
     "@eslint-react/eslint-plugin",
     "eslint-plugin-react-hooks",
@@ -1434,10 +1456,8 @@ async function react(options = {}) {
     interopDefault(import("@typescript-eslint/parser"))
   ]);
   const isAllowConstantExport = ReactRefreshAllowConstantExportPackages.some(
-    (i) => isPackageExists2(i)
+    (i) => isPackageExists3(i)
   );
-  const isUsingRemix = RemixPackages.some((i) => isPackageExists2(i));
-  const isUsingNext = NextJsPackages.some((i) => isPackageExists2(i));
   const plugins = pluginReact.configs.all.plugins;
   return [
     {
@@ -1771,6 +1791,7 @@ async function svelte(options = {}) {
 // src/configs/tailwindcss.ts
 async function tailwindcss(options = {}) {
   const { overrides } = options;
+  await ensurePackages(["eslint-plugin-tailwindcss"]);
   const pluginTailwindcss = await interopDefault(
     import("eslint-plugin-tailwindcss")
   );
@@ -1786,7 +1807,7 @@ async function tailwindcss(options = {}) {
         "tailwindcss/enforces-shorthand": "warn",
         "tailwindcss/migration-from-tailwind-2": "warn",
         "tailwindcss/no-arbitrary-value": "off",
-        "tailwindcss/no-contradicting-classname": "error",
+        "tailwindcss/no-contradicting-classname": "warn",
         "tailwindcss/no-custom-classname": "off",
         "tailwindcss/no-unnecessary-arbitrary-value": "warn",
         ...overrides
@@ -1831,15 +1852,6 @@ async function regexp(options = {}) {
   ];
 }
 
-// src/env.ts
-import process3 from "node:process";
-import { isPackageExists as isPackageExists3 } from "local-pkg";
-var isInEditor = !!((process3.env.VSCODE_PID || process3.env.VSCODE_CWD || process3.env.JETBRAINS_IDE || process3.env.VIM) && !process3.env.CI);
-var hasTypeScript = isPackageExists3("typescript");
-var hasVue = isPackageExists3("vue") || isPackageExists3("nuxt") || isPackageExists3("vitepress") || isPackageExists3("@slidev/cli");
-var hasUnocss = isPackageExists3("unocss") || isPackageExists3("@unocss/webpack") || isPackageExists3("@unocss/nuxt");
-var hasTailwindCSS = isPackageExists3("tailwindcss") && !hasUnocss;
-
 // src/index.ts
 var flatConfigProps = [
   "name",
@@ -1877,7 +1889,7 @@ async function defineConfig(options = {}, ...userConfigs) {
     react: enableReact = false,
     regexp: enableRegexp = true,
     svelte: enableSvelte = false,
-    tailwindcss: enableTailwindCSS = hasTailwindCSS,
+    tailwindcss: enableTailwindCSS = false,
     typescript: enableTypeScript = hasTypeScript,
     unocss: enableUnoCSS = false,
     vue: enableVue = hasVue

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderwyd/eslint-config",
   "type": "module",
-  "version": "2.5.0-beta.2",
+  "version": "2.5.1",
   "description": "Donny's ESLint config",
   "author": "Donny Wang <donny526@outlook.com> (https://github.com/coderwyd/)",
   "license": "MIT",
@@ -41,6 +41,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.4",
     "eslint-plugin-svelte": "^2.34.1",
+    "eslint-plugin-tailwindcss": "^3.16.0",
     "svelte-eslint-parser": "^0.33.1"
   },
   "peerDependenciesMeta": {
@@ -59,6 +60,9 @@
     "eslint-plugin-svelte": {
       "optional": true
     },
+    "eslint-plugin-tailwindcss": {
+      "optional": true
+    },
     "svelte-eslint-parser": {
       "optional": true
     }
@@ -67,8 +71,8 @@
     "@antfu/install-pkg": "^0.3.3",
     "@stylistic/eslint-plugin": "^2.1.0",
     "@toml-tools/parser": "^1.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.9.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
     "eslint-config-flat-gitignore": "^0.1.5",
     "eslint-merge-processors": "^0.1.0",
     "eslint-plugin-antfu": "^2.2.0",
@@ -81,8 +85,7 @@
     "eslint-plugin-n": "^17.7.0",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.10.0",
-    "eslint-plugin-regexp": "^2.5.0",
-    "eslint-plugin-tailwindcss": "^3.15.2",
+    "eslint-plugin-regexp": "^2.6.0",
     "eslint-plugin-unicorn": "^53.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
     "eslint-plugin-vitest": "^0.5.4",
@@ -109,17 +112,18 @@
     "@types/node": "^20.12.12",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.32",
-    "@unocss/eslint-plugin": "^0.60.2",
+    "@unocss/eslint-plugin": "^0.60.3",
     "bumpp": "^9.4.1",
     "eslint": "^9.3.0",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.4.7",
     "eslint-plugin-svelte": "2.39.0",
+    "eslint-plugin-tailwindcss": "^3.16.0",
     "execa": "^9.1.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.4",
     "rimraf": "^5.0.7",
     "simple-git-hooks": "^2.11.1",
     "svelte": "^4.2.17",