eslint-plugin-react-x 1.40.4-next.6 → 1.40.4

package/dist/index.js

@@ -141,7 +141,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.40.4-next.6";
+var version = "1.40.4";
 var createRule = utils.ESLintUtils.RuleCreator(shared.getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -295,7 +295,7 @@ var jsx_uses_react_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      description: "Marks React variables as used when JSX is used in the file.",
+      description: "Marks React variables as used when JSX is used.",
       [Symbol.for("rule_features")]: RULE_FEATURES5
     },
     messages: {
@@ -308,30 +308,17 @@ var jsx_uses_react_default = createRule({
   defaultOptions: []
 });
 function create5(context) {
-  const { jsx, jsxFactory, jsxFragmentFactory, reactNamespace } = kit.JsxRuntime.getJsxRuntimeOptionsFromContext(context);
-  const jsxAnnotation = getJsxAnnotation(context);
+  const jsxOptions = kit.JsxRuntime.getJsxRuntimeOptions(context);
+  const jsxAnnotation = kit.JsxRuntime.getJsxRuntimeAnnotation(context);
+  const jsx = jsxAnnotation.jsxRuntime === "classic" ? ts.JsxEmit.React : jsxOptions.jsx;
   if (jsx === ts.JsxEmit.ReactJSX || jsx === ts.JsxEmit.ReactJSXDev) return {};
+  const jsxFactory = jsxAnnotation.jsx ?? jsxOptions.jsxFactory;
+  const jsxFragmentFactory = jsxAnnotation.jsxFrag ?? jsxOptions.jsxFragmentFactory;
   function handleJsxElement(node) {
-    if (jsxAnnotation == null) {
-      context.sourceCode.markVariableAsUsed(reactNamespace, node);
-      context.sourceCode.markVariableAsUsed(jsxFactory, node);
-      debugReport(context, node, reactNamespace);
-      debugReport(context, node, jsxFactory);
-    }
-    if (jsxAnnotation?.jsx != null) {
-      context.sourceCode.markVariableAsUsed(jsxAnnotation.jsx, node);
-      debugReport(context, node, jsxAnnotation.jsx);
-    }
+    context.sourceCode.markVariableAsUsed(jsxFactory, node);
   }
   function handleJsxFragment(node) {
-    if (jsxAnnotation == null) {
-      context.sourceCode.markVariableAsUsed(jsxFragmentFactory, node);
-      debugReport(context, node, jsxFragmentFactory);
-    }
-    if (jsxAnnotation?.jsxFrag != null) {
-      context.sourceCode.markVariableAsUsed(jsxAnnotation.jsxFrag, node);
-      debugReport(context, node, jsxAnnotation.jsxFrag);
-    }
+    context.sourceCode.markVariableAsUsed(jsxFragmentFactory, node);
   }
   return {
     JSXFragment: handleJsxFragment,
@@ -339,25 +326,6 @@ function create5(context) {
     JSXOpeningFragment: handleJsxElement
   };
 }
-function getJsxAnnotation(context) {
-  if (!context.sourceCode.text.includes("@jsx")) return;
-  const allComments = context.sourceCode.getAllComments();
-  const jsxComment = allComments.find((n) => kit.RE_JSX_ANNOTATION.test(n.value));
-  const jsxFragComment = allComments.find((n) => kit.RE_JSX_FRAG_ANNOTATION.test(n.value));
-  const jsx = jsxComment?.value.match(kit.RE_JSX_ANNOTATION)?.[1];
-  const jsxFrag = jsxFragComment?.value.match(kit.RE_JSX_FRAG_ANNOTATION)?.[1];
-  return {
-    jsx,
-    jsxFrag
-  };
-}
-function debugReport(context, node, name5) {
-  context.report({
-    messageId: "jsxUsesReact",
-    node,
-    data: { name: name5 }
-  });
-}
 var RULE_NAME6 = "jsx-uses-vars";
 var RULE_FEATURES6 = [];
 var jsx_uses_vars_default = createRule({

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { _, flow, getOrUpdate, constTrue, constFalse } from '@eslint-react/eff';
 import * as VAR2 from '@eslint-react/var';
 import { match, isMatching, P } from 'ts-pattern';
-import { JsxRuntime, RE_JSX_ANNOTATION, RE_JSX_FRAG_ANNOTATION, createReport } from '@eslint-react/kit';
+import { JsxRuntime, createReport } from '@eslint-react/kit';
 import ts, { JsxEmit } from 'typescript';
 import * as AST8 from '@eslint-react/ast';
 import * as ER21 from '@eslint-react/core';
@@ -113,7 +113,7 @@ var settings3 = {
 
 // package.json
 var name4 = "eslint-plugin-react-x";
-var version = "1.40.4-next.6";
+var version = "1.40.4";
 var createRule = ESLintUtils.RuleCreator(getDocsUrl("x"));
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -267,7 +267,7 @@ var jsx_uses_react_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      description: "Marks React variables as used when JSX is used in the file.",
+      description: "Marks React variables as used when JSX is used.",
       [Symbol.for("rule_features")]: RULE_FEATURES5
     },
     messages: {
@@ -280,30 +280,17 @@ var jsx_uses_react_default = createRule({
   defaultOptions: []
 });
 function create5(context) {
-  const { jsx, jsxFactory, jsxFragmentFactory, reactNamespace } = JsxRuntime.getJsxRuntimeOptionsFromContext(context);
-  const jsxAnnotation = getJsxAnnotation(context);
+  const jsxOptions = JsxRuntime.getJsxRuntimeOptions(context);
+  const jsxAnnotation = JsxRuntime.getJsxRuntimeAnnotation(context);
+  const jsx = jsxAnnotation.jsxRuntime === "classic" ? JsxEmit.React : jsxOptions.jsx;
   if (jsx === JsxEmit.ReactJSX || jsx === JsxEmit.ReactJSXDev) return {};
+  const jsxFactory = jsxAnnotation.jsx ?? jsxOptions.jsxFactory;
+  const jsxFragmentFactory = jsxAnnotation.jsxFrag ?? jsxOptions.jsxFragmentFactory;
   function handleJsxElement(node) {
-    if (jsxAnnotation == null) {
-      context.sourceCode.markVariableAsUsed(reactNamespace, node);
-      context.sourceCode.markVariableAsUsed(jsxFactory, node);
-      debugReport(context, node, reactNamespace);
-      debugReport(context, node, jsxFactory);
-    }
-    if (jsxAnnotation?.jsx != null) {
-      context.sourceCode.markVariableAsUsed(jsxAnnotation.jsx, node);
-      debugReport(context, node, jsxAnnotation.jsx);
-    }
+    context.sourceCode.markVariableAsUsed(jsxFactory, node);
   }
   function handleJsxFragment(node) {
-    if (jsxAnnotation == null) {
-      context.sourceCode.markVariableAsUsed(jsxFragmentFactory, node);
-      debugReport(context, node, jsxFragmentFactory);
-    }
-    if (jsxAnnotation?.jsxFrag != null) {
-      context.sourceCode.markVariableAsUsed(jsxAnnotation.jsxFrag, node);
-      debugReport(context, node, jsxAnnotation.jsxFrag);
-    }
+    context.sourceCode.markVariableAsUsed(jsxFragmentFactory, node);
   }
   return {
     JSXFragment: handleJsxFragment,
@@ -311,25 +298,6 @@ function create5(context) {
     JSXOpeningFragment: handleJsxElement
   };
 }
-function getJsxAnnotation(context) {
-  if (!context.sourceCode.text.includes("@jsx")) return;
-  const allComments = context.sourceCode.getAllComments();
-  const jsxComment = allComments.find((n) => RE_JSX_ANNOTATION.test(n.value));
-  const jsxFragComment = allComments.find((n) => RE_JSX_FRAG_ANNOTATION.test(n.value));
-  const jsx = jsxComment?.value.match(RE_JSX_ANNOTATION)?.[1];
-  const jsxFrag = jsxFragComment?.value.match(RE_JSX_FRAG_ANNOTATION)?.[1];
-  return {
-    jsx,
-    jsxFrag
-  };
-}
-function debugReport(context, node, name5) {
-  context.report({
-    messageId: "jsxUsesReact",
-    node,
-    data: { name: name5 }
-  });
-}
 var RULE_NAME6 = "jsx-uses-vars";
 var RULE_FEATURES6 = [];
 var jsx_uses_vars_default = createRule({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.40.4-next.6",
+  "version": "1.40.4",
   "description": "A set of composable linting rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -50,13 +50,13 @@
     "is-immutable-type": "^5.0.1",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.7.0",
-    "@eslint-react/ast": "1.40.4-next.6",
-    "@eslint-react/kit": "1.40.4-next.6",
-    "@eslint-react/core": "1.40.4-next.6",
-    "@eslint-react/eff": "1.40.4-next.6",
-    "@eslint-react/var": "1.40.4-next.6",
-    "@eslint-react/jsx": "1.40.4-next.6",
-    "@eslint-react/shared": "1.40.4-next.6"
+    "@eslint-react/ast": "1.40.4",
+    "@eslint-react/core": "1.40.4",
+    "@eslint-react/eff": "1.40.4",
+    "@eslint-react/jsx": "1.40.4",
+    "@eslint-react/var": "1.40.4",
+    "@eslint-react/kit": "1.40.4",
+    "@eslint-react/shared": "1.40.4"
   },
   "devDependencies": {
     "@types/react": "^19.1.0",