webpack5 working

Katello · Sep 6, 2023 · 19e0a3a · 19e0a3a
1 parent 5dc6942
commit 19e0a3a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 25 deletions.
diff --git a/engines/bastion/app/assets/javascripts/bastion/bastion-bootstrap.js b/engines/bastion/app/assets/javascripts/bastion/bastion-bootstrap.js
diff --git a/engines/bastion/app/assets/javascripts/bastion/bastion.js b/engines/bastion/app/assets/javascripts/bastion/bastion.js
@@ -36,5 +36,3 @@
 
 //= require "bastion/features/features.module"
 //= require_tree "./features"
-
-//= require "bastion/bastion-bootstrap"
diff --git a/engines/bastion/app/views/bastion/layouts/assets.html.erb b/engines/bastion/app/views/bastion/layouts/assets.html.erb
@@ -10,11 +10,13 @@
 <% end %>
 
 <% content_for(:javascripts) do %>
-  <%= javascript_include_tag 'bastion/bastion' %>
+
+  <%=  javascript_tag("window.tfm.tools.loadPluginModule('/webpack/katello','katello','./common_index');".html_safe) %>
+  <%= javascript_include_tag('bastion/bastion' , {type: 'module'})%>
   <% if File.exist?("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path(I18n.locale)}") %>
     <%= javascript_include_tag(Bastion.localization_path(I18n.locale)) %>
   <% end %>
-  <script type="text/javascript">
+  <script type="module">
     angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
     angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
@@ -34,6 +36,8 @@
     angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
     angular.module('Bastion').value('experimentalLabsSetting', "<%= Setting[:lab_features] %>");
   </script>
+
+  <%= javascript_include_tag('bastion_katello/bastion_katello',  {type: 'module'}) %>
   <% Bastion.plugins.each do |name, plugin| %>
     <%= include_plugin_js(plugin) %>
   <% end %>

diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js
@@ -1,4 +1,16 @@
-BASTION_MODULES.push(
+
+var BASTION_MODULES = [
+    'angular-blocks',
+    'ngAnimate',
+    'ngSanitize',
+    'templates',
+    'ui.bootstrap',
+    'ui.bootstrap.tpls',
+    'Bastion.auth',
+    'Bastion.menu',
+    'Bastion.i18n',
+    'Bastion.features',
+    'Bastion.routing',    
     'Bastion.capsule-content',
     'Bastion.pulp-primary',
     'Bastion.activation-keys',
@@ -26,4 +38,6 @@ BASTION_MODULES.push(
     'Bastion.content-hosts',
     'Bastion.tasks',
     'Bastion.settings'
-);
+  ];
+
+angular.bootstrap(document, BASTION_MODULES);
diff --git a/engines/bastion_katello/lib/bastion_katello/engine.rb b/engines/bastion_katello/lib/bastion_katello/engine.rb
@@ -16,8 +16,7 @@ class Engine < ::Rails::Engine
         :name => 'bastion_katello',
         :javascript => proc do
           [
-            javascript_include_tag(*webpack_asset_paths('katello:common', :extension => 'js'), "data-turbolinks-track" => true),
-            javascript_include_tag('bastion_katello/bastion_katello')
+
           ]
         end,
         :stylesheet => 'bastion_katello/bastion_katello',
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,5 +36,3 @@

		//= require "bastion/features/features.module"
		//= require_tree "./features"

		//= require "bastion/bastion-bootstrap"