From 06eb180c696f8054fb0f2abdf7edc40f7e4bf1ba Mon Sep 17 00:00:00 2001
From: dailer <dailer@fanruan.com>
Date: Fri, 28 Jul 2023 08:42:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=20=20=E8=87=AA=E5=AE=9A=E4=B9=89l?=
 =?UTF-8?q?ess=E5=8F=98=E9=87=8F=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fineui/webpack/attachments.js | 8 +++-----
 packages/fineui/webpack/webpack.css.js | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/fineui/webpack/attachments.js b/packages/fineui/webpack/attachments.js
index 3adb47d20..7f4cfa185 100644
--- a/packages/fineui/webpack/attachments.js
+++ b/packages/fineui/webpack/attachments.js
@@ -10,7 +10,7 @@ const basicAttachmentMap = {
     resource: sync(["src/less/resource/**/*.less"]),
     font: sync(["public/less/font.less"]),
     ts: ["./typescript/bundle.ts"],
-    ui: sync(["ui/less/app.less", "ui/less/**/*.less", "ui/js/**/*.js"]),
+    ui: sync(["ui/less/app.less", "ui/less/**/*.less",]),
     less: sync([
         "src/less/core/**/*.less",
         "src/less/theme/**/*.less",
@@ -20,23 +20,21 @@ const basicAttachmentMap = {
         "src/less/component/**/*.less"
     ]),
     js_bundle: sync(["src/bundle.js"]),
-    js_worker: sync(["src/worker.js"])
+    js_worker: sync(["src/worker.js"]),
 };
 
-const bundleCss = [].concat(basicAttachmentMap.less, sync(["public/less/app.less", "public/less/**/*.less"]));
+const bundleCss = uniq([].concat(basicAttachmentMap.less, basicAttachmentMap.ui, sync(["public/less/app.less", "public/less/**/*.less"])));
 
 const fineui = [].concat(
     bundleCss,
     basicAttachmentMap.polyfill,
     basicAttachmentMap.js_bundle,
-    basicAttachmentMap.ui,
     basicAttachmentMap.ts,
     configJS
 );
 
 const fineuiForWorker = [].concat(
     basicAttachmentMap.js_worker,
-    basicAttachmentMap.ui,
     basicAttachmentMap.ts
 );
 
diff --git a/packages/fineui/webpack/webpack.css.js b/packages/fineui/webpack/webpack.css.js
index 428c70865..e70124bbe 100644
--- a/packages/fineui/webpack/webpack.css.js
+++ b/packages/fineui/webpack/webpack.css.js
@@ -6,6 +6,6 @@ prod.entry = {};
 module.exports = merge(prod, {
     mode: "production",
     entry: {
-        [`${process.env.LESS_FILE_NAME}.min`]: attachments.bundleCss,
+        [`${process.env.LESS_FILE_NAME || "custom"}.min`]: attachments.bundleCss,
     },
 });