Check for webpacker.yml before setting source (#2366)

rails · Nov 12, 2019 · 93152cf · 93152cf
1 parent f36e5ed
commit 93152cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/webpacker/env.rb b/lib/webpacker/env.rb
@@ -12,7 +12,7 @@ def initialize(webpacker)
   end
 
   def inquire
-    fallback_env_warning unless current
+    fallback_env_warning if config_path.exist? && !current
     current || DEFAULT.inquiry
   end
 

diff --git a/lib/webpacker/railtie.rb b/lib/webpacker/railtie.rb
@@ -91,6 +91,8 @@ class Webpacker::Engine < ::Rails::Engine
   end
 
   initializer "webpacker.set_source" do |app|
-    app.config.javascript_path = Webpacker.config.source_path.relative_path_from(Rails.root.join("app")).to_s
+    if Webpacker.config.config_path.exist?
+      app.config.javascript_path = Webpacker.config.source_path.relative_path_from(Rails.root.join("app")).to_s
+    end
   end
 end