release: 1.40.4-next.1

Author: Rel1cx

VERSION

@@ -1 +1 @@
-1.40.4-beta.0
+1.40.4-next.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/monorepo",
-  "version": "1.40.4-beta.0",
+  "version": "1.40.4-next.1",
   "private": true,
   "description": "Monorepo for eslint-plugin-react-[x, dom, web-api, hooks-extra, naming-convention].",
   "keywords": [

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.40.4-beta.0",
+  "version": "1.40.4-next.1",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {

packages/plugins/eslint-plugin-react-debug/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-debug",
-  "version": "1.40.4-beta.0",
+  "version": "1.40.4-next.1",
   "description": "ESLint React's ESLint plugin for debugging related rules.",
   "keywords": [
     "react",

packages/plugins/eslint-plugin-react-dom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-dom",
-  "version": "1.40.4-beta.0",
+  "version": "1.40.4-next.1",
   "description": "ESLint React's ESLint plugin for React DOM related rules.",
   "keywords": [
     "react",

packages/plugins/eslint-plugin-react-hooks-extra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-hooks-extra",
-  "version": "1.40.4-beta.0",
+  "version": "1.40.4-next.1",
   "description": "ESLint React's ESLint plugin for React Hooks related rules.",
   "keywords": [
     "react",

packages/plugins/eslint-plugin-react-naming-convention/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-naming-convention",
-  "version": "1.40.4-beta.0",
+  "version": "1.40.4-next.1",
   "description": "ESLint React's ESLint plugin for naming convention related rules.",
   "keywords": [
     "react",

packages/plugins/eslint-plugin-react-web-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "1.40.4-beta.0",
+  "version": "1.40.4-next.1",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",

packages/plugins/eslint-plugin-react-x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.40.4-beta.0",
+  "version": "1.40.4-next.1",
   "description": "A set of composable linting rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",

packages/plugins/eslint-plugin-react-x/src/rules/prefer-react-namespace-import.ts

@@ -1,7 +1,7 @@
-import type { RuleContext, RuleFeature } from "@eslint-react/kit";
 import type { TSESTree } from "@typescript-eslint/types";
 import type { RuleListener } from "@typescript-eslint/utils/ts-eslint";
 import type { CamelCase } from "string-ts";
+import { type RuleContext, type RuleFeature } from "@eslint-react/kit";
 import { getSettingsFromContext } from "@eslint-react/shared";
 
 import { createRule } from "../utils";
@@ -43,26 +43,28 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
         messageId: "preferReactNamespaceImport",
         node: hasOtherSpecifiers ? node : node.parent,
         data: { importSource },
-        // TODO: Use `settings.languagePreference` to determine what code style to use in the fixer (e.g. single or double quotes)
         fix(fixer) {
+          const importDeclarationText = context.sourceCode.getText(node.parent);
+          const semi = importDeclarationText.endsWith(";") ? ";" : "";
           const quote = node.parent.source.raw.at(0) ?? "'";
           const isTypeImport = node.parent.importKind === "type";
           const importStringPrefix = `import${isTypeImport ? " type" : ""}`;
           const importSourceQuoted = `${quote}${importSource}${quote}`;
-          const sourceCode = context.sourceCode.getText(node.parent);
-          const semiColon = sourceCode.endsWith(";") ? ";" : "";
           if (!hasOtherSpecifiers) {
             return fixer.replaceText(
               node.parent,
-              `${importStringPrefix} * as ${node.local.name} from ${importSourceQuoted}${semiColon}`,
+              `${importStringPrefix} * as ${node.local.name} from ${importSourceQuoted}${semi}`,
             );
           }
-
+          // dprint-ignore
           // remove the default specifier and prepend the namespace import specifier
-          const specifiers = sourceCode.slice(sourceCode.indexOf("{"), sourceCode.indexOf("}") + 1);
+          const specifiers = importDeclarationText.slice(importDeclarationText.indexOf("{"), importDeclarationText.indexOf("}") + 1);
           return fixer.replaceText(
             node.parent,
-            `${importStringPrefix} * as ${node.local.name} from ${importSourceQuoted}${semiColon}\n${importStringPrefix} ${specifiers} from ${importSourceQuoted}${semiColon}`,
+            [
+              `${importStringPrefix} * as ${node.local.name} from ${importSourceQuoted}${semi}`,
+              `${importStringPrefix} ${specifiers} from ${importSourceQuoted}${semi}`,
+            ].join("\n"),
           );
         },
       });