@parcel/validator-eslint 2.0.0-nightly.97 → 2.0.0-nightly.970

package/lib/EslintValidator.js

@@ -5,22 +5,60 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _plugin = require("@parcel/plugin");
+function _plugin() {
+  const data = require("@parcel/plugin");
+
+  _plugin = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _diagnostic() {
+  const data = require("@parcel/diagnostic");
+
+  _diagnostic = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _eslint() {
+  const data = _interopRequireDefault(require("eslint"));
+
+  _eslint = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
+
+  _assert = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 let cliEngine = null;
 
-var _default = new _plugin.Validator({
+var _default = new (_plugin().Validator)({
   async validate({
-    asset,
-    options
+    asset
   }) {
-    let eslint = await options.packageManager.require('eslint', asset.filePath);
-
     if (!cliEngine) {
-      cliEngine = new eslint.CLIEngine({});
+      cliEngine = new (_eslint().default.CLIEngine)({});
     }
 
     let code = await asset.getCode();
+    (0, _assert().default)(cliEngine != null);
     let report = cliEngine.executeOnText(code, asset.filePath);
     let validatorResult = {
       warnings: [],
@@ -31,26 +69,28 @@ var _default = new _plugin.Validator({
       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: {
-                line: message.line,
-                column: message.column
-              },
-              end: {
+              start,
+              // Parse errors have no ending
+              end: message.endLine != null ? {
                 line: message.endLine,
                 column: message.endColumn
-              },
-              message: message.message
+              } : start,
+              message: (0, _diagnostic().escapeMarkdown)(message.message)
             };
           })
         };
         let diagnostic = {
           origin: '@parcel/validator-eslint',
           message: `ESLint found **${result.errorCount}** __errors__ and **${result.warningCount}** __warnings__.`,
-          filePath: asset.filePath,
-          codeFrame: codeframe
+          codeFrames: [codeframe]
         };
 
         if (result.errorCount > 0) {

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@parcel/validator-eslint",
-  "version": "2.0.0-nightly.97+a63f3fc9",
+  "version": "2.0.0-nightly.970+5a80fbe4",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/parcel"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/parcel-bundler/parcel.git"
@@ -12,13 +16,19 @@
   "main": "lib/EslintValidator.js",
   "source": "src/EslintValidator.js",
   "engines": {
-    "node": ">= 10.0.0",
-    "parcel": "^2.0.0-alpha.1.1"
+    "node": ">= 12.0.0",
+    "parcel": "2.0.0-nightly.968+5a80fbe4"
   },
   "dependencies": {
-    "@parcel/plugin": "2.0.0-nightly.97+a63f3fc9",
-    "@parcel/utils": "2.0.0-nightly.97+a63f3fc9",
-    "chalk": "^2.4.2"
+    "@parcel/plugin": "2.0.0-nightly.970+5a80fbe4",
+    "@parcel/utils": "2.0.0-nightly.970+5a80fbe4",
+    "chalk": "^4.1.0"
+  },
+  "devDependencies": {
+    "eslint": "^6.0.0"
+  },
+  "peerDependencies": {
+    "eslint": "^6.0.0"
   },
-  "gitHead": "a63f3fc9726483219412920faeb255e035f90747"
+  "gitHead": "5a80fbe4af8797d0aab248a66f5254f42f00e83e"
 }

package/src/EslintValidator.js

@@ -1,16 +1,19 @@
 // @flow
 import {Validator} from '@parcel/plugin';
-import type {DiagnosticCodeFrame} from '@parcel/diagnostic';
+import {type DiagnosticCodeFrame, escapeMarkdown} from '@parcel/diagnostic';
+import eslint from 'eslint';
+import invariant from 'assert';
 
 let cliEngine = null;
 
-export default new Validator({
-  async validate({asset, options}) {
-    let eslint = await options.packageManager.require('eslint', asset.filePath);
+export default (new Validator({
+  async validate({asset}) {
     if (!cliEngine) {
       cliEngine = new eslint.CLIEngine({});
     }
     let code = await asset.getCode();
+
+    invariant(cliEngine != null);
     let report = cliEngine.executeOnText(code, asset.filePath);
 
     let validatorResult = {
@@ -23,18 +26,24 @@ export default new Validator({
         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: {
-                line: message.line,
-                column: message.column,
-              },
-              end: {
-                line: message.endLine,
-                column: message.endColumn,
-              },
-              message: message.message,
+              start,
+              // Parse errors have no ending
+              end:
+                message.endLine != null
+                  ? {
+                      line: message.endLine,
+                      column: message.endColumn,
+                    }
+                  : start,
+              message: escapeMarkdown(message.message),
             };
           }),
         };
@@ -42,8 +51,7 @@ export default new Validator({
         let diagnostic = {
           origin: '@parcel/validator-eslint',
           message: `ESLint found **${result.errorCount}** __errors__ and **${result.warningCount}** __warnings__.`,
-          filePath: asset.filePath,
-          codeFrame: codeframe,
+          codeFrames: [codeframe],
         };
 
         if (result.errorCount > 0) {
@@ -56,4 +64,4 @@ export default new Validator({
 
     return validatorResult;
   },
-});
+}): Validator);

package/.babelrc

@@ -1,4 +0,0 @@
-
-{
-  "presets": ["@parcel/babel-preset"]
-}