@parcel/validator-eslint 2.11.0 → 2.12.0

package/lib/EslintValidator.js

@@ -33,53 +33,66 @@ function _assert() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// For eslint <8.0.0
 let cliEngine = null;
+// For eslint >=8.0.0
+let eslintEngine = null;
 var _default = exports.default = new (_plugin().Validator)({
   async validate({
     asset
   }) {
-    if (!cliEngine) {
-      cliEngine = new (_eslint().default.CLIEngine)({});
+    if (!cliEngine && !eslintEngine) {
+      if (_eslint().default.ESLint) {
+        eslintEngine = new (_eslint().default.ESLint)({});
+      } else {
+        cliEngine = new (_eslint().default.CLIEngine)({});
+      }
     }
     let code = await asset.getCode();
-    (0, _assert().default)(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 {
+      (0, _assert().default)(false);
+    }
     let validatorResult = {
       warnings: [],
       errors: []
     };
-    if (report.results.length > 0) {
-      for (let result of report.results) {
-        if (!result.errorCount && !result.warningCount) continue;
-        let codeframe = {
-          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: (0, _diagnostic().escapeMarkdown)(message.message)
-            };
-          })
-        };
-        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);
-        }
+    for (let result of results) {
+      if (!result.errorCount && !result.warningCount) continue;
+      let codeframe = {
+        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: (0, _diagnostic().escapeMarkdown)(message.message)
+          };
+        })
+      };
+      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);
       }
     }
     return validatorResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/validator-eslint",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,18 +17,18 @@
   "source": "src/EslintValidator.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.11.0"
+    "parcel": "^2.12.0"
   },
   "dependencies": {
-    "@parcel/plugin": "2.11.0",
-    "@parcel/utils": "2.11.0",
+    "@parcel/plugin": "2.12.0",
+    "@parcel/utils": "2.12.0",
     "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"
   },
-  "gitHead": "f8076f1644cabc944695b5ec82602c8ae32bcf21"
+  "gitHead": "2059029ee91e5f03a273b0954d3e629d7375f986"
 }

package/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);
       }
     }