Skip to content

Refs #37102 - detect plugins webpack by looking for remoteEntry.js #10025

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

Merged
evgeni merged 1 commit into from
Jan 30, 2024
Merged

Refs #37102 - detect plugins webpack by looking for remoteEntry.js #10025

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
8 changes: 7 additions & 1 deletion app/registries/foreman/plugin/assets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,14 @@ def webpack_manifest_path
File.file?(manifest_path) ? manifest_path : nil
end

def webpack_remote_entry
webpack_id = id.to_s.tr('-', '_')
remote_entry_path = File.join(path, 'public', 'webpack', webpack_id, "#{webpack_id}_remoteEntry.js")
File.file?(remote_entry_path) ? remote_entry_path : nil
end

def uses_webpack?
path && (File.file?(File.join(path, 'webpack', 'index.js')) || webpack_manifest_path.present?)
path && (File.file?(File.join(path, 'webpack', 'index.js')) || webpack_manifest_path.present? || webpack_remote_entry.present?)

@evgeni evgeni Jan 30, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

arguably, webpack_manifest_path.present? can be dropped now
also, this method hits the disk on every page load, we should cache the result in memory (but scope creep!)

@ekohl ekohl Jan 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Which is exactly what I aimed at in #9834 (comment) but I should have pushed further on this.

@evgeni evgeni Jan 30, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

you mean "hits the disk" part?

@MariaAga MariaAga Jan 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

When is path && (File.file?(File.join(path, 'webpack', 'index.js')) false? I only see it as true all the time

@evgeni evgeni Jan 30, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

when we use RPMs as we do not ship the webpack folder at all there, as we do not need to compile anything from it on the system where we deploy.

end

private
Expand Down