From 5633446434e3b98a04f58e6d345498a3de29afd0 Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@foxmail.com>
Date: Thu, 18 Sep 2025 17:49:06 +0800
Subject: [PATCH] Refactor build tasks to improve UI distribution and cleanup
 processes (#7768)

---
 application/build.gradle |  4 +---
 ui/build.gradle          | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/application/build.gradle b/application/build.gradle
index f16be415f..cd57ea7f2 100644
--- a/application/build.gradle
+++ b/application/build.gradle
@@ -121,9 +121,7 @@ tasks.register('createChecksums', Checksum) {
 tasks.register('copyUiDist', Copy) {
     from project(':ui').layout.buildDirectory.dir('dist')
     into layout.buildDirectory.dir('resources/main')
-    configure {
-        mustRunAfter project(':ui').tasks.named('build')
-    }
+    dependsOn ':ui:doBuild'
 }
 
 tasks.named('processResources', ProcessResources) {
diff --git a/ui/build.gradle b/ui/build.gradle
index 9a2f4b28f..100049921 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -1,5 +1,6 @@
 plugins {
   id 'idea'
+  id 'base'
   alias(libs.plugins.node)
   alias(libs.plugins.openapi.generator)
 }
@@ -16,24 +17,29 @@ idea {
   }
 }
 
-tasks.register('clean', Delete) {
+tasks.named('clean') {
+  dependsOn tasks.named('doClean')
+}
+
+tasks.register('doClean', Delete) {
   delete layout.buildDirectory
   delete fileTree('packages') {
     include '*/dist/**'
   }
 }
 
-tasks.register('build', PnpmTask) {
-  dependsOn tasks.named('check'), tasks.named('buildPackages')
+tasks.named('assemble') {
+  dependsOn tasks.named('doBuild')
+}
+
+tasks.register('doBuild', PnpmTask) {
+  dependsOn tasks.named('buildPackages')
   pnpmCommand = ['run', 'build']
   inputs.files(fileTree(layout.projectDirectory) {
     include 'console-src/**', 'uc-src/**', 'src/**', 'public/**', '*.js', '*.json', '*.yaml', 'index.html'
     exclude '**/node_modules/**', '**/build/**', '**/dist/**'
   })
   outputs.dir(layout.buildDirectory.dir('dist'))
-  configure {
-    shouldRunAfter tasks.named('clean')
-  }
 }
 
 tasks.register('buildPackages', PnpmTask) {
@@ -64,7 +70,7 @@ tasks.register('typecheck', PnpmTask) {
   pnpmCommand = ['run', 'typecheck']
 }
 
-tasks.register('check') {
+tasks.named('check') {
   dependsOn tasks.named('lint'), tasks.named('typecheck'), tasks.named('test')
 }