@ncontiero/eslint-config 7.2.0 → 7.3.0-beta.1

package/dist/index.mjs

@@ -153,12 +153,63 @@ function ensurePackages(packages) {
 	if (nonExistingPackages.length === 0) return;
 	throw new Error(`This package(s) are required for this config: ${nonExistingPackages.join(", ")}. Please install them.`);
 }
-async function composer(...items) {
+async function composer({ items, pluginsNameMap }) {
 	let configs = [];
 	const flatResolved = (await Promise.all(items)).flat();
 	configs = [...configs, ...flatResolved];
+	if (pluginsNameMap) configs = renamePluginInConfigs(configs, pluginsNameMap);
 	return configs;
 }
+/**
+* Rename plugin prefixes in a rule object.
+* Accepts a map of prefixes to rename.
+*
+* @example
+* ```ts
+* import { renameRules } from "@ncontiero/eslint-config";
+*
+* export default [
+*   {
+*     rules: renameRules(
+*       {
+*         "@typescript-eslint/indent": "error",
+*       },
+*       { "@typescript-eslint": "ts" },
+*     ),
+*   },
+* ];
+* ```
+*/
+function renameRules(rules, map) {
+	return Object.fromEntries(Object.entries(rules).map(([key, value]) => {
+		for (const [from, to] of Object.entries(map)) if (key.startsWith(`${from}/`)) return [to + key.slice(from.length), value];
+		return [key, value];
+	}));
+}
+/**
+* Rename plugin names a flat configs array
+*
+* @example
+* ```ts
+* import { renamePluginInConfigs } from "@ncontiero/eslint-config";
+* import someConfigs from "./some-configs";
+*
+* export default renamePluginInConfigs(someConfigs, {
+*   "@typescript-eslint": "ts",
+* });
+* ```
+*/
+function renamePluginInConfigs(configs, map) {
+	return configs.map((i) => {
+		const clone = { ...i };
+		if (clone.rules) clone.rules = renameRules(clone.rules, map);
+		if (clone.plugins) clone.plugins = Object.fromEntries(Object.entries(clone.plugins).map(([key, value]) => {
+			if (key in map) return [map[key], value];
+			return [key, value];
+		}));
+		return clone;
+	});
+}
 function toArray(value) {
 	return Array.isArray(value) ? value : [value];
 }
@@ -760,12 +811,11 @@ const ReactRouterPackages = [
 ];
 const NextJsPackages = ["next"];
 async function react(options = {}) {
-	const { files = [GLOB_REACT], overrides = {}, reactQuery, typescript } = options;
+	const { files = [GLOB_REACT], overrides = {}, reactQuery } = options;
 	if (reactQuery) ensurePackages(["@tanstack/eslint-plugin-query"]);
-	const [pluginA11y, pluginReact, pluginReactHooks, pluginReactRefresh] = await Promise.all([
+	const [pluginA11y, pluginReact, pluginReactRefresh] = await Promise.all([
 		interopDefault(import("eslint-plugin-jsx-a11y")),
-		interopDefault(import("eslint-plugin-react")),
-		interopDefault(import("eslint-plugin-react-hooks")),
+		interopDefault(import("@eslint-react/eslint-plugin")),
 		interopDefault(import("eslint-plugin-react-refresh"))
 	]);
 	const isAllowConstantExport = ReactRefreshAllowPackages.some((i) => isPackageExists(i));
@@ -773,15 +823,12 @@ async function react(options = {}) {
 	const isUsingNextJs = NextJsPackages.some((i) => isPackageExists(i));
 	return [
 		{
-			files,
 			name: "ncontiero/react/setup",
 			plugins: {
 				"jsx-a11y": pluginA11y,
 				react: pluginReact,
-				"react-hooks": pluginReactHooks,
 				"react-refresh": pluginReactRefresh
-			},
-			settings: { react: { version: "detect" } }
+			}
 		},
 		reactQuery ? {
 			...(await interopDefault(import("@tanstack/eslint-plugin-query"))).configs["flat/recommended"][0],
@@ -789,149 +836,13 @@ async function react(options = {}) {
 		} : {},
 		{
 			files,
-			languageOptions: { parserOptions: { ecmaFeatures: { jsx: true } } },
+			languageOptions: {
+				parserOptions: { ecmaFeatures: { jsx: true } },
+				sourceType: "module"
+			},
 			name: "ncontiero/react/rules",
 			rules: {
-				"react-hooks/component-hook-factories": "warn",
-				"react-hooks/error-boundaries": "warn",
-				"react-hooks/exhaustive-deps": "warn",
-				"react-hooks/globals": "warn",
-				"react-hooks/immutability": "warn",
-				"react-hooks/incompatible-library": "warn",
-				"react-hooks/preserve-manual-memoization": "warn",
-				"react-hooks/purity": "warn",
-				"react-hooks/refs": "warn",
-				"react-hooks/rules-of-hooks": "error",
-				"react-hooks/set-state-in-effect": "warn",
-				"react-hooks/set-state-in-render": "warn",
-				"react-hooks/static-components": "warn",
-				"react-hooks/unsupported-syntax": "warn",
-				"react-hooks/use-memo": "warn",
-				"react-refresh/only-export-components": ["warn", {
-					allowConstantExport: isAllowConstantExport,
-					allowExportNames: [...isUsingNextJs ? [
-						"experimental_ppr",
-						"dynamic",
-						"dynamicParams",
-						"revalidate",
-						"fetchCache",
-						"runtime",
-						"preferredRegion",
-						"maxDuration",
-						"metadata",
-						"generateMetadata",
-						"viewport",
-						"generateViewport",
-						"generateImageMetadata",
-						"generateSitemaps",
-						"generateStaticParams"
-					] : [], ...isUsingReactRouter ? [
-						"meta",
-						"links",
-						"headers",
-						"loader",
-						"action",
-						"clientLoader",
-						"clientAction",
-						"handle",
-						"shouldRevalidate"
-					] : []]
-				}],
-				"react/boolean-prop-naming": ["off", {
-					rule: "^(is|has|are|can|should|did|will)[A-Z]([A-Za-z0-9])+",
-					validateNested: true
-				}],
-				"react/button-has-type": ["error", {
-					button: true,
-					reset: false,
-					submit: true
-				}],
-				"react/display-name": ["error", { ignoreTranspilerName: false }],
-				"react/hook-use-state": ["error"],
-				"react/iframe-missing-sandbox": ["error"],
-				"react/jsx-boolean-value": ["error", "never"],
-				"react/jsx-filename-extension": ["warn", { extensions: [".tsx"] }],
-				"react/jsx-fragments": ["error", "syntax"],
-				"react/jsx-handler-names": ["error", {
-					eventHandlerPrefix: "handle",
-					eventHandlerPropPrefix: "on"
-				}],
-				"react/jsx-key": ["error", {
-					checkFragmentShorthand: true,
-					checkKeyMustBeforeSpread: true,
-					warnOnDuplicates: true
-				}],
-				"react/jsx-no-bind": ["error", { allowArrowFunctions: true }],
-				"react/jsx-no-comment-textnodes": "error",
-				"react/jsx-no-constructed-context-values": "error",
-				"react/jsx-no-duplicate-props": ["error"],
-				"react/jsx-no-leaked-render": ["error"],
-				"react/jsx-no-script-url": ["error", [{
-					name: "Link",
-					props: ["to"]
-				}]],
-				"react/jsx-no-target-blank": ["error", {
-					forms: true,
-					links: true,
-					warnOnSpreadAttributes: true
-				}],
-				"react/jsx-no-undef": "error",
-				"react/jsx-no-useless-fragment": "error",
-				"react/jsx-uses-react": "error",
-				"react/jsx-uses-vars": "error",
-				"react/no-access-state-in-setstate": "error",
-				"react/no-array-index-key": "error",
-				"react/no-arrow-function-lifecycle": "error",
-				"react/no-children-prop": "error",
-				"react/no-danger": "error",
-				"react/no-danger-with-children": "error",
-				"react/no-deprecated": "error",
-				"react/no-did-update-set-state": "error",
-				"react/no-direct-mutation-state": "error",
-				"react/no-find-dom-node": "error",
-				"react/no-invalid-html-attribute": "error",
-				"react/no-is-mounted": "error",
-				"react/no-namespace": "error",
-				"react/no-object-type-as-default-prop": "error",
-				"react/no-redundant-should-component-update": "error",
-				"react/no-render-return-value": "error",
-				"react/no-string-refs": ["error", { noTemplateLiterals: true }],
-				"react/no-this-in-sfc": ["error"],
-				"react/no-typos": ["error"],
-				"react/no-unescaped-entities": "error",
-				"react/no-unknown-property": "error",
-				"react/no-unstable-nested-components": ["error"],
-				"react/no-unused-class-component-methods": ["error"],
-				"react/no-unused-prop-types": ["error", {
-					customValidators: [],
-					skipShapeProps: true
-				}],
-				"react/no-unused-state": ["error"],
-				"react/no-will-update-set-state": ["error"],
-				"react/prefer-es6-class": ["error", "always"],
-				"react/prefer-exact-props": ["error"],
-				"react/prefer-read-only-props": ["error"],
-				"react/prefer-stateless-function": ["error", { ignorePureComponents: true }],
-				"react/prop-types": ["error", {
-					customValidators: [],
-					ignore: [],
-					skipUndeclared: false
-				}],
-				"react/react-in-jsx-scope": "off",
-				"react/require-render-return": "error",
-				"react/self-closing-comp": ["error", {
-					component: true,
-					html: true
-				}],
-				"react/sort-default-props": ["error"],
-				"react/state-in-constructor": ["error", "never"],
-				"react/static-property-placement": ["error", "property assignment"],
-				"react/style-prop-object": ["error", { allow: ["FormattedNumber"] }],
-				"react/void-dom-elements-no-children": ["error"],
-				...typescript ? {
-					"react/jsx-no-undef": "off",
-					"react/prop-types": "off"
-				} : {},
+				...pluginReact.configs.recommended.rules,
 				"jsx-a11y/alt-text": ["warn", {
 					area: [],
 					elements: [
@@ -1058,6 +969,50 @@ async function react(options = {}) {
 				"jsx-a11y/role-supports-aria-props": ["warn"],
 				"jsx-a11y/scope": ["warn"],
 				"jsx-a11y/tabindex-no-positive": ["warn"],
+				"react-refresh/only-export-components": ["warn", {
+					allowConstantExport: isAllowConstantExport,
+					allowExportNames: [...isUsingNextJs ? [
+						"experimental_ppr",
+						"dynamic",
+						"dynamicParams",
+						"revalidate",
+						"fetchCache",
+						"runtime",
+						"preferredRegion",
+						"maxDuration",
+						"metadata",
+						"generateMetadata",
+						"viewport",
+						"generateViewport",
+						"generateImageMetadata",
+						"generateSitemaps",
+						"generateStaticParams"
+					] : [], ...isUsingReactRouter ? [
+						"meta",
+						"links",
+						"headers",
+						"loader",
+						"action",
+						"clientLoader",
+						"clientAction",
+						"handle",
+						"shouldRevalidate"
+					] : []]
+				}],
+				"react/dom-no-missing-button-type": "warn",
+				"react/dom-no-missing-iframe-sandbox": "warn",
+				"react/dom-no-unknown-property": "warn",
+				"react/dom-no-unsafe-target-blank": "warn",
+				"react/globals": "warn",
+				"react/immutability": "warn",
+				"react/jsx-no-useless-fragment": "warn",
+				"react/no-duplicate-key": "warn",
+				"react/no-leaked-conditional-rendering": "error",
+				"react/no-missing-component-display-name": "warn",
+				"react/no-unstable-context-value": "warn",
+				"react/no-unstable-default-props": "error",
+				"react/no-unused-props": "warn",
+				"react/refs": "warn",
 				...overrides
 			}
 		}
@@ -1653,6 +1608,7 @@ const flatConfigProps = [
 	"rules",
 	"settings"
 ];
+const defaultPluginRenaming = { "@eslint-react": "react" };
 function resolveSubOptions(options, key) {
 	return typeof options[key] === "boolean" ? {} : options[key] || {};
 }
@@ -1714,8 +1670,7 @@ function ncontiero(options = {}, ...userConfigs) {
 	if (enableRegexp) configs.push(regexp(typeof enableRegexp === "boolean" ? {} : enableRegexp));
 	if (enableReact) configs.push(react({
 		overrides: getOverrides(options, "react"),
-		reactQuery: !!enableTanStackReactQuery,
-		typescript: !!enableTypescript
+		reactQuery: !!enableTanStackReactQuery
 	}));
 	if (enableNextJs) configs.push(nextJs({ overrides: getOverrides(options, "nextjs") }));
 	if (options.html ?? true) configs.push(html({
@@ -1733,7 +1688,10 @@ function ncontiero(options = {}, ...userConfigs) {
 		return acc;
 	}, {});
 	if (Object.keys(fusedConfig).length > 0) configs.push([fusedConfig]);
-	return composer(...configs, ...userConfigs);
+	return composer({
+		items: [...configs, ...userConfigs],
+		pluginsNameMap: defaultPluginRenaming
+	});
 }
 //#endregion
-export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DIST, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_NODE_MODULES, GLOB_POSTCSS, GLOB_REACT, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_YAML, combine, command, comments, composer, deMorgan, ensurePackages, getOverrides, hasNextJs, hasReact, hasTailwind, hasTanStackReactQuery, hasTypeScript, html, ignores, imports, interopDefault, javascript, jsdoc, jsonc, markdown, ncontiero, nextJs, node, parserPlain, perfectionist, prettier, promise, react, regexp, resolveSubOptions, restrictedSyntaxJs, sortPackageJson, sortPnpmWorkspace, sortTsconfig, tailwindcss, toArray, toml, typescript, unicorn, yml };
+export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DIST, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_NODE_MODULES, GLOB_POSTCSS, GLOB_REACT, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_YAML, combine, command, comments, composer, deMorgan, defaultPluginRenaming, ensurePackages, getOverrides, hasNextJs, hasReact, hasTailwind, hasTanStackReactQuery, hasTypeScript, html, ignores, imports, interopDefault, javascript, jsdoc, jsonc, markdown, ncontiero, nextJs, node, parserPlain, perfectionist, prettier, promise, react, regexp, renamePluginInConfigs, renameRules, resolveSubOptions, restrictedSyntaxJs, sortPackageJson, sortPnpmWorkspace, sortTsconfig, tailwindcss, toArray, toml, typescript, unicorn, yml };

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@ncontiero/eslint-config",
   "type": "module",
-  "version": "7.2.0",
+  "version": "7.3.0-beta.1",
+  "packageManager": "pnpm@10.33.2",
   "description": "Nicolas's ESLint config.",
   "author": {
     "name": "Nicolas Contiero",
@@ -27,6 +28,19 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "pnpm typegen && tsdown",
+    "dev": "pnpm dlx @eslint/config-inspector --config eslint-inspector.config.ts",
+    "build:inspector": "pnpm build && pnpm dlx @eslint/config-inspector build --config eslint-inspector.config.ts",
+    "typegen": "tsx scripts/typegen.ts",
+    "test": "vitest",
+    "lint": "eslint .",
+    "lint:fix": "pnpm lint --fix",
+    "typecheck": "tsc --noEmit",
+    "check": "pnpm lint && pnpm typecheck",
+    "release": "changeset publish",
+    "prepare": "husky"
+  },
   "peerDependencies": {
     "@tanstack/eslint-plugin-query": ">=5.50.0",
     "eslint": ">=9.20.0"
@@ -38,12 +52,13 @@
   },
   "dependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
+    "@eslint-react/eslint-plugin": "^4.2.3",
     "@eslint/markdown": "^8.0.1",
     "@html-eslint/eslint-plugin": "^0.59.0",
     "@html-eslint/parser": "^0.59.0",
     "@next/eslint-plugin-next": "^16.2.4",
-    "@typescript-eslint/eslint-plugin": "^8.58.2",
-    "@typescript-eslint/parser": "^8.58.2",
+    "@typescript-eslint/eslint-plugin": "^8.59.0",
+    "@typescript-eslint/parser": "^8.59.0",
     "eslint-config-flat-gitignore": "^2.3.0",
     "eslint-merge-processors": "^2.0.0",
     "eslint-plugin-antfu": "^3.2.2",
@@ -55,11 +70,9 @@
     "eslint-plugin-jsonc": "^3.1.2",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-n": "^17.24.0",
-    "eslint-plugin-perfectionist": "^5.8.0",
+    "eslint-plugin-perfectionist": "^5.9.0",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-promise": "^7.2.1",
-    "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-react-refresh": "^0.5.2",
     "eslint-plugin-regexp": "^3.1.0",
     "eslint-plugin-toml": "^1.3.1",
@@ -73,24 +86,24 @@
     "yaml-eslint-parser": "^2.0.0"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.30.0",
+    "@changesets/cli": "^2.31.0",
     "@commitlint/cli": "^20.5.0",
     "@commitlint/config-conventional": "^20.5.0",
-    "@ncontiero/changelog-github": "^2.1.2",
+    "@ncontiero/changelog-github": "^2.1.3",
     "@ncontiero/prettier-config": "^1.0.0",
-    "@tanstack/eslint-plugin-query": "^5.99.0",
+    "@tanstack/eslint-plugin-query": "^5.100.1",
     "@types/eslint-plugin-jsx-a11y": "^6.10.1",
     "@types/node": "^25.6.0",
-    "eslint": "^10.2.0",
+    "eslint": "^10.2.1",
     "eslint-typegen": "^2.3.1",
     "execa": "^9.6.1",
     "husky": "^9.1.7",
     "lint-staged": "^16.4.0",
     "tinyglobby": "^0.2.16",
-    "tsdown": "^0.21.9",
+    "tsdown": "^0.21.10",
     "tsx": "^4.21.0",
-    "typescript": "^6.0.2",
-    "vitest": "^4.1.4"
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.5"
   },
   "engines": {
     "node": ">=20.19.0"
@@ -98,17 +111,5 @@
   "lint-staged": {
     "*": "pnpm lint:fix"
   },
-  "prettier": "@ncontiero/prettier-config",
-  "scripts": {
-    "build": "pnpm typegen && tsdown",
-    "dev": "pnpm dlx @eslint/config-inspector --config eslint-inspector.config.ts",
-    "build:inspector": "pnpm build && pnpm dlx @eslint/config-inspector build --config eslint-inspector.config.ts",
-    "typegen": "tsx scripts/typegen.ts",
-    "test": "vitest",
-    "lint": "eslint .",
-    "lint:fix": "pnpm lint --fix",
-    "typecheck": "tsc --noEmit",
-    "check": "pnpm lint && pnpm typecheck",
-    "release": "changeset publish"
-  }
-}
+  "prettier": "@ncontiero/prettier-config"
+}