Store all javascripts under plugin's name folder when running webpacker

ManageIQ · Aug 15, 2017 · 05003f3 · 05003f3
1 parent cad5591
commit 05003f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -32,7 +32,7 @@
       = csrf_meta_tag
       = render :partial => 'layouts/i18n_js'
       -# FIXME: the conditional below is a temporary fix for a webpacker issue, remove when it's resolved
-      = javascript_pack_tag 'application' unless Rails.env.test?
+      = javascript_pack_tag 'manageiq-ui-classic/application' unless Rails.env.test?
 
       :javascript
         ManageIQ.charts.provider = "#{Charting.backend}";

diff --git a/config/webpack/shared.js b/config/webpack/shared.js
@@ -27,8 +27,7 @@ module.exports = {
   entry: packPaths.reduce(
     (map, entry) => {
       const pluginName = dirname(entry).substring(0, dirname(entry).length - join(entryPath).length)
-      const prefix = basename(entry, extname(entry)) === 'application' ? '' : basename(pluginName) + '/'
-      map[prefix + basename(entry, extname(entry))] = resolve(entry)
+      map[join(basename(pluginName), basename(entry, extname(entry)))] = resolve(entry)
       return map
     }, {}
   ),