Work around borked eslint Vue plugin

Stop running eslint as part of our build; instead run it as a separate CI step.
ledgersmb · Aug 7, 2023 · f5a231c · f5a231c
1 parent 13735ae
commit f5a231c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -88,9 +88,13 @@ jobs:
           path: UI/js
           key: dojo-${{ hashFiles('UI/js-src/**', 'UI/src/**', 'UI/css/**','UI/**/*.html','doc/sources/**') }}
 
+      - name: Linting
+        run: |
+          make lint
+
       - name: Build Dojo
         run: |
-          make dojo
+          make js
           make readme
         if: steps.cache-dojo.outputs.cache-hit != 'true' ||
             steps.cache-node_modules.outputs.cache-hit != 'true'

diff --git a/Makefile b/Makefile
@@ -97,6 +97,9 @@ js: npm_install
 jsdev: npm_install
 	$(DOCKER_CMD) $(SHELL) -c 'cd UI && npm run build:dev'
 
+lint:
+	$(DOCKER_CMD) $(SHELL) -c 'cd UI && npm run lint'
+
 jslint:
 ifneq ($(origin FIX),undefined)
 	$(DOCKER_CMD) $(SHELL) -c 'cd UI && npm run lint:js:fix'

diff --git a/UI/package.json b/UI/package.json
@@ -145,11 +145,11 @@
     "analyzer": "webpack-bundle-analyzer logs/stats.json UI/js -h 0.0.0.0",
     "build": "webpack --mode=production --stats errors-warnings",
     "build:dev": "webpack --progress --mode=development --stats errors-warnings",
-    "lint": "npm run lint:css;npm run lint:js;npm run lint:markdown;npm run lint:vue",
-    "lint:css": "stylelint UI/css/*.css",
+    "lint": "npm run lint:css && npm run lint:js && npm run lint:markdown && npm run lint:vue",
+    "lint:css": "stylelint css/*.css",
     "lint:js": "eslint --ext .js ./",
     "lint:js:fix": "eslint --fix --ext .js ./",
-    "lint:markdown": "markdownlint --config .markdownlint.json --ignore ./node_modules .",
+    "lint:markdown": "markdownlint --config ../.markdownlint.json --ignore ./node_modules --ignore ./js .",
     "lint:vue": "eslint --ext .vue ./",
     "lint:vue:fix": "eslint --fix --ext .vue ./",
     "profile": "webpack --progress=profile --json > logs/stats.json",
@@ -197,7 +197,14 @@
           "jest/prefer-expect-assertions": "off",
           "jest/no-commented-out-tests": "off",
           "no-console": "off",
-          "camelcase": "off",
+          "camelcase": "off"
+        }
+      },
+      {
+        "files": [
+          "**/*.vue"
+        ],
+        "rules": {
           "vue/no-setup-props-destructure": "off"
         }
       }

diff --git a/UI/webpack.config.js b/UI/webpack.config.js
@@ -17,7 +17,6 @@ if (TARGET !== "readme") {
     const CopyWebpackPlugin = require("copy-webpack-plugin");
     const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
     const DojoWebpackPlugin = require("dojo-webpack-plugin");
-    const ESLintPlugin = require("eslint-webpack-plugin");
     const HtmlWebpackPlugin = require("html-webpack-plugin");
     const MiniCssExtractPlugin = require("mini-css-extract-plugin");
     const StylelintPlugin = require("stylelint-webpack-plugin");
@@ -172,13 +171,6 @@ if (TARGET !== "readme") {
         verbose: false
     }; // delete all files in the js directory without deleting this folder
 
-    const ESLintPluginOptions = {
-        files: ["**/*.js","**/*.vue"],
-        exclude: ["node_modules", "./bootstrap.js"],
-        emitError: prodMode,
-        emitWarning: !prodMode
-    };
-
     const StylelintPluginOptions = {
         files: "**/*.css"
     };
@@ -269,7 +261,6 @@ if (TARGET !== "readme") {
 
     var pluginsProd = [
         // Lint the sources
-        new ESLintPlugin(ESLintPluginOptions),
         new StylelintPlugin(StylelintPluginOptions),
 
         // Add Vue