Merge pull request #1919 from karelhala/webpackerNamespace

Change webpacker to store plugin javascript in corespoding folder
ManageIQ · Aug 15, 2017 · 353f0d3 · 353f0d3
2 parents f06130f + 05003f3
commit 353f0d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 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
@@ -26,10 +26,9 @@ Object.keys(engines).forEach(function(k) {
 module.exports = {
   entry: packPaths.reduce(
     (map, entry) => {
-      const localMap = map
-      const namespace = relative(join(entryPath), dirname(entry))
-      localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry)
-      return localMap
+      const pluginName = dirname(entry).substring(0, dirname(entry).length - join(entryPath).length)
+      map[join(basename(pluginName), basename(entry, extname(entry)))] = resolve(entry)
+      return map
     }, {}
   ),