Merge pull request #242786 in DEC/fineui from master to feature/x

* commit '06b3c63748bba84efb27fb7e5deb7a3b32af405e':
  无JIRA  自定义less变量构建

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
 );
 

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,
     },
 });