From a91c64bbd5e96b97342ad74c1b9176e20f768e8b Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@foxmail.com>
Date: Mon, 23 Jun 2025 22:51:58 +0800
Subject: [PATCH] Make sure the processUiResources task is executed after
 processResources (#54)

---
 build.gradle    |  6 ++++--
 ui/build.gradle | 35 +++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index c0095ee..0676934 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,11 +35,13 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 tasks.register('processUiResources', Copy) {
-    from project(':ui').tasks.named('buildFrontend')
+    from project(':ui').layout.buildDirectory.dir('dist')
     into layout.buildDirectory.dir('resources/main/console')
+    dependsOn project(':ui').tasks.named('assemble')
+    shouldRunAfter tasks.named('processResources')
 }
 
-tasks.named('processResources', ProcessResources) {
+tasks.named('classes') {
     dependsOn tasks.named('processUiResources')
 }
 
diff --git a/ui/build.gradle b/ui/build.gradle
index 006ba6d..03296b4 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -1,30 +1,33 @@
 plugins {
-  id 'base'
-  id "com.github.node-gradle.node" version "7.1.0"
+    id 'base'
+    id "com.github.node-gradle.node" version "7.1.0"
 }
 
 group 'run.halo.starter.ui'
 
 tasks.register('buildFrontend', PnpmTask) {
-  args = ['build']
-  dependsOn tasks.named('pnpmInstall')
-  inputs.dir(layout.projectDirectory.dir('src'))
-  inputs.files(fileTree(
-    dir: layout.projectDirectory,
-    includes: ['*.cjs', '*.ts', '*.js', '*.json', '*.yaml']))
-  outputs.dir(layout.buildDirectory.dir('dist'))
-  shouldRunAfter(tasks.named('check'))
+    group = 'build'
+    description = 'Builds the UI project using pnpm.'
+    args = ['build']
+    dependsOn tasks.named('pnpmInstall')
+    inputs.dir(layout.projectDirectory.dir('src'))
+    inputs.files(fileTree(
+            dir: layout.projectDirectory,
+            includes: ['*.cjs', '*.ts', '*.js', '*.json', '*.yaml']))
+    outputs.dir(layout.buildDirectory.dir('dist'))
 }
 
-tasks.register('checkFrontend', PnpmTask) {
-  args = ['test:unit']
-  dependsOn tasks.named('pnpmInstall')
+tasks.register('pnpmCheck', PnpmTask) {
+    group = 'verification'
+    description = 'Runs unit tests using pnpm.'
+    args = ['test:unit']
+    dependsOn tasks.named('pnpmInstall')
 }
 
 tasks.named('check') {
-  dependsOn tasks.named('checkFrontend')
+    dependsOn tasks.named('pnpmCheck')
 }
 
-tasks.named('build') {
-  dependsOn tasks.named('buildFrontend')
+tasks.named('assemble') {
+    dependsOn tasks.named('buildFrontend')
 }