Merge remote-tracking branch 'upstream/pull/5042'

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

diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake
index 7d30fc0b65cc3112bfe844a610533b5a22e25200..790ef150d6e7b3220921348ee373857eb86356de 100644 (file)
--- a/lib/tasks/eslint.rake
+++ b/lib/tasks/eslint.rake
@@ -1,20 +1,20 @@
 task "eslint" => "eslint:check"
 
-namespace "eslint" do
-  def yarn_path
-    Rails.root.join("bin", "yarn").to_s
-  end
+def yarn_path
+  Rails.root.join("bin/yarn").to_s
+end
 
-  def config_file
-    Rails.root.join("config", "eslint.json").to_s
-  end
+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.match?(%r{/(gems|vendor|i18n)/})
-    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
     system(yarn_path, "run", "eslint", "-c", config_file, *js_files) || abort
   end