@shayanthenerd/eslint-config 0.28.1 → 0.28.3

package/README.md

@@ -80,7 +80,7 @@ Legend:
    {
      "scripts": {
        "lint:inspect": "npx @eslint/config-inspector",
-       "lint": "eslint --fix --cache --cache-location='node_modules/.cache/.eslintcache'"
+       "lint": "eslint --fix --max-warnings=0 --cache --cache-location='node_modules/.cache/.eslintcache'"
      }
    }
    ```
@@ -363,7 +363,7 @@ _package.json_:
 {
   "scripts": {
     "format": "prettier --write . --cache",
-    "lint": "eslint --fix --cache --cache-location='node_modules/.cache/.eslintcache'"
+    "lint": "eslint --fix --max-warnings=0 --cache --cache-location='node_modules/.cache/.eslintcache'"
   }
 }
 ```
@@ -427,7 +427,7 @@ _.vscode/settings.json_:
     packageDir?: string,
     tsConfig?: false | {
       filename?: string,
-      rootDir: string,
+      rootDir?: string,
     },
 
     project?: {

package/dist/configs/importX.mjs

@@ -18,7 +18,7 @@ function getImportXConfig(options) {
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),
 		plugins: { "import-x": eslintPluginImportX },
-		settings: isEnabled(typescript) ? eslintPluginImportX.flatConfigs.typescript.settings : void 0,
+		settings: isEnabled(typescript) ? eslintPluginImportX.flatConfigs.typescript.settings : {},
 		rules: getImportXRules(options)
 	}, overrides);
 }

package/dist/configs/node.mjs

@@ -10,7 +10,7 @@ import path from "node:path";
 function getNodeConfig(options) {
 	const { tsConfig, configs: { vue, node, astro } } = options;
 	const { overrides } = isEnabled(node) ? node : defaultOptions.configs.node;
-	const tsconfig = tsConfig ? path.resolve(tsConfig.rootDir, tsConfig.filename) : void 0;
+	const tsconfigPath = tsConfig ? path.resolve(tsConfig.rootDir, tsConfig.filename) : void 0;
 	return mergeConfigs({
 		name: "shayanthenerd/node",
 		files: [
@@ -20,7 +20,7 @@ function getNodeConfig(options) {
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),
 		plugins: { n: eslintPluginNode },
-		settings: { n: { tsconfigPath: tsconfig } },
+		settings: { n: tsconfigPath ? { tsconfigPath } : void 0 },
 		rules: getNodeRules(options)
 	}, overrides);
 }

package/dist/configs/tailwind.mjs

@@ -45,7 +45,7 @@ const nuxtUiAppConfigUiFields = {
 function getTailwindConfig(options) {
 	const { tsConfig, configs: { vue, nuxt, html, astro, tailwind } } = options;
 	const { cwd, config, overrides, entryPoint } = isEnabled(tailwind) ? tailwind : defaultOptions.configs.tailwind;
-	const tsconfig = tsConfig ? path.resolve(tsConfig.rootDir, tsConfig.filename) : void 0;
+	const tsconfigPath = tsConfig ? path.resolve(tsConfig.rootDir, tsConfig.filename) : void 0;
 	const isNuxtUiEnabled = isEnabled(nuxt) && isEnabled(nuxt.ui);
 	const selectors = [
 		...getDefaultSelectors(),
@@ -66,10 +66,10 @@ function getTailwindConfig(options) {
 		plugins: { "better-tailwindcss": eslintPluginTailwind },
 		settings: { "better-tailwindcss": {
 			cwd,
-			tsconfig,
 			selectors,
 			entryPoint,
 			tailwindConfig: config,
+			tsconfig: tsconfigPath,
 			detectComponentClasses: true
 		} },
 		rules: getTailwindRules(options)

package/dist/helpers/options/defaultOptions.mjs

@@ -4,6 +4,7 @@ const defaultOptions = {
 	env: "browser",
 	gitignore: ".gitignore",
 	packageDir: ".",
+	tsConfig: false,
 	project: {
 		basePath: ".",
 		globals: {

package/dist/helpers/options/enableDetectedConfigs.mjs

@@ -1,4 +1,5 @@
 import { isEnabled } from "../../utils/isEnabled.mjs";
+import { defaultOptions } from "./defaultOptions.mjs";
 import { isPackageDetected, logDetectedPackages } from "../isPackageDetected.mjs";
 //#region src/helpers/options/enableDetectedConfigs.ts
 function enableDetectedConfigs(options) {
@@ -58,11 +59,20 @@ function enableDetectedConfigs(options) {
 	options.configs.test.cypress ??= autoDetectedPackages.cypress;
 	options.configs.test.storybook ??= autoDetectedPackages.storybook;
 	options.configs.test.playwright ??= autoDetectedPackages.playwright;
-	options.tsConfig ??= options.configs.typescript ? {
-		rootDir: ".",
-		filename: "tsconfig.json"
-	} : void 0;
-	if (options.configs.vue && options.configs.typescript) {
+	const isTypeScriptEnabled = isEnabled(options.configs.typescript);
+	if (isTypeScriptEnabled) {
+		const defaultTsConfigRootDir = options.packageDir ?? defaultOptions.packageDir;
+		const defaultTsConfigFilename = "tsconfig.json";
+		if (options.tsConfig === void 0) options.tsConfig = {
+			rootDir: defaultTsConfigRootDir,
+			filename: defaultTsConfigFilename
+		};
+		else if (options.tsConfig !== false) {
+			options.tsConfig.rootDir ??= defaultTsConfigRootDir;
+			options.tsConfig.filename ??= defaultTsConfigFilename;
+		}
+	}
+	if (isTypeScriptEnabled && options.configs.vue) {
 		options.configs.vue = options.configs.vue === true ? {} : options.configs.vue;
 		options.configs.vue.blockLang = { script: "ts" };
 	}

package/dist/index.mjs

@@ -82,9 +82,9 @@ function defineConfig(...args) {
 	return defineConfig$1([
 		{
 			name: "shayanthenerd/project",
-			rules,
 			linterOptions,
-			...Object.keys(settings).length > 0 && { settings }
+			settings,
+			rules
 		},
 		globalIgnores(ignorePatterns, "shayanthenerd/ignores"),
 		getBaseConfig(mergedOptions),

package/dist/rules/perfectionist.mjs

@@ -114,7 +114,7 @@ function getPerfectionistRules(options) {
 		"perfectionist/sort-named-exports": "warn",
 		"perfectionist/sort-imports": ["warn", {
 			environment: env === "bun" ? "bun" : "node",
-			tsconfig: tsConfig || void 0,
+			tsconfig: tsConfig || { rootDir: "" },
 			sortSideEffects: true,
 			fallbackSort: {
 				order: "asc",

package/dist/rules/tailwind.mjs

@@ -45,11 +45,12 @@ function getTailwindRules(options) {
 		}],
 		"better-tailwindcss/enforce-consistent-variant-order": "warn",
 		"better-tailwindcss/enforce-logical-properties": ["warn", { ignore: nonLogicalTailwindUtilityPatterns }],
-		"better-tailwindcss/no-duplicate-classes": "error",
+		"better-tailwindcss/no-concatenated-classes": "error",
+		"better-tailwindcss/no-conflicting-classes": "error",
 		"better-tailwindcss/no-deprecated-classes": "error",
-		"better-tailwindcss/no-unnecessary-whitespace": "warn",
+		"better-tailwindcss/no-duplicate-classes": "error",
 		"better-tailwindcss/no-unknown-classes": [isTailwindV4 ? "warn" : "off", { ignore: userIgnoredUnknownClasses }],
-		"better-tailwindcss/no-conflicting-classes": "error"
+		"better-tailwindcss/no-unnecessary-whitespace": "warn"
 	};
 }
 //#endregion

package/dist/rules/vue.mjs

@@ -56,11 +56,12 @@ function getVueRules(options) {
 		"vuejs-accessibility/tabindex-no-positive": "error"
 	};
 	const vueAndNuxtRules = {
+		"@typescript-eslint/no-useless-default-assignment": "off",
 		"vue/jsx-uses-vars": "error",
 		"vue/comment-directive": ["error", { reportUnusedDisableDirectives: true }],
 		"vue/multi-word-component-names": "error",
 		"vue/no-arrow-functions-in-watch": "warn",
-		"vue/no-async-in-computed-properties": ["error", { ignoredObjectNames: ["z"] }],
+		"vue/no-async-in-computed-properties": ["error", { ignoredObjectNames: ["z", "zod"] }],
 		"vue/no-child-content": "error",
 		"vue/no-computed-properties-in-data": "error",
 		"vue/no-deprecated-data-object-declaration": "error",
@@ -237,11 +238,7 @@ function getVueRules(options) {
 			multiline: true,
 			consistent: true
 		}],
-		"vue/object-curly-spacing": [
-			"warn",
-			"always",
-			{ emptyObjects: "never" }
-		],
+		"vue/object-curly-spacing": ["warn", "always"],
 		"vue/object-property-newline": ["warn", { allowAllPropertiesOnSameLine: true }],
 		"vue/object-shorthand": "warn",
 		"vue/operator-linebreak": [

package/dist/types/eslint-schema.d.mts

@@ -1873,6 +1873,7 @@ interface ESLintSchema {
   /**
    * Disallow specified modules when loaded by `import`
    * @see https://typescript-eslint.io/rules/no-restricted-imports
+   * @deprecated
    */
   '@typescript-eslint/no-restricted-imports'?: Linter.RuleEntry<TypescriptEslintNoRestrictedImports>;
   /**
@@ -2626,6 +2627,11 @@ interface ESLintSchema {
    * @see https://github.com/schoero/eslint-plugin-better-tailwindcss/blob/main/docs/rules/enforce-shorthand-classes.md
    */
   'better-tailwindcss/enforce-shorthand-classes'?: Linter.RuleEntry<BetterTailwindcssEnforceShorthandClasses>;
+  /**
+   * Disallow concatenated classes in Tailwind CSS class strings.
+   * @see https://github.com/schoero/eslint-plugin-better-tailwindcss/blob/main/docs/rules/no-concatenated-classes.md
+   */
+  'better-tailwindcss/no-concatenated-classes'?: Linter.RuleEntry<BetterTailwindcssNoConcatenatedClasses>;
   /**
    * Disallow classes that produce conflicting styles.
    * @see https://github.com/schoero/eslint-plugin-better-tailwindcss/blob/main/docs/rules/no-conflicting-classes.md
@@ -13502,6 +13508,7 @@ type BetterTailwindcssEnforceConsistentLineWrapping = [] | [{
   printWidth?: number;
   strictness?: ("strict" | "loose");
   tabWidth?: number;
+  vueConvertToBinding?: boolean;
 }];
 // ----- better-tailwindcss/enforce-consistent-variable-syntax -----
 type BetterTailwindcssEnforceConsistentVariableSyntax = [] | [{
@@ -14285,6 +14292,201 @@ type BetterTailwindcssEnforceShorthandClasses = [] | [{
   rootFontSize?: number;
   cwd?: string;
 }];
+// ----- better-tailwindcss/no-concatenated-classes -----
+type BetterTailwindcssNoConcatenatedClasses = [] | [{
+  selectors?: ({
+    kind: "attribute";
+    match?: ({
+      type: "strings";
+    } | {
+      path?: string;
+      type: "objectKeys";
+    } | {
+      path?: string;
+      type: "objectValues";
+    } | {
+      match: ({
+        type: "strings";
+      } | {
+        path?: string;
+        type: "objectKeys";
+      } | {
+        path?: string;
+        type: "objectValues";
+      })[];
+      type: "anonymousFunctionReturn";
+    })[];
+    name: string;
+  } | ({
+    callTarget?: ("all" | "first" | "last" | number);
+    kind: "callee";
+    match?: ({
+      type: "strings";
+    } | {
+      path?: string;
+      type: "objectKeys";
+    } | {
+      path?: string;
+      type: "objectValues";
+    } | {
+      match: ({
+        type: "strings";
+      } | {
+        path?: string;
+        type: "objectKeys";
+      } | {
+        path?: string;
+        type: "objectValues";
+      })[];
+      type: "anonymousFunctionReturn";
+    })[];
+    name: string;
+    path?: string;
+    targetArgument?: ("all" | "first" | "last" | number);
+    targetCall?: ("all" | "first" | "last" | number);
+  } | {
+    callTarget?: ("all" | "first" | "last" | number);
+    kind: "callee";
+    match?: ({
+      type: "strings";
+    } | {
+      path?: string;
+      type: "objectKeys";
+    } | {
+      path?: string;
+      type: "objectValues";
+    } | {
+      match: ({
+        type: "strings";
+      } | {
+        path?: string;
+        type: "objectKeys";
+      } | {
+        path?: string;
+        type: "objectValues";
+      })[];
+      type: "anonymousFunctionReturn";
+    })[];
+    name?: string;
+    path: string;
+    targetArgument?: ("all" | "first" | "last" | number);
+    targetCall?: ("all" | "first" | "last" | number);
+  }) | ({
+    kind: "tag";
+    match?: ({
+      type: "strings";
+    } | {
+      path?: string;
+      type: "objectKeys";
+    } | {
+      path?: string;
+      type: "objectValues";
+    } | {
+      match: ({
+        type: "strings";
+      } | {
+        path?: string;
+        type: "objectKeys";
+      } | {
+        path?: string;
+        type: "objectValues";
+      })[];
+      type: "anonymousFunctionReturn";
+    })[];
+    name: string;
+    path?: string;
+  } | {
+    kind: "tag";
+    match?: ({
+      type: "strings";
+    } | {
+      path?: string;
+      type: "objectKeys";
+    } | {
+      path?: string;
+      type: "objectValues";
+    } | {
+      match: ({
+        type: "strings";
+      } | {
+        path?: string;
+        type: "objectKeys";
+      } | {
+        path?: string;
+        type: "objectValues";
+      })[];
+      type: "anonymousFunctionReturn";
+    })[];
+    name?: string;
+    path: string;
+  }) | {
+    kind: "variable";
+    match?: ({
+      type: "strings";
+    } | {
+      path?: string;
+      type: "objectKeys";
+    } | {
+      path?: string;
+      type: "objectValues";
+    } | {
+      match: ({
+        type: "strings";
+      } | {
+        path?: string;
+        type: "objectKeys";
+      } | {
+        path?: string;
+        type: "objectValues";
+      })[];
+      type: "anonymousFunctionReturn";
+    })[];
+    name: string;
+  })[];
+  callees?: ([string, ({
+    match: "strings";
+  } | {
+    match: "objectKeys";
+    pathPattern?: string;
+  } | {
+    match: "objectValues";
+    pathPattern?: string;
+  })[]] | string)[];
+  attributes?: (string | [string, ({
+    match: "strings";
+  } | {
+    match: "objectKeys";
+    pathPattern?: string;
+  } | {
+    match: "objectValues";
+    pathPattern?: string;
+  })[]])[];
+  variables?: ([string, ({
+    match: "strings";
+  } | {
+    match: "objectKeys";
+    pathPattern?: string;
+  } | {
+    match: "objectValues";
+    pathPattern?: string;
+  })[]] | string)[];
+  tags?: ([string, ({
+    match: "strings";
+  } | {
+    match: "objectKeys";
+    pathPattern?: string;
+  } | {
+    match: "objectValues";
+    pathPattern?: string;
+  })[]] | string)[];
+  entryPoint?: string;
+  messageStyle?: ("visual" | "compact" | "raw");
+  tailwindConfig?: string;
+  tsconfig?: string;
+  detectComponentClasses?: boolean;
+  rootFontSize?: number;
+  cwd?: string;
+}];
 // ----- better-tailwindcss/no-conflicting-classes -----
 type BetterTailwindcssNoConflictingClasses = [] | [{
   selectors?: ({
@@ -22970,6 +23172,7 @@ type VueSortKeys = [] | [("asc" | "desc")] | [("asc" | "desc"), {
   ignoreGrandchildrenOf?: unknown[];
   minKeys?: number;
   natural?: boolean;
+  allowLineSeparatedGroups?: boolean;
 }];
 // ----- vue/space-in-parens -----
 type VueSpaceInParens = [] | [("always" | "never")] | [("always" | "never"), {

package/dist/types/index.d.mts

@@ -81,25 +81,25 @@ interface Options {
    * - [better-tailwindcss: `tsconfig` option](https://github.com/schoero/eslint-plugin-better-tailwindcss/blob/main/docs/settings/settings.md#tsconfig)
    * - [perfectionist/sort-imports: `tsconfig` option](https://perfectionist.dev/rules/sort-imports#tsconfig)
    *
-   * @default undefined // `{ rootDir: '.', filename: 'tsconfig.json' }` if TypeScript integration is enabled
+   * @default false // `{ rootDir: options.packageDir ?? '.', filename: 'tsconfig.json' }` if TypeScript integration is enabled
    */
   tsConfig?: false | {
     /**
-     * The name of the root TypeScript config file.
+     * The directory of the root TypeScript config file.
      *
      * It will fall back to the default value if set to an empty string (`''`).
      *
-     * @default 'tsconfig.json'
+     * @default options.packageDir ?? '.'
      */
-    filename?: string;
+    rootDir?: string;
     /**
-     * The directory of the root TypeScript config file.
+     * The name of the root TypeScript config file.
      *
      * It will fall back to the default value if set to an empty string (`''`).
      *
-     * @default '.'
+     * @default 'tsconfig.json'
      */
-    rootDir: string;
+    filename?: string;
   };
   /*** Project ***/
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shayanthenerd/eslint-config",
-  "version": "0.28.1",
+  "version": "0.28.3",
   "description": "A modern, flexible ESLint configuration for enforcing best practices and maintaining a consistent coding style",
   "keywords": [
     "eslint",
@@ -49,7 +49,7 @@
     "{**/*.ts,package.json}": "pnpm lint"
   },
   "dependencies": {
-    "@eslint-react/eslint-plugin": "5.17.1",
+    "@eslint-react/eslint-plugin": "5.17.3",
     "@eslint/css": "1.4.0",
     "@eslint/markdown": "8.0.3",
     "@html-eslint/eslint-plugin": "0.64.0",
@@ -63,7 +63,7 @@
     "eslint-import-resolver-typescript": "4.4.5",
     "eslint-plugin-astro": "3.0.1",
     "eslint-plugin-baseline-js": "0.7.0",
-    "eslint-plugin-better-tailwindcss": "4.6.1",
+    "eslint-plugin-better-tailwindcss": "4.7.0",
     "eslint-plugin-cypress": "6.4.3",
     "eslint-plugin-import-x": "4.17.1",
     "eslint-plugin-jsx-a11y": "6.10.2",
@@ -72,16 +72,16 @@
     "eslint-plugin-perfectionist": "5.10.0",
     "eslint-plugin-playwright": "2.10.5",
     "eslint-plugin-promise": "7.3.0",
-    "eslint-plugin-storybook": "10.5.2",
+    "eslint-plugin-storybook": "10.5.3",
     "eslint-plugin-unicorn": "72.0.0",
-    "eslint-plugin-vue": "10.9.2",
+    "eslint-plugin-vue": "10.10.0",
     "eslint-plugin-vuejs-accessibility": "2.5.0",
     "eslint-plugin-zod": "4.8.0",
     "eslint-plugin-zod-mini": "1.5.0",
     "globals": "17.7.0",
     "local-pkg": "1.2.1",
     "tailwind-csstree": "0.3.3",
-    "typescript-eslint": "8.64.0"
+    "typescript-eslint": "8.65.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
@@ -92,12 +92,12 @@
     "eslint": "10.7.0",
     "eslint-typegen": "2.3.1",
     "nano-staged": "1.0.2",
-    "prettier": "3.9.5",
+    "prettier": "3.9.6",
     "publint": "0.3.21",
     "serve": "14.2.6",
     "simple-git-hooks": "2.13.1",
     "ts-morph": "28.0.0",
-    "tsdown": "0.22.9",
+    "tsdown": "0.22.12",
     "typescript": "6.0.3",
     "unplugin-unused": "0.5.7"
   },
@@ -110,7 +110,7 @@
   "devEngines": {
     "packageManager": {
       "name": "pnpm",
-      "version": "11.13.1",
+      "version": "11.15.1",
       "onFail": "warn"
     },
     "runtime": {