Fixes #25882 - compile extra bundles during plugin compile

theforeman · Jan 22, 2019 · 202c65d · 202c65d
1 parent 9d7c4d2
commit 202c65d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -71,6 +71,12 @@ module.exports = env => {
   if (env && env.pluginName !== undefined) {
     var pluginEntries = {};
     pluginEntries[env.pluginName] = plugins['entries'][env.pluginName];
+    for (var entry of plugins['entries']) {
+      if (entry.startsWith(env.pluginName + ":")) {
+          pluginEntries[entry] = plugins['entries'][entry]
+      }
+    };
+
     var outputPath = path.join(plugins['plugins'][env.pluginName]['root'], 'public', 'webpack');
     var jsFilename = production ? env.pluginName + '/[name]-[chunkhash].js' : env.pluginName + '/[name].js';
     var cssFilename = production ? env.pluginName + '/[name]-[chunkhash].css' : env.pluginName + '/[name].css';

diff --git a/script/plugin_webpack_directories.rb b/script/plugin_webpack_directories.rb
@@ -27,7 +27,7 @@ def log_plugin(plugin_name)
 def entry_name(plugin_name, entry)
   prefix = File.basename(entry).gsub(/[_]?index.js$/, '')
   if prefix != ''
-    "#{plugin_name}_#{prefix}"
+    "#{plugin_name}:#{prefix}"
   else
     plugin_name
   end