refactor: backport changes in tseslint8 to main

Rel1cx · Rel1cx · commit 11c9e3f362bf · 2024-07-20T18:20:00.000+08:00
diff --git a/.npmrc b/.npmrc
@@ -1,4 +1,3 @@
 registry=https://registry.npmjs.org
 package-manager-strict=true
 shell-emulator=true
-node-linker=hoisted
diff --git a/examples/vite-react-dom-ts-flat/package.json b/examples/vite-react-dom-ts-flat/package.json
@@ -24,7 +24,7 @@
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-react-refresh": "0.4.8",
     "typescript": "^5.5.3",
-    "typescript-eslint": "8.0.0-alpha.47",
+    "typescript-eslint": "^7.16.1",
     "vite": "5.3.4"
   }
 }
diff --git a/package.json b/package.json
@@ -56,15 +56,15 @@
     "@swc/core": "1.7.0",
     "@tsconfig/node22": "22.0.0",
     "@tsconfig/strictest": "2.0.5",
+    "@types/bun": "1.1.6",
     "@types/node": "20.14.11",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
-    "@typescript-eslint/eslint-plugin": "8.0.0-alpha.47",
-    "@typescript-eslint/parser": "8.0.0-alpha.47",
-    "@typescript-eslint/rule-tester": "8.0.0-alpha.47",
+    "@typescript-eslint/eslint-plugin": "^7.16.1",
+    "@typescript-eslint/parser": "^7.16.1",
+    "@typescript-eslint/rule-tester": "^7.16.1",
     "@vitest/ui": "2.0.3",
     "bun": "1.1.20",
-    "bun-types": "1.1.20",
     "bundle-require": "^5.0.0",
     "code-block-writer": "13.0.1",
     "cspell": "8.11.0",
@@ -115,13 +115,13 @@
       "@types/node": "20.14.11",
       "@types/react": "18.3.3",
       "@types/react-dom": "18.3.0",
-      "@typescript-eslint/eslint-plugin": "8.0.0-alpha.47",
-      "@typescript-eslint/parser": "8.0.0-alpha.47",
-      "@typescript-eslint/rule-tester": "8.0.0-alpha.47",
-      "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-      "@typescript-eslint/type-utils": "8.0.0-alpha.47",
-      "@typescript-eslint/types": "8.0.0-alpha.47",
-      "@typescript-eslint/utils": "8.0.0-alpha.47",
+      "@typescript-eslint/eslint-plugin": "^7.16.1",
+      "@typescript-eslint/parser": "^7.16.1",
+      "@typescript-eslint/rule-tester": "^7.16.1",
+      "@typescript-eslint/scope-manager": "^7.16.1",
+      "@typescript-eslint/type-utils": "^7.16.1",
+      "@typescript-eslint/types": "^7.16.1",
+      "@typescript-eslint/utils": "^7.16.1",
       "array-includes": "npm:@nolyfill/array-includes@^1",
       "array.prototype.findlast": "npm:@nolyfill/array.prototype.findlast@^1",
       "array.prototype.findlastindex": "npm:@nolyfill/array.prototype.findlastindex@^1",
@@ -146,7 +146,7 @@
       "ts-api-utils": "^1.3.0",
       "typedarray": "npm:@nolyfill/typedarray@^1",
       "typescript": "^5.5.3",
-      "typescript-eslint": "8.0.0-alpha.47"
+      "typescript-eslint": "^7.16.1"
     },
     "overridesMeta": {
       "esbuild": "Ensure that the esbuild has single version across the monorepo.",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -48,10 +48,10 @@
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
     "@eslint-react/var": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/type-utils": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/type-utils": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "short-unique-id": "5.2.0",
diff --git a/packages/core/src/component/component-init-path.ts b/packages/core/src/component/component-init-path.ts
@@ -163,6 +163,7 @@ export function getComponentInitPath(node: TSESTreeFunction): O.Option<ERCompone
 
   if (
     parent.type === NodeType.MethodDefinition
+    && parent.parent.type === NodeType.ClassBody
     && parent.parent.parent.type === NodeType.ClassDeclaration
   ) {
     return O.some([
@@ -175,6 +176,7 @@ export function getComponentInitPath(node: TSESTreeFunction): O.Option<ERCompone
 
   if (
     parent.type === NodeType.PropertyDefinition
+    && parent.parent.type === NodeType.ClassBody
     && parent.parent.parent.type === NodeType.ClassDeclaration
   ) {
     return O.some([
diff --git a/packages/plugins/eslint-plugin-react-debug/package.json b/packages/plugins/eslint-plugin-react-debug/package.json
@@ -47,10 +47,10 @@
     "@eslint-react/shared": "workspace:*",
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/type-utils": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47",
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/type-utils": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1",
     "string-ts": "^2.2.0"
   },
   "devDependencies": {
diff --git a/packages/plugins/eslint-plugin-react-dom/package.json b/packages/plugins/eslint-plugin-react-dom/package.json
@@ -48,9 +48,9 @@
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
     "@eslint-react/var": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "string-ts": "2.2.0",
diff --git a/packages/plugins/eslint-plugin-react-hooks-extra/package.json b/packages/plugins/eslint-plugin-react-hooks-extra/package.json
@@ -48,10 +48,10 @@
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
     "@eslint-react/var": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/type-utils": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/type-utils": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "string-ts": "2.2.0",
diff --git a/packages/plugins/eslint-plugin-react-naming-convention/package.json b/packages/plugins/eslint-plugin-react-naming-convention/package.json
@@ -47,10 +47,10 @@
     "@eslint-react/shared": "workspace:*",
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/type-utils": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/type-utils": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "string-ts": "2.2.0",
diff --git a/packages/plugins/eslint-plugin-react-x/package.json b/packages/plugins/eslint-plugin-react-x/package.json
@@ -48,10 +48,10 @@
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
     "@eslint-react/var": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/type-utils": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47",
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/type-utils": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1",
     "is-immutable-type": "4.0.0"
   },
   "devDependencies": {
diff --git a/packages/plugins/eslint-plugin/package.json b/packages/plugins/eslint-plugin/package.json
@@ -55,10 +55,10 @@
     "@eslint-react/shared": "workspace:*",
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/type-utils": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47",
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/type-utils": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1",
     "eslint-plugin-react-debug": "workspace:*",
     "eslint-plugin-react-dom": "workspace:*",
     "eslint-plugin-react-hooks-extra": "workspace:*",
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -42,7 +42,7 @@
     "publish": "pnpm run build && pnpm run lint:publish"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "tsup": "8.2.0",
diff --git a/packages/tools/src/helpers.ts b/packages/tools/src/helpers.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-function-type */
 /**
  * @since 0.4.0
  */
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -43,8 +43,8 @@
   },
   "dependencies": {
     "@eslint-react/tools": "workspace:*",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "tsup": "8.2.0"
diff --git a/packages/utilities/ast/package.json b/packages/utilities/ast/package.json
@@ -44,9 +44,9 @@
     "@eslint-community/eslint-utils": "4.4.0",
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "string-ts": "2.2.0",
diff --git a/packages/utilities/ast/src/construction.ts b/packages/utilities/ast/src/construction.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-empty-object-type */
 import type { O } from "@eslint-react/tools";
 import { Data } from "@eslint-react/tools";
 import type { TSESTree } from "@typescript-eslint/types";
diff --git a/packages/utilities/jsx/package.json b/packages/utilities/jsx/package.json
@@ -45,9 +45,9 @@
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
     "@eslint-react/var": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "ts-pattern": "5.2.0",
diff --git a/packages/utilities/var/package.json b/packages/utilities/var/package.json
@@ -44,9 +44,9 @@
     "@eslint-react/ast": "workspace:*",
     "@eslint-react/tools": "workspace:*",
     "@eslint-react/types": "workspace:*",
-    "@typescript-eslint/scope-manager": "8.0.0-alpha.47",
-    "@typescript-eslint/types": "8.0.0-alpha.47",
-    "@typescript-eslint/utils": "8.0.0-alpha.47"
+    "@typescript-eslint/scope-manager": "^7.16.1",
+    "@typescript-eslint/types": "^7.16.1",
+    "@typescript-eslint/utils": "^7.16.1"
   },
   "devDependencies": {
     "string-ts": "2.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/fixtures/tsconfig.json b/test/fixtures/tsconfig.json
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/website/package.json b/website/package.json
diff --git a/website/pages/docs/rules/hooks-extra-no-direct-set-state-in-use-effect.mdx b/website/pages/docs/rules/hooks-extra-no-direct-set-state-in-use-effect.mdx

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"eslint-plugin-react-hooks": "4.6.2",`
`25`	`25`	`"eslint-plugin-react-refresh": "0.4.8",`
`26`	`26`	`"typescript": "^5.5.3",`
`27`		`- "typescript-eslint": "8.0.0-alpha.47",`
	`27`	`+ "typescript-eslint": "^7.16.1",`
`28`	`28`	`"vite": "5.3.4"`
`29`	`29`	`}`
`30`	`30`	`}`