@rebeccastevens/eslint-config 3.7.1 → 3.8.0

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+# [3.8.0](https://github.com/RebeccaStevens/eslint-config-rebeccastevens/compare/v3.7.1...v3.8.0) (2025-07-03)
+
+
+### Features
+
+* deps update and adjustment for them ([28bf1a7](https://github.com/RebeccaStevens/eslint-config-rebeccastevens/commit/28bf1a7ce2ba2c19e1840058889f4901c6b4e305))
+
 ## [3.7.1](https://github.com/RebeccaStevens/eslint-config-rebeccastevens/compare/v3.7.0...v3.7.1) (2025-03-17)
 
 

package/dist/index.cjs

@@ -6,7 +6,6 @@ var path = require('node:path');
 var localPkg = require('local-pkg');
 var fs = require('node:fs/promises');
 var globals = require('globals');
-var semver = require('semver');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -80,25 +79,23 @@ async function installPackages(packages) {
         mut_installPackagesActionResolver(allPackages);
         mut_installPackagesActionResolver = null;
     }, 100);
-    if (mut_installPackagesAction === null) {
-        mut_installPackagesAction = new Promise((resolve) => {
-            mut_installPackagesActionResolver = resolve;
-        }).then(async (allPackages) => {
-            const allPackagesString = allPackages.join(", ");
-            if (Boolean(process.env["CI"]) || !process.stdout.isTTY) {
-                throw new Error(`Missing packages: ${allPackagesString}`);
-            }
-            const prompt = await import('@clack/prompts');
-            const result = await prompt.confirm({
-                message: allPackages.length === 1
-                    ? `${allPackages[0]} is required for this config. Do you want to install it?`
-                    : `Packages are required for this config: ${allPackagesString}.\nDo you want to install them?`,
-            });
-            if (result !== false) {
-                await import('@antfu/install-pkg').then(({ installPackage }) => installPackage(allPackages, { dev: true }));
-            }
+    mut_installPackagesAction ??= new Promise((resolve) => {
+        mut_installPackagesActionResolver = resolve;
+    }).then(async (allPackages) => {
+        const allPackagesString = allPackages.join(", ");
+        if (Boolean(process.env["CI"]) || !process.stdout.isTTY) {
+            throw new Error(`Missing packages: ${allPackagesString}`);
+        }
+        const prompt = await import('@clack/prompts');
+        const result = await prompt.confirm({
+            message: allPackages.length === 1
+                ? `${allPackages[0]} is required for this config. Do you want to install it?`
+                : `Packages are required for this config: ${allPackagesString}.\nDo you want to install them?`,
         });
-    }
+        if (result !== false) {
+            await import('@antfu/install-pkg').then(({ installPackage }) => installPackage(allPackages, { dev: true }));
+        }
+    });
     return mut_installPackagesAction;
 }
 /* eslint-enable functional/no-loop-statements */
@@ -251,12 +248,7 @@ async function formatters(opts, stylistic) {
         "eslint-formatting-reporter",
         "prettier",
     ]);
-    const prettierPluginTailwindcssPromise = (((options.js !== undefined && options.js) || (options.ts !== undefined && options.ts)) &&
-        options.tailwind !== undefined &&
-        options.tailwind
-        ? loadPackages(["prettier-plugin-tailwindcss"])
-        : [undefined]);
-    const [[pluginFormat, configPrettier, sortPackageJson, formattingReporter], [prettierPluginTailwindcss]] = await Promise.all([packages, prettierPluginTailwindcssPromise]);
+    const [pluginFormat, configPrettier, sortPackageJson, formattingReporter] = await packages;
     const turnOffRulesForPrettier = {
         ...Object.fromEntries(Object.entries(configPrettier.rules ?? {}).filter(([, value]) => value === "off")),
         // curly: "off",
@@ -306,10 +298,7 @@ async function formatters(opts, stylistic) {
                         parser: "babel",
                         ...(options.tailwind !== undefined && options.tailwind
                             ? {
-                                plugins: [
-                                    ...(prettierOptions.plugins ?? []),
-                                    ...(prettierPluginTailwindcss === undefined ? [] : ["prettier-plugin-tailwindcss"]),
-                                ],
+                                plugins: prettierOptions.plugins ?? [],
                             }
                             : {}),
                     },
@@ -331,10 +320,7 @@ async function formatters(opts, stylistic) {
                         parser: "typescript",
                         ...(options.tailwind !== undefined && options.tailwind
                             ? {
-                                plugins: [
-                                    ...(prettierOptions.plugins ?? []),
-                                    ...(prettierPluginTailwindcss === undefined ? [] : ["prettier-plugin-tailwindcss"]),
-                                ],
+                                plugins: prettierOptions.plugins ?? [],
                             }
                             : {}),
                     },
@@ -2480,7 +2466,7 @@ async function stylistic(options) {
                 "style/computed-property-spacing": "error",
                 "style/dot-location": ["error", "property"],
                 "style/eol-last": "error",
-                "style/func-call-spacing": ["error", "never"],
+                "style/function-call-spacing": ["error", "never"],
                 "style/generator-star-spacing": ["error", "after"],
                 "style/indent": typescript
                     ? "off"
@@ -2598,11 +2584,12 @@ async function stylistic(options) {
                     "after",
                     {
                         overrides: {
-                            "=": "none",
+                            // "=": "none",
                             "==": "none",
                             "===": "none",
                             "?": "before",
                             ":": "before",
+                            "|": "before",
                         },
                     },
                 ],
@@ -2665,72 +2652,67 @@ async function stylistic(options) {
 }
 
 async function tailwind(options) {
-    const { overrides, stylistic, tailwindVersion = 4 } = options;
-    const [pluginReadableTailwind] = (await loadPackages(["eslint-plugin-readable-tailwind"]));
-    if (tailwindVersion === 4 &&
-        pluginReadableTailwind.meta?.version !== undefined &&
-        !semver.satisfies(pluginReadableTailwind.meta.version, ">=2.0.0 || >=2.0.0-beta.0")) {
-        console.warn("Please update eslint-plugin-readable-tailwind to version 2.0.0 or higher for tailwindcss v4 support");
-    }
-    const [pluginTailwindCSS] = (await (tailwindVersion === 3 ? loadPackages(["eslint-plugin-tailwindcss"]) : []));
+    const { overrides, stylistic, tailwindVersion, tailwindEntryPoint, tailwindConfig } = options;
+    const [pluginBetterTailwind] = (await loadPackages(["eslint-plugin-better-tailwindcss"]));
     return [
         {
-            name: "rs:tailwind-readable",
+            name: "rs:tailwind-better",
             plugins: {
-                "tailwind-readable": pluginReadableTailwind,
+                "tailwind-better": pluginBetterTailwind,
+            },
+            settings: {
+                "better-tailwindcss": tailwindVersion === 4
+                    ? {
+                        entryPoint: tailwindEntryPoint,
+                    }
+                    : // eslint-disable-next-line ts/no-unnecessary-condition
+                        tailwindVersion === 3
+                            ? {
+                                tailwindConfig,
+                            }
+                            : undefined,
             },
             rules: {
                 ...(stylistic === false
                     ? {}
                     : {
-                        "tailwind-readable/multiline": [
-                            "warn",
+                        "tailwind-better/enforce-consistent-line-wrapping": [
+                            "error",
                             {
+                                classesPerLine: 0,
                                 group: "newLine",
                                 indent: stylistic.indent,
+                                lineBreakStyle: "unix",
+                                preferSingleLine: false,
                                 printWidth: stylistic.printWidth,
                             },
                         ],
-                        "tailwind-readable/no-unnecessary-whitespace": "warn",
+                        "tailwind-better/no-unnecessary-whitespace": "warn",
+                        "tailwind-better/enforce-consistent-class-order": [
+                            "error",
+                            {
+                                order: "improved",
+                            },
+                        ],
+                        "tailwind-better/no-duplicate-classes": "error",
+                        "tailwind-better/enforce-consistent-variable-syntax": [
+                            "error",
+                            {
+                                syntax: "parentheses",
+                            },
+                        ],
+                        "tailwind-better/no-unregistered-classes": [
+                            "off",
+                            {
+                                detectComponentClasses: true,
+                            },
+                        ],
+                        "tailwind-better/no-conflicting-classes": "error",
+                        "tailwind-better/no-restricted-classes": "error",
                     }),
                 ...overrides,
             },
         },
-        ...(tailwindVersion === 3
-            ? [
-                {
-                    name: "rs:tailwind-3",
-                    plugins: {
-                        tailwind: pluginTailwindCSS,
-                    },
-                    rules: {
-                        "tailwind/no-contradicting-classname": "error",
-                        "tailwind/no-arbitrary-value": "off",
-                        "tailwind/no-custom-classname": "off",
-                        ...(stylistic === false
-                            ? {}
-                            : {
-                                "tailwind/classnames-order": "warn",
-                                "tailwind/enforces-negative-arbitrary-values": "warn",
-                                "tailwind/enforces-shorthand": "warn",
-                                "tailwind/no-unnecessary-arbitrary-value": "warn",
-                            }),
-                        ...overrides,
-                    },
-                },
-            ]
-            : []),
-        // ...((tailwindVersion === 4
-        //   ? [
-        //       {
-        //         name: "rs:tailwind-4",
-        //         plugins: {},
-        //         rules: {
-        //           ...overrides,
-        //         },
-        //       },
-        //     ]
-        //   : []) satisfies FlatConfigItem[]),
     ];
 }
 
@@ -2932,6 +2914,7 @@ async function typescript(options) {
                 "ts/no-unnecessary-type-arguments": "error",
                 "ts/no-unnecessary-type-assertion": "error",
                 "ts/no-unnecessary-type-constraint": "error",
+                "ts/no-unnecessary-type-conversion": "error",
                 "ts/no-unsafe-argument": unsafe,
                 "ts/no-unsafe-assignment": unsafe,
                 "ts/no-unsafe-call": unsafe,
@@ -3045,7 +3028,14 @@ async function typescript(options) {
                     },
                 ],
                 "no-throw-literal": "off",
-                "ts/only-throw-error": "error",
+                "ts/only-throw-error": [
+                    "error",
+                    {
+                        allowRethrowing: true,
+                        allowThrowingAny: true,
+                        allowThrowingUnknown: false,
+                    },
+                ],
                 "dot-notation": "off",
                 "ts/dot-notation": ["error", { allowIndexSignaturePropertyAccess: true }],
                 "ts/consistent-indexed-object-style": "error",
@@ -3812,9 +3802,29 @@ async function rsEslint(options, ...userConfigs) {
         }));
     }
     if (tailwindOptions !== false) {
+        const tailwindVersion = (tailwindOptions === true
+            ? undefined
+            : (tailwindOptions.tailwindVersion ??
+                ("tailwindEntryPoint" in tailwindOptions ? 4 : "tailwindConfig" in tailwindOptions ? 3 : undefined))) ?? 3;
+        const tailwindConfig = tailwindVersion === 3
+            ? ((tailwindOptions === true
+                ? undefined
+                : "tailwindConfig" in tailwindOptions
+                    ? tailwindOptions.tailwindConfig
+                    : undefined) ?? "tailwind.config.js")
+            : undefined;
+        const tailwindEntryPoint = tailwindVersion === 4
+            ? tailwindOptions === true
+                ? undefined
+                : "tailwindEntryPoint" in tailwindOptions
+                    ? tailwindOptions.tailwindEntryPoint
+                    : undefined
+            : undefined;
         mut_configs.push(tailwind({
             stylistic: stylisticOptions,
-            tailwindVersion: (tailwindOptions === true ? undefined : tailwindOptions.tailwindVersion) ?? 4,
+            tailwindVersion,
+            tailwindConfig,
+            tailwindEntryPoint,
             overrides: getOverrides(options, "tailwind"),
         }));
     }