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

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

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