Skip to content

feat: add plugin version param for static resources #29

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
merged 2 commits into from
Sep 13, 2024
Merged

feat: add plugin version param for static resources #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c983f
feat: add plugin version param for static resources
ruibaby Sep 13, 2024
73d37c6
Remove unused imports
ruibaby Sep 13, 2024
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
14 changes: 9 additions & 5 deletions src/main/java/run/halo/highlightjs/HighlightJSHeadProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.thymeleaf.spring6.SpringTemplateEngine;
import org.thymeleaf.web.IWebRequest;
import reactor.core.publisher.Mono;
import run.halo.app.plugin.PluginContext;
import run.halo.app.plugin.ReactiveSettingFetcher;
import run.halo.app.theme.dialect.TemplateHeadProcessor;

Expand All @@ -38,6 +39,8 @@ public class HighlightJSHeadProcessor implements TemplateHeadProcessor {

private final ReactiveSettingFetcher reactiveSettingFetcher;

private final PluginContext pluginContext;

private final RouteMatcher routeMatcher = createRouteMatcher();

private final TemplateEngine templateEngine = new SpringTemplateEngine();
Expand Down Expand Up @@ -68,18 +71,19 @@ public Mono<Void> process(ITemplateContext context, IModel model, IElementModelS
private String highlightJsScript(BasicConfig basicConfig) {
var context = new Context();
context.setVariable("config", basicConfig);
context.setVariable("version", pluginContext.getVersion());
var code = templateEngine.process(
"""
<!-- PluginHighlightJS start -->
<link th:href="|/plugins/PluginHighlightJS/assets/static/styles/${config.style}|" rel="stylesheet"/>
<script defer src="/plugins/PluginHighlightJS/assets/static/highlight.min.js"></script>
<link th:href="|/plugins/PluginHighlightJS/assets/static/styles/${config.style}?version=${version}|" rel="stylesheet"/>
<script defer th:src="|/plugins/PluginHighlightJS/assets/static/highlight.min.js?version=${version}|"></script>

<th:block th:if="${config.showCopyButton}">
<link href="/plugins/PluginHighlightJS/assets/static/plugins/highlightjs-copy.css" rel="stylesheet"/>
<script defer src="/plugins/PluginHighlightJS/assets/static/plugins/highlightjs-copy.js"></script>
<link th:href="|/plugins/PluginHighlightJS/assets/static/plugins/highlightjs-copy.css?version=${version}|" rel="stylesheet"/>
<script defer th:src="|/plugins/PluginHighlightJS/assets/static/plugins/highlightjs-copy.js?version=${version}|"></script>
</th:block>

<link href="/plugins/PluginHighlightJS/assets/static/plugins/override.css" rel="stylesheet"/>
<link th:href="|/plugins/PluginHighlightJS/assets/static/plugins/override.css?version=${version}|" rel="stylesheet"/>

<script th:inline="javascript">
document.addEventListener("DOMContentLoaded", function () {
Expand Down