eslint-plugin-react-dom 5.20.2 → 5.20.4

package/dist/index.js

@@ -2,7 +2,6 @@ import { DEFAULT_ESLINT_REACT_SETTINGS, RE_JAVASCRIPT_PROTOCOL, getSettingsFromC
 import { ESLintUtils } from "@typescript-eslint/utils";
 import "@eslint-react/eslint";
 import { findAttribute, getAttributeStaticValue, getElementFullType, hasAnyAttribute, hasAttribute, isHostElement, isPaddingWhitespace, resolveAttributeValue } from "@eslint-react/jsx";
-import * as core from "@eslint-react/core";
 import { Check, Extract } from "@eslint-react/ast";
 import { createImportLookup } from "@eslint-react/var";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
@@ -27,7 +26,7 @@ var __exportAll = (all, no_symbols) => {
 //#endregion
 //#region package.json
 var name$2 = "eslint-plugin-react-dom";
-var version = "5.20.2";
+var version = "5.20.4";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -54,11 +53,11 @@ function create$15(context) {
 	if (!context.sourceCode.text.includes("dangerouslySetInnerHTML")) return {};
 	return { JSXElement(node) {
 		if (!hasAttribute(context, node, "dangerouslySetInnerHTML")) return;
-		const childrenPropOrNode = findAttribute(context, node, "children") ?? node.children.find((child) => !isPaddingWhitespace(child));
-		if (childrenPropOrNode == null) return;
+		const fact = findAttribute(context, node, "children") ?? node.children.find((child) => !isPaddingWhitespace(child));
+		if (fact == null) return;
 		context.report({
 			messageId: "default",
-			node: childrenPropOrNode
+			node: fact
 		});
 	} };
 }
@@ -80,18 +79,17 @@ var no_dangerously_set_innerhtml_default = createRule({
 function create$14(context) {
 	if (!context.sourceCode.text.includes("dangerouslySetInnerHTML")) return {};
 	return { JSXElement(node) {
-		const dsihProp = findAttribute(context, node, "dangerouslySetInnerHTML");
-		if (dsihProp == null) return;
+		const prop = findAttribute(context, node, "dangerouslySetInnerHTML");
+		if (prop == null) return;
 		context.report({
 			messageId: "default",
-			node: dsihProp
+			node: prop
 		});
 	} };
 }
 
 //#endregion
 //#region src/rules/no-find-dom-node/no-find-dom-node.ts
-const isFindDOMNodeCall = core.isAPICall("findDOMNode");
 const RULE_NAME$13 = "no-find-dom-node";
 var no_find_dom_node_default = createRule({
 	meta: {
@@ -106,11 +104,26 @@ var no_find_dom_node_default = createRule({
 });
 function create$13(context) {
 	if (!context.sourceCode.text.includes("findDOMNode")) return {};
+	const imports = createImportLookup(context.sourceCode.ast, {
+		builtinNamespaces: ["React", "ReactDOM"],
+		source: "react-dom"
+	});
 	return { CallExpression(node) {
-		if (isFindDOMNodeCall(context, node)) context.report({
-			messageId: "default",
-			node
-		});
+		const callee = Extract.unwrap(node.callee);
+		switch (true) {
+			case Check.isIdentifier(callee) && (callee.name === "findDOMNode" || imports.has(callee.name, "findDOMNode")):
+				context.report({
+					messageId: "default",
+					node
+				});
+				return;
+			case callee.type === AST_NODE_TYPES.MemberExpression && Check.isIdentifier(callee.object) && Extract.getCalleeName(node) === "findDOMNode" && imports.hasNamespace(callee.object.name):
+				context.report({
+					messageId: "default",
+					node
+				});
+				return;
+		}
 	} };
 }
 
@@ -266,14 +279,17 @@ var no_missing_button_type_default = createRule({
 function create$10(context) {
 	const resolver = createJsxElementResolver(context);
 	return { JSXElement(node) {
-		if (resolver.resolve(node).domElementType !== "button") return;
+		const { domElementType } = resolver.resolve(node);
+		if (domElementType !== "button") return;
 		if (hasAttribute(context, node, "type")) return;
 		context.report({
 			messageId: "missingTypeAttribute",
 			node: node.openingElement,
 			suggest: BUTTON_TYPES.map((type) => ({
 				data: { type },
-				fix: (fixer) => fixer.insertTextAfter(node.openingElement.name, ` type="${type}"`),
+				fix(fixer) {
+					return fixer.insertTextAfter(node.openingElement.name, ` type="${type}"`);
+				},
 				messageId: "addTypeAttribute"
 			}))
 		});
@@ -339,18 +355,13 @@ function create$9(context) {
 //#endregion
 //#region src/rules/no-render-return-value/no-render-return-value.ts
 const RULE_NAME$8 = "no-render-return-value";
-const banParentTypes = [
+const BANNED_PARENT_TYPES = [
 	AST_NODE_TYPES.VariableDeclarator,
 	AST_NODE_TYPES.Property,
 	AST_NODE_TYPES.ReturnStatement,
 	AST_NODE_TYPES.ArrowFunctionExpression,
 	AST_NODE_TYPES.AssignmentExpression
 ];
-function isReturnValueUsed(node) {
-	let parent = node.parent;
-	while (Check.isTypeExpression(parent)) parent = parent.parent;
-	return banParentTypes.includes(parent.type);
-}
 var no_render_return_value_default = createRule({
 	meta: {
 		type: "problem",
@@ -363,9 +374,10 @@ var no_render_return_value_default = createRule({
 	defaultOptions: []
 });
 function create$8(context) {
+	if (!context.sourceCode.text.includes("render")) return {};
 	const imports = createImportLookup(context.sourceCode.ast, {
-		source: "react-dom",
-		builtinNamespaces: ["ReactDOM"]
+		builtinNamespaces: ["ReactDOM"],
+		source: "react-dom"
 	});
 	return { CallExpression(node) {
 		const callee = Extract.unwrap(node.callee);
@@ -385,6 +397,11 @@ function create$8(context) {
 		}
 	} };
 }
+function isReturnValueUsed(node) {
+	let parent = node.parent;
+	while (Check.isTypeExpression(parent)) parent = parent.parent;
+	return BANNED_PARENT_TYPES.includes(parent.type);
+}
 
 //#endregion
 //#region src/rules/no-render/no-render.ts
@@ -406,8 +423,8 @@ function create$7(context) {
 	const settings = getSettingsFromContext(context);
 	if (compare(settings.version, "18.0.0", "<")) return {};
 	const imports = createImportLookup(context.sourceCode.ast, {
-		source: "react-dom",
-		builtinNamespaces: ["ReactDOM"]
+		builtinNamespaces: ["ReactDOM"],
+		source: "react-dom"
 	});
 	return { CallExpression(node) {
 		const callee = Extract.unwrap(node.callee);
@@ -429,12 +446,6 @@ function create$7(context) {
 		}
 	} };
 }
-/**
-* Provides a fixer function to replace `render(app, container)` with `createRoot(container).render(app)`
-* @param context The rule context
-* @param node The `CallExpression` node to fix
-* @returns A fixer function or null if the fix cannot be applied
-*/
 function buildFix$1(context, node) {
 	const getText = (n) => context.sourceCode.getText(n);
 	return (fixer) => {
@@ -489,7 +500,8 @@ function create$5(context) {
 		const styleProp = findAttribute(context, node, "style");
 		if (styleProp == null) return;
 		const styleValue = resolveAttributeValue(context, styleProp);
-		if (typeof styleValue.toStatic() === "string") context.report({
+		if (typeof styleValue.toStatic() !== "string") return;
+		context.report({
 			messageId: "default",
 			node: styleValue.node ?? styleProp
 		});
@@ -1579,23 +1591,10 @@ var no_unknown_property_default = createRule({
 	create: create$4,
 	defaultOptions: []
 });
-/**
-* Create function for the ESLint rule
-* @param context ESLint rule context
-* @returns Rule listener
-*/
 function create$4(context) {
-	/**
-	* Gets the ignore configuration from rule options
-	* @returns Array of attribute names to ignore
-	*/
 	function getIgnoreConfig() {
 		return context.options[0]?.ignore ?? DEFAULTS.ignore;
 	}
-	/**
-	* Gets the requireDataLowercase option from rule options
-	* @returns Whether data attributes must be lowercase
-	*/
 	function getRequireDataLowercase() {
 		return context.options[0]?.requireDataLowercase ?? DEFAULTS.requireDataLowercase;
 	}
@@ -1691,11 +1690,13 @@ var no_unsafe_iframe_sandbox_default = createRule({
 function create$3(context) {
 	const resolver = createJsxElementResolver(context);
 	return { JSXElement(node) {
-		if (resolver.resolve(node).domElementType !== "iframe") return;
+		const { domElementType } = resolver.resolve(node);
+		if (domElementType !== "iframe") return;
 		const sandboxProp = findAttribute(context, node, "sandbox");
 		if (sandboxProp == null) return;
 		const sandboxValue = resolveAttributeValue(context, sandboxProp, "sandbox");
-		if (isUnsafeSandboxCombination(sandboxValue.toStatic())) context.report({
+		if (!isUnsafeSandboxCombination(sandboxValue.toStatic())) return;
+		context.report({
 			messageId: "default",
 			node: sandboxValue.node ?? sandboxProp
 		});
@@ -1750,8 +1751,8 @@ function create$2(context) {
 		const { domElementType } = resolver.resolve(node);
 		if (domElementType !== "a") return;
 		if (getAttributeStaticValue(context, node, "target") !== "_blank") return;
-		const hrefValueString = getAttributeStaticValue(context, node, "href");
-		if (!isExternalLinkLike(hrefValueString)) return;
+		const hrefValue = getAttributeStaticValue(context, node, "href");
+		if (!isExternalLinkLike(hrefValue)) return;
 		const relProp = findAttribute(context, node, "rel");
 		if (relProp == null) {
 			context.report({
@@ -1766,8 +1767,8 @@ function create$2(context) {
 			});
 			return;
 		}
-		const relValueString = getAttributeStaticValue(context, node, "rel");
-		if (isSafeRel(relValueString)) return;
+		const relValue = getAttributeStaticValue(context, node, "rel");
+		if (isSafeRel(relValue)) return;
 		context.report({
 			messageId: "default",
 			node: relProp,
@@ -1830,7 +1831,7 @@ function buildFix(context, node) {
 
 //#endregion
 //#region src/rules/no-void-elements-with-children/lib.ts
-const VOID_ELEMENTS = /* @__PURE__ */ new Set([
+const KNOWN_VOID_ELEMENTS = /* @__PURE__ */ new Set([
 	"area",
 	"base",
 	"br",
@@ -1867,7 +1868,7 @@ function create(context) {
 	const resolver = createJsxElementResolver(context);
 	return { JSXElement(node) {
 		const { domElementType } = resolver.resolve(node);
-		if (!VOID_ELEMENTS.has(domElementType)) return;
+		if (!KNOWN_VOID_ELEMENTS.has(domElementType)) return;
 		if (node.children.length > 0 || hasAnyAttribute(context, node, ["children", "dangerouslySetInnerHTML"])) context.report({
 			data: { elementType: domElementType },
 			messageId: "default",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-dom",
-  "version": "5.20.2",
+  "version": "5.20.4",
   "description": "ESLint React's ESLint plugin for DOM related rules.",
   "keywords": [
     "react",
@@ -37,12 +37,12 @@
     "dist"
   ],
   "dependencies": {
-    "@eslint-react/ast": "5.20.2",
-    "@eslint-react/core": "5.20.2",
-    "@eslint-react/eslint": "5.20.2",
-    "@eslint-react/jsx": "5.20.2",
-    "@eslint-react/shared": "5.20.2",
-    "@eslint-react/var": "5.20.2",
+    "@eslint-react/ast": "5.20.4",
+    "@eslint-react/core": "5.20.4",
+    "@eslint-react/eslint": "5.20.4",
+    "@eslint-react/jsx": "5.20.4",
+    "@eslint-react/shared": "5.20.4",
+    "@eslint-react/var": "5.20.4",
     "@typescript-eslint/types": "^8.70.0",
     "@typescript-eslint/utils": "^8.70.0",
     "compare-versions": "^6.1.1"