Merge pull request #50 from Quramy/upgrade-ts-eslint-v4

upgrade ts-eslint pkgs

Author: Quramy

README.md

@@ -19,8 +19,8 @@ TypeScript language service plugin to check ESLint errors.
 ### Requirements (peer dependencies)
 
 - `typescript`
-- `@typescript-eslint/parser` >= 3.5.0
-- `@typescript-eslint/typescript-estree` >= 3.5.0
+- `@typescript-eslint/parser` >= 4.0.0
+- `@typescript-eslint/typescript-estree` >= 4.0.0
 - `eslint`
 
 ### Install
@@ -68,6 +68,7 @@ By default, this plugins watches only `.eslintrc.*` files that exist in your pro
 
 ### If you use older version of `@typescript-eslint` packages
 
+- **If your @typescript-eslint tool's version is < 4.0.0, install `[email protected]`.**
 - **If your @typescript-eslint tool's version is <= 3.4.0, install `[email protected]`.**
 - **If your @typescript-eslint tool's version is <= 2.x.x, install `[email protected]`.**
 

e2e/projects/other-parser/package.json

@@ -8,6 +8,6 @@
     "@babel/core": "^7.7.4",
     "babel-eslint": "^10.0.3",
     "eslint": "^7.0.0",
-    "typescript": "4.0.1-rc"
+    "typescript": "~4.0.0"
   }
 }

e2e/projects/simple/package.json

@@ -5,8 +5,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "@typescript-eslint/parser": "~3.9.0",
+    "@typescript-eslint/parser": "~4.0.0",
     "eslint": "^7.0.0",
-    "typescript": "4.0.1-rc"
+    "typescript": "~4.0.0"
   }
 }

e2e/projects/ts-eslint-plugin/package.json

@@ -5,9 +5,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "~3.9.0",
-    "@typescript-eslint/parser": "~3.9.0",
+    "@typescript-eslint/eslint-plugin": "~4.0.0",
+    "@typescript-eslint/parser": "~4.0.0",
     "eslint": "^7.0.0",
-    "typescript": "4.0.1-rc"
+    "typescript": "~4.0.0"
   }
 }

e2e/setup.sh

@@ -3,8 +3,28 @@
 BASE_DIR=$(cd $(dirname $0); pwd)
 yarn link
 
+TS_VER=$(node -e "console.log(require('./package.json').devDependencies['typescript'])")
+TSESLINT_VER=$(node -e "console.log(require('./package.json').devDependencies['@typescript-eslint/parser'])")
+
 for dir in $(ls ${BASE_DIR}/projects); do
   pushd ${BASE_DIR}/projects/${dir}
+  cat << EOF | node > PKG
+const json = require('./package.json');
+const ret = {
+  ...json,
+  devDependencies: Object.keys(json.devDependencies).reduce((acc, k) => {
+    if (k === 'typescript') {
+      return { ...acc, typescript: "${TS_VER}" };
+    }
+    if (k.startsWith('@typescript-eslint')) {
+      return { ...acc, [k]: "${TSESLINT_VER}" };
+    }
+    return acc;
+  }, json.devDependencies),
+};
+console.log(JSON.stringify(ret, null, 2));
+EOF
+  mv PKG package.json
   yarn --pure-lockfile
   yarn link typescript-eslint-language-service
   popd

package.json

@@ -28,19 +28,19 @@
     "url": "https://github.com/Quramy/typescript-eslint-language-service/issues"
   },
   "pperDependencies": {
-    "@typescript-eslint/parser": ">= 3.5.0",
-    "@typescript-eslint/typescript-estree": ">= 3.5.0",
+    "@typescript-eslint/parser": ">= 4.0.0",
+    "@typescript-eslint/typescript-estree": ">= 4.0.0",
     "eslint": ">= 6.7.0 <= 6.8.x || >= 7.0.0",
-    "typescript": "^3.0.0"
+    "typescript": ">= 3.0.0 || >= 4.0.0"
   },
   "homepage": "https://github.com/Quramy/typescript-eslint-language-service#readme",
   "devDependencies": {
     "@types/eslint": "^6.1.3",
     "@types/jest": "^25.1.4",
     "@types/node": "^14.0.6",
-    "@typescript-eslint/eslint-plugin": "~3.9.0",
-    "@typescript-eslint/parser": "~3.9.0",
-    "@typescript-eslint/typescript-estree": "~3.9.0",
+    "@typescript-eslint/eslint-plugin": "~4.0.0",
+    "@typescript-eslint/parser": "~4.0.0",
+    "@typescript-eslint/typescript-estree": "~4.0.0",
     "eslint": "^7.0.0",
     "eslint-config-prettier": "^6.11.0",
     "fretted-strings": "^1.0.0",
@@ -49,8 +49,8 @@
     "prettier": "^2.0.5",
     "pretty-quick": "^2.0.1",
     "rimraf": "^3.0.0",
-    "ts-jest": "^26.0.0",
-    "typescript": "4.0.1-rc"
+    "ts-jest": "^26.3.0",
+    "typescript": "~4.0.0"
   },
   "husky": {
     "hooks": {

src/ast-converter.ts

@@ -1,7 +1,7 @@
 import ts from "typescript";
 import { SourceCode, AST, Scope } from "eslint";
-import { ParserOptions } from "@typescript-eslint/parser";
-import { analyzeScope } from "@typescript-eslint/parser/dist/analyze-scope";
+import { ParserOptions } from "@typescript-eslint/types";
+import { analyze, AnalyzeOptions } from "@typescript-eslint/scope-manager";
 import { Extra } from "@typescript-eslint/typescript-estree/dist/parser-options";
 import { visitorKeys } from "@typescript-eslint/visitor-keys";
 import { ParseAndGenerateServicesResult, TSESTreeOptions } from "@typescript-eslint/typescript-estree";
@@ -200,6 +200,15 @@ export class AstConverter {
         jsx: validateBoolean(options.ecmaFeatures.jsx),
       });
 
+      const analyzeOptions: AnalyzeOptions = {
+        ecmaVersion: options.ecmaVersion,
+        globalReturn: options.ecmaFeatures.globalReturn,
+        // jsxPragma: options.jsxPragma,
+        // jsxFragmentName: options.jsxFragmentName,
+        lib: options.lib,
+        sourceType: options.sourceType,
+      };
+
       if (typeof options.filePath === "string") {
         const tsx = options.filePath.endsWith(".tsx");
         if (tsx || options.filePath.endsWith(".ts")) {
@@ -219,7 +228,7 @@ export class AstConverter {
       const { ast, services } = this.parseAndGenerateServices(src, parserOptions);
       ast.sourceType = options.sourceType;
 
-      const scopeManager = analyzeScope(ast as any, parserOptions);
+      const scopeManager = analyze(ast, analyzeOptions);
 
       return {
         ast: ast as AST.Program,