From: Tom Hughes <tom@compton.nu>
Date: Sun, 9 Feb 2025 19:35:19 +0000 (+0000)
Subject: Move eslint ignore rules to the configuration file
X-Git-Tag: live~69^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/275228dec7d6017eb6ccb411b49a9bb3ec9bea8b?hp=--cc

Move eslint ignore rules to the configuration file

Instead of having the rake task select which files to check, just
check the whole tree and have eslint ignore third party files and
generated files that we don't control.
---

275228dec7d6017eb6ccb411b49a9bb3ec9bea8b
diff --git a/config/eslint.js b/config/eslint.js
index 90040f7bf..1bf65695b 100644
--- a/config/eslint.js
+++ b/config/eslint.js
@@ -6,6 +6,14 @@ const stylisticJs = require("@stylistic/eslint-plugin-js");
 module.exports = [
   js.configs.recommended,
   erb.configs.recommended,
+  {
+    ignores: [
+      "app/assets/javascripts/i18n/",
+      "coverage/assets/",
+      "public/assets/",
+      "vendor/"
+    ]
+  },
   {
     plugins: {
       "@stylistic": stylisticJs
diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake
index 27b550e40..17f28a4e9 100644
--- a/lib/tasks/eslint.rake
+++ b/lib/tasks/eslint.rake
@@ -8,18 +8,12 @@ def config_file
   Rails.root.join("config/eslint.js").to_s
 end
 
-def js_files
-  Rails.application.assets.each_file.select do |file|
-    (file.ends_with?(".js") || file.ends_with?(".js.erb")) && !file.match?(%r{/(gems|vendor|i18n|node_modules)/})
-  end
-end
-
 namespace "eslint" do
   task :check => :environment do
-    system(yarn_path, "run", "eslint", "-c", config_file, *js_files) || abort
+    system(yarn_path, "run", "eslint", "-c", config_file, "--no-warn-ignored", Rails.root.to_s) || abort
   end
 
   task :fix => :environment do
-    system(yarn_path, "run", "eslint", "-c", config_file, "--fix", *js_files) || abort
+    system(yarn_path, "run", "eslint", "-c", config_file, "--no-warn-ignored", "--fix", Rails.root.to_s) || abort
   end
 end