Merge branch 'develop-codemirror-v6' of https://github.com/processing/p5.js-web-editor into develop-codemirror-v6

Author: khanniie

client/modules/IDE/components/Editor/stateUtils.js

@@ -49,14 +49,15 @@ import { html } from '@codemirror/lang-html';
 import { json, jsonParseLinter } from '@codemirror/lang-json';
 import { xml } from '@codemirror/lang-xml';
 import { linter } from '@codemirror/lint';
-import { JSHINT } from 'jshint';
 import { HTMLHint } from 'htmlhint';
 import { CSSLint } from 'csslint';
 import { emmetConfig } from '@emmetio/codemirror6-plugin';
 import { color as colorPicker } from '@connieye/codemirror-color-picker';
 
-import p5JavaScript from './p5JavaScript';
+import { esLint } from '@codemirror/lang-javascript';
+import { Linter as ESLinter } from 'eslint-linter-browserify';
 import { tidyCodeWithPrettier } from './tidier';
+import p5JavaScript from './p5JavaScript';
 import { highlightStyle } from './highlightStyle';
 import { errorDecorationStateField } from './consoleErrorDecoration';
 
@@ -182,53 +183,17 @@ function makeHtmlLinter(callback) {
   };
 }
 
-const JSHINT_OPTIONS = {
-  asi: true,
-  eqeqeq: false,
-  '-W041': false,
-  esversion: 11
+const ESLINT_CONFIG = {
+  languageOptions: {
+    ecmaVersion: 2021
+  },
+  rules: {
+    semi: 'off',
+    eqeqeq: 'off'
+  }
 };
 
-// TODO: Consider using ESLINT instead
-function makeJsLinter(callback) {
-  return (view) => {
-    const documentContent = view.state.doc.toString();
-
-    // Run JSHINT
-    JSHINT(documentContent, JSHINT_OPTIONS);
-    const { errors } = JSHINT;
-
-    // Return errors
-    const diagnostics = [];
-    errors.forEach((error) => {
-      if (!error) return;
-
-      const { line: errorLine, character: errorCharacter, evidence } = error;
-      const cmLine = view.state.doc.line(errorLine);
-
-      // https://github.com/codemirror/codemirror5/blob/master/addon/lint/javascript-lint.js
-      const start = errorCharacter - 1;
-      let end = start + 1;
-      if (evidence) {
-        const index = evidence.substring(start).search(/.\b/);
-        if (index > -1) {
-          end += index;
-        }
-      }
-
-      diagnostics.push({
-        from: cmLine.from + start,
-        to: cmLine.from + end,
-        severity: error.code.startsWith('W') ? 'warning' : 'error',
-        message: error.reason
-      });
-    });
-
-    if (callback) callback(diagnostics);
-
-    return diagnostics;
-  };
-}
+const eslint = new ESLinter();
 
 function makeJsonLinter(callback) {
   const baseJsonLinter = jsonParseLinter();
@@ -244,7 +209,7 @@ function getFileLinter(fileName, callback) {
 
   switch (fileMode) {
     case 'javascript':
-      return linter(makeJsLinter(callback));
+      return linter(esLint(eslint, ESLINT_CONFIG));
     case 'html':
       return linter(makeHtmlLinter(callback));
     case 'css':

package-lock.json

@@ -266,6 +266,7 @@
     "dotenv": "^2.0.0",
     "dropzone": "^4.3.0",
     "escape-string-regexp": "^1.0.5",
+    "eslint-linter-browserify": "^10.0.3",
     "eslint-scope": "^8.4.0",
     "eslint-webpack-plugin": "^3.1.1",
     "express": "^4.22.1",