Fixes #25308 - Additional support for plugins with React

theforeman · Oct 26, 2018 · 11165fa · 11165fa
1 parent 0c08b71
commit 11165fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/app/helpers/reactjs_helper.rb b/app/helpers/reactjs_helper.rb
@@ -9,6 +9,10 @@ def webpacked_plugins_js_for(*plugin_names)
     js_tags_for(select_requested_plugins(plugin_names)).join.html_safe
   end
 
+  def webpacked_plugins_css_for(*plugin_names)
+    css_tags_for(select_requested_plugins(plugin_names)).join.html_safe
+  end
+
   def select_requested_plugins(plugin_names)
     available_plugins = Foreman::Plugin.with_webpack.map(&:id)
     missing_plugins = plugin_names - available_plugins
@@ -24,4 +28,10 @@ def js_tags_for(requested_plugins)
       javascript_include_tag(*webpack_asset_paths(plugin.to_s, :extension => 'js'), "data-turbolinks-track" => true)
     end
   end
+
+  def css_tags_for(requested_plugins)
+    requested_plugins.map do |plugin|
+      stylesheet_link_tag(*webpack_asset_paths(plugin.to_s, :extension => 'css'), "data-turbolinks-track" => true)
+    end
+  end
 end
diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -122,6 +122,7 @@ module.exports = env => {
         paths: true,
         collections: true,
         flattening: true,
+        shorthands: true
       }),
       // must match config.webpack.manifest_filename
       new StatsWriterPlugin({