From 05003f327e862650c84b2c09ae6276fc9ef4d819 Mon Sep 17 00:00:00 2001
From: Karel Hala <khala@redhat.com>
Date: Tue, 15 Aug 2017 15:55:09 +0200
Subject: [PATCH] Store all javascripts under plugin's name folder when running
 webpacker

---
 app/views/layouts/application.html.haml | 2 +-
 config/webpack/shared.js                | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 81b76dce1d5..d44050a7fb6 100644
--- 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
index bc7d769e962..573638a7ead 100644
--- 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
     }, {}
   ),