@tommy-mitchell/eslint-config-xo 1.0.0 → 2.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tommy-mitchell/eslint-config-xo",
-	"version": "1.0.0",
+	"version": "2.0.0-beta.1",
 	"description": "Personal config for XO.",
 	"keywords": [
 		"nodejs",
@@ -28,31 +28,32 @@
 		"test": "ava"
 	},
 	"dependencies": {
+		"@eslint-react/eslint-plugin": "^3.0.0",
 		"@next/eslint-plugin-next": "^16.0.5",
-		"eslint-plugin-better-tailwindcss": "^3.7.11",
+		"eslint-plugin-better-tailwindcss": "^4.3.2",
 		"eslint-plugin-jsx-a11y": "^6.10.2",
-		"eslint-plugin-perfectionist": "^4.15.1",
-		"eslint-plugin-react-refresh": "^0.4.24",
+		"eslint-plugin-perfectionist": "^5.7.0",
+		"eslint-plugin-react-refresh": "^0.5.2",
 		"eslint-plugin-simple-import-sort": "^12.1.1",
 		"eslint-plugin-sort-react-dependency-arrays": "^1.0.0"
 	},
 	"devDependencies": {
 		"@stylistic/eslint-plugin": "^5.6.1",
 		"@tommy-mitchell/dprint-config": "0.6.0",
-		"ava": "^6.4.1",
+		"ava": "^7.0.0",
 		"dprint": "0.x",
-		"eslint-plugin-react": "^7.37.5",
 		"execa": "^9.6.0",
 		"react": "^19.2.0",
 		"tailwindcss": "^4.1.17",
 		"tempy": "^3.1.0",
-		"xo": "~1.2.3"
+		"typescript": "6.0.2",
+		"xo": "~2.0.2"
 	},
 	"peerDependencies": {
 		"dprint": "0.x",
 		"react": "19.x",
 		"tailwindcss": "4.x",
-		"xo": "1.x"
+		"xo": "2.x"
 	},
 	"peerDependenciesMeta": {
 		"dprint": {
@@ -66,7 +67,7 @@
 		}
 	},
 	"engines": {
-		"node": ">=20.17"
+		"node": ">=22"
 	},
 	"ava": {
 		"timeout": "30s"

package/readme.md

@@ -16,6 +16,10 @@ npm install --save-dev @tommy-mitchell/eslint-config-xo xo
 yarn add --dev @tommy-mitchell/eslint-config-xo xo
 ```
 
+```sh
+pnpm add --save-dev @tommy-mitchell/eslint-config-xo xo
+```
+
 </p>
 </details>
 
@@ -31,6 +35,10 @@ npm install --save-dev @tommy-mitchell/eslint-config-xo xo @tommy-mitchell/dprin
 yarn add --dev @tommy-mitchell/eslint-config-xo xo @tommy-mitchell/dprint-config dprint
 ```
 
+```sh
+pnpm add --save-dev @tommy-mitchell/eslint-config-xo xo @tommy-mitchell/dprint-config dprint
+```
+
 </p>
 </details>
 
@@ -50,9 +58,9 @@ import * as configs from "@tommy-mitchell/eslint-config-xo";
 /** @type {import('xo').FlatXoConfig} */
 export default [
 	...configs.xo,
-	...configs.react, // If using React
+	...configs.react({ version: "19" }), // If using React
 	...configs.next, // If using Next.js
-	...configs.tailwind, // If using Tailwind CSS
+	...configs.tailwind({ config: "src/tailwind.css" }), // If using TailwindCSS
 	...configs.dprint, // If using dprint (must be last to override stylistic rules)
 	// Plus any overrides
 ]

package/src/dprint.js

@@ -5,12 +5,11 @@ const allowedReactRules = new Set([
 	"jsx-newline",
 	"jsx-pascal-case",
 	"jsx-self-closing-comp",
-	"jsx-sort-props",
 ]);
 
 const disabledLegacyRules = Object.fromEntries(
 	Object.entries(stylistic.configs["disable-legacy"].rules)
-		.filter(([rule]) => !allowedReactRules.has(rule.replace("react/", ""))),
+		.filter(([rule]) => !allowedReactRules.has(rule.replace("@stylistic/", ""))),
 );
 
 const allowedRules = new Set([

package/src/index.d.ts

@@ -3,5 +3,5 @@ import type { FlatXoConfig } from "xo";
 export declare const dprint: FlatXoConfig;
 export declare const next: FlatXoConfig;
 export declare const react: FlatXoConfig;
-export declare const tailwind: FlatXoConfig;
+export declare const tailwind: ({ config }: { config: string; }) => FlatXoConfig;
 export declare const xo: FlatXoConfig;

package/src/next.js

@@ -1,5 +1,5 @@
 import next from "@next/eslint-plugin-next";
-import reactRefresh from "eslint-plugin-react-refresh";
+import { reactRefresh } from "eslint-plugin-react-refresh";
 
 /** @type {import('xo').FlatXoConfig} */
 export default [

package/src/react.js

@@ -1,28 +1,29 @@
+import eslintReact from "@eslint-react/eslint-plugin";
 import jsxA11y from "eslint-plugin-jsx-a11y";
-import react from "eslint-plugin-react";
-import reactRefresh from "eslint-plugin-react-refresh";
+import { reactRefresh } from "eslint-plugin-react-refresh";
 import sortReactDependencyArrays from "eslint-plugin-sort-react-dependency-arrays";
 
 const configs = [
-	react.configs.flat["jsx-runtime"],
+	eslintReact.configs["strict-type-checked"],
 	jsxA11y.flatConfigs.recommended,
 ];
 
 /** @type {import('xo').FlatXoConfig} */
-export default [{ react: true }, ...configs, {
+export default [...configs, {
 	plugins: {
-		"react-refresh": reactRefresh,
+		"react-refresh": reactRefresh.plugin,
 		"sort-react-dependency-arrays": sortReactDependencyArrays,
 	},
+	// TODO: boolean-prop-naming
 	rules: {
-		"react-refresh/only-export-components": ["warn", { allowConstantExport: true }],
-		"react/jsx-sort-props": ["error", {
-			callbacksLast: true,
-			noSortAlphabetically: false,
-			reservedFirst: true,
-			shorthandFirst: true,
+		"perfectionist/sort-jsx-props": ["error", {
+			customGroups: [
+				{ elementNamePattern: "^on[A-Z].*", groupName: "callback" },
+				{ elementNamePattern: "^(children|dangerouslySetInnerHTML|key|ref)$", groupName: "reserved" },
+			],
+			groups: ["reserved", "shorthand-prop", "unknown", "callback"],
 		}],
-		"react/no-array-index-key": "warn",
+		"react-refresh/only-export-components": ["warn", { allowConstantExport: true }],
 		"simple-import-sort/imports": ["error", {
 			groups: [[
 				String.raw`^\u0000`,
@@ -53,11 +54,11 @@ export default [{ react: true }, ...configs, {
 	files: "**/*.{ts,cts,mts,tsx}",
 	rules: {
 		"perfectionist/sort-interfaces": ["error", {
-			customGroups: { callback: "^on[A-Z].*" },
+			customGroups: [{ elementNamePattern: "^on[A-Z].*", groupName: "callback" }],
 			groups: ["unknown", "callback"],
 		}],
 		"perfectionist/sort-object-types": ["error", {
-			customGroups: { callback: "^on[A-Z].*" },
+			customGroups: [{ elementNamePattern: "^on[A-Z].*", groupName: "callback" }],
 			groups: ["unknown", "callback"],
 		}],
 	},

package/src/tailwind.js

@@ -1,7 +1,7 @@
 import eslintPluginBetterTailwindcss from "eslint-plugin-better-tailwindcss";
 
-/** @type {import('xo').FlatXoConfig} */
-export default [{
+/** @type {({config}: {config: string}) => import('xo').FlatXoConfig} */
+export default ({ config }) => [{
 	plugins: {
 		"better-tailwindcss": eslintPluginBetterTailwindcss,
 	},
@@ -12,12 +12,11 @@ export default [{
 			preferSingleLine: true,
 			printWidth: 120,
 		}],
-		"better-tailwindcss/enforce-shorthand-classes": "warn",
-		"better-tailwindcss/no-deprecated-classes": "warn",
 	},
 	settings: {
 		"better-tailwindcss": {
 			callees: ["clsx", "cn", "cnx", "cva", "cx", "tv", "twJoin", "twMerge"],
+			entryPoint: config, // v4 config path
 		},
 	},
 }];

package/src/xo.js

@@ -42,7 +42,7 @@ export default [{
 		"@typescript-eslint/no-confusing-void-expression": ["error", { ignoreArrowShorthand: true }],
 		// https://github.com/xojs/eslint-config-xo-typescript/blob/v2.0.0/index.js#L707
 		"@typescript-eslint/prefer-regexp-exec": "off",
-		"perfectionist/sort-enums": ["error", { forceNumericSort: true }],
+		"perfectionist/sort-enums": "error",
 		"perfectionist/sort-heritage-clauses": "error",
 		"perfectionist/sort-interfaces": "error",
 		"perfectionist/sort-intersection-types": "error",