Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

webpack5 #10735

Merged
merged 1 commit into from
Jan 26, 2024
Merged

webpack5 #10735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/views/overrides/activation_keys/_host_synced_content_select.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
:class => 'form-control', :name => ks_repo_select_name, :disabled => kickstart_options.empty?
end %>

<script>
KT.hosts.set_media_selection_bindings();
KT.hosts.update_media_enablement();
</script>
<% content_for(:javascripts) do -%>
<script>
KT.hosts.set_media_selection_bindings();
KT.hosts.update_media_enablement();
</script>
<% end -%>
17 changes: 0 additions & 17 deletions engines/bastion/app/assets/javascripts/bastion/bastion-bootstrap.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions engines/bastion/app/assets/javascripts/bastion/bastion.js
View file
Open in desktop
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"
8 changes: 6 additions & 2 deletions engines/bastion/app/views/bastion/layouts/assets.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) %>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks very similar to what js_tags_for(requested_plugins) already does for katello, except that this calls it for common_index and the other does it for index.

I'm trying to understand what common_index.js even does. I don't see anything that includes it and it only requires ngreact. If you don't have this, what happens? If it's needed, can it just be moved into katello's index.js?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It loads angular, and since angular is not needed in all of Katello I think we shouldn't move it to index.
Without angular pages are just empty.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense. Thanks for explaining.

<%= 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">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What defines this type? Is it webpack itself or something else?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looked more correct to use module than text/javascript https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules

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 %>");
Expand All @@ -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 %>
Expand Down
74 changes: 45 additions & 29 deletions engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,45 @@
BASTION_MODULES.push(
'Bastion.capsule-content',
'Bastion.pulp-primary',
'Bastion.activation-keys',
'Bastion.architectures' ,
'Bastion.common',
'Bastion.content-views',
'Bastion.content-views.versions',
'Bastion.debs',
'Bastion.docker-tags',
'Bastion.files',
'Bastion.ansible-collections',
'Bastion.hosts',
'Bastion.module-streams',
'Bastion.environments',
'Bastion.content-credentials',
'Bastion.hosts',
'Bastion.capsules',
'Bastion.organizations',
'Bastion.products',
'Bastion.repositories',
'Bastion.subscriptions',
'Bastion.sync-plans',
'Bastion.http-proxies',
'Bastion.host-collections',
'Bastion.content-hosts',
'Bastion.tasks',
'Bastion.settings'
);
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',
'Bastion.architectures',
'Bastion.common',
'Bastion.content-views',
'Bastion.content-views.versions',
'Bastion.debs',
'Bastion.docker-tags',
'Bastion.files',
'Bastion.ansible-collections',
'Bastion.hosts',
'Bastion.module-streams',
'Bastion.environments',
'Bastion.content-credentials',
'Bastion.hosts',
'Bastion.capsules',
'Bastion.organizations',
'Bastion.products',
'Bastion.repositories',
'Bastion.subscriptions',
'Bastion.sync-plans',
'Bastion.http-proxies',
'Bastion.host-collections',
'Bastion.content-hosts',
'Bastion.tasks',
'Bastion.settings'
];

// Check if the document has already been bootstrapped.
if (!angular.element(document).injector()) {
angular.bootstrap(document, BASTION_MODULES);
}
6 changes: 0 additions & 6 deletions engines/bastion_katello/lib/bastion_katello/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ class Engine < ::Rails::Engine

Bastion.register_plugin(
:name => 'bastion_katello',
:javascript => proc do
[
javascript_include_tag(*webpack_asset_paths('katello:common', :extension => 'js'), "data-turbolinks-track" => true),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke the "Sync Status" (/katello/sync_management) page, as the console now contains the following error:

63:2 Uncaught ReferenceError: localize is not defined

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking into that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's an ERB page, I wonder why we're even loading Katello JS here 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

created #10873

javascript_include_tag('bastion_katello/bastion_katello')
]
end,
:stylesheet => 'bastion_katello/bastion_katello',
:pages => %w(
activation_keys
Expand Down
Loading