Merge branch 'pull/5640'

[rails.git] / lib / tasks / eslint.rake

diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake
index 7d30fc0b65cc3112bfe844a610533b5a22e25200..17f28a4e9cb4ef134a4ac205690159499ff3b9ad 100644 (file)
--- a/lib/tasks/eslint.rake
+++ b/lib/tasks/eslint.rake
@@ -1,25 +1,19 @@
 task "eslint" => "eslint:check"
 
-namespace "eslint" do
-  def yarn_path
-    Rails.root.join("bin", "yarn").to_s
-  end
-
-  def config_file
-    Rails.root.join("config", "eslint.json").to_s
-  end
+def yarn_path
+  Rails.root.join("bin/yarn").to_s
+end
 
-  def js_files
-    Rails.application.assets.each_file.select do |file|
-      file.ends_with?(".js") && !file.match?(%r{/(gems|vendor|i18n)/})
-    end
-  end
+def config_file
+  Rails.root.join("config/eslint.js").to_s
+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