From f459a37e8a47cc36ad916dbe0473f62ad814549a Mon Sep 17 00:00:00 2001
From: Treecat <treecat@fanruan.com>
Date: Sun, 23 Apr 2023 10:37:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-14316=20fix:=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/demo/package.json                | 2 +-
 packages/fineui/package.json              | 5 +----
 packages/fineui/webpack/webpack.common.js | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/demo/package.json b/packages/demo/package.json
index 01fe03056..61359751f 100644
--- a/packages/demo/package.json
+++ b/packages/demo/package.json
@@ -11,6 +11,6 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@fui/core": "workspace:^2.0.20230208163847"
+        "@fui/core": "workspace:*"
     }
 }
diff --git a/packages/fineui/package.json b/packages/fineui/package.json
index 3e53fb9b1..ff7314dd6 100644
--- a/packages/fineui/package.json
+++ b/packages/fineui/package.json
@@ -24,10 +24,7 @@
         "dev": "tsc && babel src -d dist/es --config-file ./esm.babel.js -w",
         "build": "tsc && run-p build:*",
         "build:es": "babel src -d dist/es --config-file ./esm.babel.js",
-        "build:fineui": "webpack --progress --config=webpack/webpack.prod.js",
-        "webpack:css": "webpack --config=webpack/webpack.css.js --mode production",
-        "build:biCss": "cross-env LESS_CONFIG_PATH=lessconfig/bi.lessconfig.json LESS_FILE_NAME=bi npm run webpack:css",
-        "build:jsyCss": "cross-env LESS_CONFIG_PATH=lessconfig/jsy.lessconfig.json LESS_FILE_NAME=jsy npm run webpack:css"
+        "build:fineui": "webpack --progress --config=webpack/webpack.prod.js"
     },
     "files": [
         "dist"
diff --git a/packages/fineui/webpack/webpack.common.js b/packages/fineui/webpack/webpack.common.js
index 1c0d242f8..c6efd9d46 100644
--- a/packages/fineui/webpack/webpack.common.js
+++ b/packages/fineui/webpack/webpack.common.js
@@ -9,8 +9,7 @@ let lessVariables = {};
 if (process.env.LESS_CONFIG_PATH) {
     const lessConfigPath = path.isAbsolute(process.env.LESS_CONFIG_PATH)
         ? process.env.LESS_CONFIG_PATH
-        : path.resolve(__dirname, "lessconfig", process.env.LESS_CONFIG_PATH);
-
+        : path.resolve(__dirname, "../lessconfig", process.env.LESS_CONFIG_PATH);
     lessVariables = fs.existsSync(lessConfigPath) ? require(lessConfigPath) || {} : {};
 }
 

From 2535e633bce9f9971173ad7942f91c63dd949d9f Mon Sep 17 00:00:00 2001
From: Treecat <treecat@fanruan.com>
Date: Sun, 23 Apr 2023 11:29:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-14316=20fix:=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fineui/webpack/attachments.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/fineui/webpack/attachments.js b/packages/fineui/webpack/attachments.js
index 991c289e9..57f0bbd72 100644
--- a/packages/fineui/webpack/attachments.js
+++ b/packages/fineui/webpack/attachments.js
@@ -146,12 +146,12 @@ const fineuiWithoutNormalize = [].concat(
 );
 
 const fineui = [].concat(
-    configJS,
     bundleCss,
     basicAttachmentMap.polyfill,
     basicAttachmentMap.js_bundle,
     basicAttachmentMap.ui,
-    basicAttachmentMap.ts
+    basicAttachmentMap.ts,
+    configJS,
 );
 
 const fineuiForWorker = [].concat(