Merge remote-tracking branch 'upstream/main' into feat/support-search…

…-view

.github/workflows/cd.yaml

@@ -0,0 +1,18 @@
+name: CD
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  cd:
+    uses: halo-sigs/reusable-workflows/.github/workflows/plugin-cd.yaml@v1
+    secrets:
+      halo-username: ${{ secrets.HALO_USERNAME }}
+      halo-password: ${{ secrets.HALO_PASSWORD }}
+    permissions:
+      contents: write
+    with:
+      app-id: app-DlacW
+      ui-path: "."

.github/workflows/ci.yaml

@@ -0,0 +1,15 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  ci:
+    uses: halo-sigs/reusable-workflows/.github/workflows/plugin-ci.yaml@v1
+    with:
+      ui-path: "."

build.gradle

@@ -31,15 +31,24 @@ node {
     nodeProjectDir = file("${project.projectDir}")
 }
 
-task buildFrontend(type: PnpmTask) {
+tasks.register('installDepsForUI', PnpmTask) {
+    args = ['install']
+}
+
+tasks.register('buildFrontend', PnpmTask) {
     args = ['build:packages']
+    dependsOn('installDepsForUI')
 }
 
-build {
-    // build frontend before build
-    tasks.getByName('compileJava').dependsOn('buildFrontend')
+tasks.named('build').configure {
+    dependsOn('buildFrontend')
 }
 
 halo {
+<<<<<<< HEAD
     version = "2.17.0"
-}
+}
+=======
+    version = "2.12.0"
+}
+>>>>>>> upstream/main

src/main/java/run/halo/search/widget/SearchWidgetHeadProcessor.java

@@ -1,25 +1,24 @@
 package run.halo.search.widget;
 
+import java.util.Properties;
 import lombok.RequiredArgsConstructor;
-import org.pf4j.PluginWrapper;
 import org.springframework.stereotype.Component;
 import org.springframework.util.PropertyPlaceholderHelper;
 import org.thymeleaf.context.ITemplateContext;
 import org.thymeleaf.model.IModel;
 import org.thymeleaf.model.IModelFactory;
 import org.thymeleaf.processor.element.IElementModelStructureHandler;
 import reactor.core.publisher.Mono;
+import run.halo.app.plugin.PluginContext;
 import run.halo.app.theme.dialect.TemplateHeadProcessor;
 
-import java.util.Properties;
-
 @Component
 @RequiredArgsConstructor
 public class SearchWidgetHeadProcessor implements TemplateHeadProcessor {
 
     static final PropertyPlaceholderHelper PROPERTY_PLACEHOLDER_HELPER = new PropertyPlaceholderHelper("${", "}");
 
-    private final PluginWrapper pluginWrapper;
+    private final PluginContext pluginContext;
 
     @Override
     public Mono<Void> process(ITemplateContext context, IModel model,
@@ -32,13 +31,13 @@ public Mono<Void> process(ITemplateContext context, IModel model,
     private String searchWidgetScript() {
 
         final Properties properties = new Properties();
-        properties.setProperty("version", pluginWrapper.getDescriptor().getVersion());
+        properties.setProperty("version", pluginContext.getVersion());
 
         return PROPERTY_PLACEHOLDER_HELPER.replacePlaceholders("""
-                <!-- PluginSearchWidget start -->
-                <script src="/plugins/PluginSearchWidget/assets/static/search-widget.iife.js?version=${version}" async></script>
-                <link rel="stylesheet" href="/plugins/PluginSearchWidget/assets/static/style.css?version=${version}" />
-                <!-- PluginSearchWidget end -->
-                """, properties);
+            <!-- PluginSearchWidget start -->
+            <script src="/plugins/PluginSearchWidget/assets/static/search-widget.iife.js?version=${version}" async></script>
+            <link rel="stylesheet" href="/plugins/PluginSearchWidget/assets/static/style.css?version=${version}" />
+            <!-- PluginSearchWidget end -->
+            """, properties);
     }
 }

src/main/java/run/halo/search/widget/SearchWidgetPlugin.java

@@ -1,17 +1,17 @@
 package run.halo.search.widget;
 
-import org.pf4j.PluginWrapper;
 import org.springframework.stereotype.Component;
 import run.halo.app.plugin.BasePlugin;
+import run.halo.app.plugin.PluginContext;
 
 /**
  * @author ryanwang
  */
 @Component
 public class SearchWidgetPlugin extends BasePlugin {
 
-    public SearchWidgetPlugin(PluginWrapper wrapper) {
-        super(wrapper);
+    public SearchWidgetPlugin(PluginContext pluginContext) {
+        super(pluginContext);
     }
 
     @Override