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

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

diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake
index 7f96531d9d0835ece408c9ad3dedc0d99fadfb1f..27b550e40bd1f00ff0be62f75c43d5c67f4d08a2 100644 (file)
--- a/lib/tasks/eslint.rake
+++ b/lib/tasks/eslint.rake
@@ -5,12 +5,12 @@ def yarn_path
 end
 
 def config_file
 end
 
 def config_file

-  Rails.root.join("config/eslint.json").to_s
+  Rails.root.join("config/eslint.js").to_s

 end
 
 def js_files
   Rails.application.assets.each_file.select do |file|
 end
 
 def js_files
   Rails.application.assets.each_file.select do |file|

-    file.ends_with?(".js") && !file.match?(%r{/(gems|vendor|i18n|node_modules)/})
+    (file.ends_with?(".js") || file.ends_with?(".js.erb")) && !file.match?(%r{/(gems|vendor|i18n|node_modules)/})

   end
 end
 
   end
 end