Upgrade to eslint 8 (#8580)

parcel-bundler · Jan 6, 2024 · b546240 · b546240
1 parent f5ebdd3
commit b546240
Show file tree

Hide file tree

Showing 9 changed files with 523 additions and 413 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "@types/node": ">= 18",
     "buffer": "mischnic/buffer#b8a4fa94",
     "cross-env": "^7.0.0",
-    "eslint": "^7.20.0",
+    "eslint": "^8.41.0",
     "flow-bin": "0.184.0",
     "glob": "^7.1.6",
     "gulp": "^4.0.2",

diff --git a/packages/dev/eslint-config/index.js b/packages/dev/eslint-config/index.js
@@ -5,8 +5,6 @@ module.exports = {
     'plugin:monorepo/recommended',
     'plugin:react/recommended',
     'prettier',
-    'prettier/flowtype',
-    'prettier/react',
   ],
   parser: '@babel/eslint-parser',
   plugins: ['@parcel', 'flowtype', 'import', 'monorepo', 'react', 'mocha'],

diff --git a/packages/dev/eslint-config/package.json b/packages/dev/eslint-config/package.json
@@ -4,13 +4,15 @@
   "version": "2.11.0",
   "dependencies": {
     "@babel/eslint-parser": "^7.22.11",
+    "@babel/plugin-syntax-flow": "^7.14.5",
+    "@babel/plugin-transform-react-jsx": "^7.14.9",
     "@parcel/eslint-plugin": "2.11.0",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-flowtype": "^5.2.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-mocha": "^8.0.0",
     "eslint-plugin-monorepo": "^0.3.2",
-    "eslint-plugin-react": "^7.22.0"
+    "eslint-plugin-react": "^7.32.2"
   },
   "peerDependencies": {
     "@babel/core": "^7.22.11",

diff --git a/packages/dev/eslint-plugin/package.json b/packages/dev/eslint-plugin/package.json
@@ -10,6 +10,6 @@
   "devDependencies": {
     "@babel/core": "^7.22.11",
     "@babel/eslint-parser": "^7.22.11",
-    "eslint": "^7.20.0"
+    "eslint": "^8.41.0"
   }
 }
diff --git a/packages/utils/parcel-lsp/package.json b/packages/utils/parcel-lsp/package.json
@@ -36,9 +36,9 @@
   },
   "devDependencies": {
     "@types/node": ">= 18",
-    "@typescript-eslint/eslint-plugin": "^4.14.1",
-    "@typescript-eslint/parser": "^4.14.1",
-    "eslint": "^7.19.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.7",
+    "eslint": "^8.41.0",
     "typescript": ">=3.0.0"
   },
   "targets": {

diff --git a/packages/utils/parcelforvscode/package.json b/packages/utils/parcelforvscode/package.json
@@ -113,9 +113,9 @@
     "@types/mocha": "^8.0.4",
     "@types/node": ">= 18",
     "@types/vscode": "^1.67.0",
-    "@typescript-eslint/eslint-plugin": "^4.14.1",
-    "@typescript-eslint/parser": "^4.14.1",
-    "eslint": "^7.19.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.7",
+    "eslint": "^8.41.0",
     "glob": "^7.1.6",
     "mocha": "^8.2.1",
     "typescript": ">=3.0.0",

diff --git a/packages/validators/eslint/package.json b/packages/validators/eslint/package.json
@@ -25,9 +25,9 @@
     "chalk": "^4.1.0"
   },
   "devDependencies": {
-    "eslint": "^6.0.0 || ^7.0.0"
+    "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "peerDependencies": {
-    "eslint": "^6.0.0 || ^7.0.0"
+    "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
   }
 }
diff --git a/packages/validators/eslint/src/EslintValidator.js b/packages/validators/eslint/src/EslintValidator.js
@@ -4,61 +4,72 @@ import {type DiagnosticCodeFrame, escapeMarkdown} from '@parcel/diagnostic';
 import eslint from 'eslint';
 import invariant from 'assert';
 
+// For eslint <8.0.0
 let cliEngine = null;
+// For eslint >=8.0.0
+let eslintEngine = null;
 
 export default (new Validator({
   async validate({asset}) {
-    if (!cliEngine) {
-      cliEngine = new eslint.CLIEngine({});
+    if (!cliEngine && !eslintEngine) {
+      if (eslint.ESLint) {
+        eslintEngine = new eslint.ESLint({});
+      } else {
+        cliEngine = new eslint.CLIEngine({});
+      }
     }
     let code = await asset.getCode();
 
-    invariant(cliEngine != null);
-    let report = cliEngine.executeOnText(code, asset.filePath);
+    let results;
+    if (cliEngine != null) {
+      results = cliEngine.executeOnText(code, asset.filePath).results;
+    } else if (eslintEngine != null) {
+      results = await eslintEngine.lintText(code, {filePath: asset.filePath});
+    } else {
+      invariant(false);
+    }
 
     let validatorResult = {
       warnings: [],
       errors: [],
     };
 
-    if (report.results.length > 0) {
-      for (let result of report.results) {
-        if (!result.errorCount && !result.warningCount) continue;
+    for (let result of results) {
+      if (!result.errorCount && !result.warningCount) continue;
 
-        let codeframe: DiagnosticCodeFrame = {
-          filePath: asset.filePath,
-          code: result.source,
-          codeHighlights: result.messages.map(message => {
-            let start = {
-              line: message.line,
-              column: message.column,
-            };
-            return {
-              start,
-              // Parse errors have no ending
-              end:
-                message.endLine != null
-                  ? {
-                      line: message.endLine,
-                      column: message.endColumn,
-                    }
-                  : start,
-              message: escapeMarkdown(message.message),
-            };
-          }),
-        };
+      let codeframe: DiagnosticCodeFrame = {
+        filePath: asset.filePath,
+        code: result.source,
+        codeHighlights: result.messages.map(message => {
+          let start = {
+            line: message.line,
+            column: message.column,
+          };
+          return {
+            start,
+            // Parse errors have no ending
+            end:
+              message.endLine != null
+                ? {
+                    line: message.endLine,
+                    column: message.endColumn - 1,
+                  }
+                : start,
+            message: escapeMarkdown(message.message),
+          };
+        }),
+      };
 
-        let diagnostic = {
-          origin: '@parcel/validator-eslint',
-          message: `ESLint found **${result.errorCount}** __errors__ and **${result.warningCount}** __warnings__.`,
-          codeFrames: [codeframe],
-        };
+      let diagnostic = {
+        origin: '@parcel/validator-eslint',
+        message: `ESLint found **${result.errorCount}** __errors__ and **${result.warningCount}** __warnings__.`,
+        codeFrames: [codeframe],
+      };
 
-        if (result.errorCount > 0) {
-          validatorResult.errors.push(diagnostic);
-        } else {
-          validatorResult.warnings.push(diagnostic);
-        }
+      if (result.errorCount > 0) {
+        validatorResult.errors.push(diagnostic);
+      } else {
+        validatorResult.warnings.push(diagnostic);
       }
     }