From 88b5e190a683188fccc2f1ffbae1d2204170c6f0 Mon Sep 17 00:00:00 2001 From: guqing Date: Thu, 15 Aug 2024 17:29:31 +0800 Subject: [PATCH] refactor: rename and restructure enabled plugins in bundle.js --- .../extension/service/impl/PluginServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/application/src/main/java/run/halo/app/core/extension/service/impl/PluginServiceImpl.java b/application/src/main/java/run/halo/app/core/extension/service/impl/PluginServiceImpl.java index e1ab070fd..817ea1d05 100644 --- a/application/src/main/java/run/halo/app/core/extension/service/impl/PluginServiceImpl.java +++ b/application/src/main/java/run/halo/app/core/extension/service/impl/PluginServiceImpl.java @@ -230,10 +230,16 @@ public class PluginServiceImpl implements PluginService, InitializingBean, Dispo public Flux uglifyJsBundle() { var startedPlugins = List.copyOf(pluginManager.getStartedPlugins()); String plugins = """ - this.enabledPluginNames = [%s]; + this.enabledPlugins = [%s] """.formatted(startedPlugins.stream() - .map(PluginWrapper::getPluginId) - .collect(Collectors.joining("','", "'", "'"))); + .map(plugin -> """ + { + "name": "%s", + "version": "%s" + } + """.formatted(plugin.getPluginId(), plugin.getDescriptor().getVersion()) + ) + .collect(Collectors.joining(", "))); return Flux.fromIterable(startedPlugins) .mapNotNull(pluginWrapper -> { var pluginName = pluginWrapper.getPluginId();