@lark-apaas/fullstack-rspack-preset 1.0.42 → 1.0.43

package/lib/module-alias/echarts-for-react.js

@@ -45,6 +45,15 @@ function convertColorToHex(color) {
         return color;
     }
 }
+function convertColorValue(propValue, visited) {
+    if (typeof propValue === 'string') {
+        return convertColorToHex(propValue);
+    }
+    if (Array.isArray(propValue)) {
+        return propValue.map((item) => typeof item === 'string' ? convertColorToHex(item) : transformColors(item, visited));
+    }
+    return transformColors(propValue, visited);
+}
 /**
  * Deep traverse object to transform all HSL colors in 'color' property
  */
@@ -57,8 +66,6 @@ function transformColors(value, visited = new WeakSet()) {
         return value;
     if (value instanceof Date || value instanceof RegExp)
         return value;
-    if (typeof value === 'function')
-        return value;
     visited.add(value);
     if (Array.isArray(value)) {
         return value.map((item) => transformColors(item, visited));
@@ -69,14 +76,11 @@ function transformColors(value, visited = new WeakSet()) {
             continue;
         const propValue = value[key];
         if (key === 'color') {
-            if (typeof propValue === 'string') {
-                result[key] = convertColorToHex(propValue);
-            }
-            else if (Array.isArray(propValue)) {
-                result[key] = propValue.map((item) => typeof item === 'string' ? convertColorToHex(item) : transformColors(item, visited));
+            if (typeof propValue === 'function') {
+                result[key] = (...args) => convertColorValue(propValue(...args), visited);
             }
             else {
-                result[key] = transformColors(propValue, visited);
+                result[key] = convertColorValue(propValue, visited);
             }
         }
         else {

package/lib/module-alias/registry_echarts_theme.d.ts

@@ -8,9 +8,7 @@ export declare function getCssVariable(varName: string, element?: HTMLElement):
 export declare function generateEChartsTheme(element?: HTMLElement): {
     color: string[];
     backgroundColor: string;
-    textStyle: {
-        color: string;
-    };
+    textStyle: {};
     title: {
         textStyle: {
             color: string;
@@ -352,9 +350,7 @@ export declare function generateEChartsTheme(element?: HTMLElement): {
 export declare function getShadcnEChartsTheme(): {
     color: string[];
     backgroundColor: string;
-    textStyle: {
-        color: string;
-    };
+    textStyle: {};
     title: {
         textStyle: {
             color: string;

package/lib/module-alias/registry_echarts_theme.js

@@ -44,7 +44,7 @@ function generateEChartsTheme(element = document.body) {
         color: chartColors,
         backgroundColor: 'transparent',
         textStyle: {
-            color: foreground,
+        // color: foreground,
         },
         title: {
             textStyle: {

package/lib/preset.js

@@ -46,6 +46,12 @@ function createRecommendRspackConfig(options) {
         resolve: {
             mainFields: ['module', 'browser', 'main'],
             extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
+            alias: {
+                // 确保所有 echarts 子路径导入（如 echarts/core, echarts/lib/...）
+                // 都解析到 preset 自带的 echarts，避免第三方扩展（如 echarts-wordcloud）
+                // 安装了独立的 echarts 副本导致注册不到同一个实例上
+                echarts: path_1.default.dirname(require.resolve('echarts/package.json')),
+            },
         },
         module: {
             rules: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-rspack-preset",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "files": [
     "lib",
     "patches",