Upgrade to ESLint v7 (#11857)

* Upgrade to ESLint v7 * Upgrade eslint-plugin-import * Update peer deps * Remove max-len from ESLint config * Update tests * Only test babel-eslint-* packages in Node >=10 * Remove babel-eslint * Fix linking in dev * Add comment to Makefile * Fix e2e tests * Add --ignore-engines flag when installing in ESLint packages * fix: convert tt.questionDot to Punctuator * chore: update lockfile Co-authored-by: Huáng Jùnliàng <jlhwung@gmail.com>
babel · Jul 29, 2020 · 4ac9c7a · 4ac9c7a
1 parent 95fcb3e
commit 4ac9c7a
Show file tree

Hide file tree

Showing 36 changed files with 5,762 additions and 209 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,8 +14,6 @@ module.exports = {
   extends: "@babel/internal",
   rules: {
     "prettier/prettier": "error",
-    // TODO: remove after babel-eslint-config-internal is fully integrated into this repository.
-    "max-len": "off",
   },
   env: {
     node: true,

diff --git a/Makefile b/Makefile
@@ -257,6 +257,8 @@ publish-eslint:
 bootstrap-only: lerna-bootstrap
 
 yarn-install: clean-all
+	# Install dependencies in individual packages so that we can link them at the top level.
+	for package in eslint/*/; do yarn --ignore-engines --cwd $$package; done
 	# Gitpod prebuilds have a slow network connection, so we need more time
 	yarn --ignore-engines --network-timeout 100000
 

diff --git a/eslint/babel-eslint-config-internal/package.json b/eslint/babel-eslint-config-internal/package.json
@@ -13,7 +13,7 @@
   },
   "main": "index.js",
   "peerDependencies": {
-    "@babel/eslint-parser": "*",
+    "@babel/eslint-parser": "^7.10.4",
     "eslint-plugin-flowtype": "^3.0.0"
   }
 }
diff --git a/eslint/babel-eslint-config-internal/yarn.lock b/eslint/babel-eslint-config-internal/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json
@@ -19,8 +19,8 @@
   },
   "main": "lib/index.js",
   "peerDependencies": {
-    "@babel/core": ">=7.2.0",
-    "eslint": ">=6.0.0"
+    "@babel/core": ">=7.10.4",
+    "eslint": ">=7.5.0"
   },
   "dependencies": {
     "eslint-scope": "5.1.0",
@@ -29,9 +29,8 @@
   },
   "devDependencies": {
     "@babel/core": "^7.10.4",
-    "@babel/eslint-shared-fixtures": "^7.10.4",
     "dedent": "^0.7.0",
-    "eslint": "^6.0.1",
+    "eslint": "^7.5.0",
     "lodash.clonedeep": "^4.5.0"
   }
 }
diff --git a/eslint/babel-eslint-parser/src/convert/convertTokens.js b/eslint/babel-eslint-parser/src/convert/convertTokens.js
@@ -135,6 +135,7 @@ function convertToken(token, source) {
     type === tt.tilde ||
     type === tt.doubleColon ||
     type === tt.hash ||
+    type === tt.questionDot ||
     type.isAssign
   ) {
     token.type = "Punctuator";
@@ -172,8 +173,6 @@ function convertToken(token, source) {
   } else if (type === tt.bigint) {
     token.type = "Numeric";
     token.value = `${token.value}n`;
-  } else if (type === tt.questionDot) {
-    token.value = type.label;
   }
   if (typeof token.type !== "string") {
     // Acorn does not have rightAssociative

diff --git a/eslint/babel-eslint-parser/test/index.js b/eslint/babel-eslint-parser/test/index.js
@@ -6,7 +6,7 @@ import { parseForESLint } from "../src";
 
 const BABEL_OPTIONS = {
   configFile: require.resolve(
-    "@babel/eslint-shared-fixtures/config/babel.config.js",
+    "../../babel-eslint-shared-fixtures/config/babel.config.js",
   ),
 };
 const PROPS_TO_REMOVE = [