Merge branch 'pull/5640'

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

diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake
index 790ef150d6e7b3220921348ee373857eb86356de..17f28a4e9cb4ef134a4ac205690159499ff3b9ad 100644 (file)
--- 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
 
   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.match?(%r{/(gems|vendor|i18n|node_modules)/})
-  end
-end
-

 namespace "eslint" do
   task :check => :environment do
 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
   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
   end
 end