Make assets.rb cleaner

Author: justin808

Diff for: app/assets/javascripts/application_static.js.erb renamed to app/assets/javascripts/application_static.js

@@ -7,10 +7,8 @@
 // CRITICAL that webpack/vendor-bundle must be BEFORE turbolinks
 // since it is exposing jQuery and jQuery-ujs
 
-<% if ENV["REACT_ON_RAILS_ENV"] != "HOT" %>
-  <% require_asset "vendor-bundle" %>
-  <% require_asset "app-bundle" %>
-<% end %>
+//= require vendor-bundle
+//= require app-bundle
 
 // Non-webpack assets incl turbolinks
 //= require application_non_webpack

Diff for: config/initializers/assets.rb

@@ -8,7 +8,11 @@
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w(
-  application_*.*
-  server-bundle.js
-)
+Rails.application.config.assets.precompile << "server-bundle.js"
+
+type = ENV["REACT_ON_RAILS_ENV"] == "HOT" ? "non_webpack" : "static"
+Rails.application.config.assets.precompile +=
+  [
+    "application_#{type}.js",
+    "application_#{type}.css"
+  ]