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

package/lib/module-alias/echarts-for-react.d.ts

@@ -1,6 +1,7 @@
 /**
  * EChartsReact wrapper component
  * - Automatically converts HSL colors to hex in option
+ * - Removes label.color from funnel series
  */
 export class EChartsReact extends React.Component<any, any, any> {
     constructor(props: any);

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 {
@@ -85,14 +89,43 @@ function transformColors(value, visited = new WeakSet()) {
     }
     return result;
 }
+/**
+ * Remove label.color and emphasis.label.color from funnel series
+ * to let ECharts use default contrast colors
+ */
+function removeFunnelLabelColor(option) {
+    if (!Array.isArray(option.series))
+        return option;
+    const series = option.series.map((item) => {
+        if (item?.type !== 'funnel')
+            return item;
+        let result = { ...item };
+        // remove label.color
+        if (result.label && typeof result.label === 'object') {
+            const { color: _, ...labelRest } = result.label;
+            result = { ...result, label: labelRest };
+        }
+        // remove emphasis.label.color
+        const emphasis = result.emphasis;
+        if (emphasis?.label && typeof emphasis.label === 'object') {
+            const { color: _, ...emphasisLabelRest } = emphasis.label;
+            result = { ...result, emphasis: { ...emphasis, label: emphasisLabelRest } };
+        }
+        return result;
+    });
+    return { ...option, series };
+}
 /**
  * EChartsReact wrapper component
  * - Automatically converts HSL colors to hex in option
+ * - Removes label.color from funnel series
  */
 class EChartsReact extends react_1.default.Component {
     render() {
         const { option, ...rest } = this.props;
-        const transformedOption = option ? transformColors(option) : option;
+        const transformedOption = option
+            ? removeFunnelLabelColor(transformColors(option))
+            : option;
         return react_1.default.createElement(echarts_for_react_1.default, {
             option: transformedOption,
             ...rest,

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,9 +46,20 @@ 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: [
+                // Support ?raw query to import file content as string (like Vite's ?raw)
+                {
+                    resourceQuery: /\?raw$/,
+                    type: 'asset/source',
+                },
                 {
                     test: /\.svg$/,
                     type: 'asset',

package/lib/rspack-plugins/static-assets-plugin.js

@@ -75,6 +75,40 @@ const MIME_TYPES = {
 };
 const SHARED_STATIC_PREFIX = '@shared/static/';
 const PLUGIN_NAME = 'StaticAssetsPlugin';
+/** File extensions that should be resolved as normal modules instead of static asset URLs */
+const SCRIPT_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.mts', '.cts', '.mjs', '.cjs'];
+/**
+ * Split a relative path into the clean path and optional query string.
+ * e.g. "file.md?raw" → ["file.md", "?raw"]
+ */
+function splitQuery(relativePath) {
+    const qIndex = relativePath.indexOf('?');
+    if (qIndex === -1)
+        return [relativePath, ''];
+    return [relativePath.slice(0, qIndex), relativePath.slice(qIndex)];
+}
+/**
+ * Try to resolve a relative path to a real script file on disk.
+ * Handles both explicit extensions (utils.ts) and extensionless imports (utils).
+ * Returns the absolute path if found, null otherwise.
+ */
+function resolveScriptFile(staticDir, cleanPath) {
+    const ext = path.extname(cleanPath).toLowerCase();
+    // Has explicit script extension → resolve directly
+    if (ext && SCRIPT_EXTENSIONS.includes(ext)) {
+        return path.join(staticDir, cleanPath);
+    }
+    // No extension → probe for matching script file on disk
+    if (!ext) {
+        for (const scriptExt of SCRIPT_EXTENSIONS) {
+            const fullPath = path.join(staticDir, cleanPath + scriptExt);
+            if (fs.existsSync(fullPath)) {
+                return fullPath;
+            }
+        }
+    }
+    return null;
+}
 class StaticAssetsPlugin {
     constructor(options = {}) {
         this.jsonDataCache = null;
@@ -218,10 +252,23 @@ class StaticAssetsPlugin {
                     return;
                 }
                 const relativePath = request.slice(SHARED_STATIC_PREFIX.length);
+                const [cleanPath, query] = splitQuery(relativePath);
+                // Imports with query params (e.g. ?raw) should resolve to real
+                // paths and let Rspack's native handling process them
+                if (query) {
+                    resolveData.request = path.join(this.staticDir, cleanPath) + query;
+                    return;
+                }
+                // JS/TS files should be resolved to their real paths and bundled normally
+                const scriptPath = resolveScriptFile(this.staticDir, cleanPath);
+                if (scriptPath) {
+                    resolveData.request = scriptPath;
+                    return;
+                }
                 // Generate virtual module content
-                const content = this.generateVirtualModuleContent(relativePath);
+                const content = this.generateVirtualModuleContent(cleanPath);
                 // Create a virtual module file
-                const virtualModulePath = path.join(virtualModulesDir, relativePath.replace(/[/\\]/g, '_') + '.js');
+                const virtualModulePath = path.join(virtualModulesDir, cleanPath.replace(/[/\\]/g, '_') + '.js');
                 // Only write to disk if content has changed
                 const existingContent = writtenModules.get(virtualModulePath);
                 if (existingContent !== content) {

package/package.json

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

package/lib/rspack-plugins/environment-injection-plugin.d.ts

@@ -1,9 +0,0 @@
-interface EnvironmentInjectionPluginOptions {
-    environment?: string;
-}
-declare class EnvironmentInjectionPlugin {
-    private options;
-    constructor(options?: EnvironmentInjectionPluginOptions);
-    apply(compiler: unknown): void;
-}
-export default EnvironmentInjectionPlugin;

package/lib/rspack-plugins/environment-injection-plugin.js

@@ -1,112 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class EnvironmentInjectionPlugin {
-    constructor(options) {
-        this.options = options || {};
-    }
-    apply(compiler) {
-        const compilerLike = getCompilerLike(compiler);
-        if (!compilerLike)
-            return;
-        compilerLike.hooks.compilation.tap('EnvironmentInjectionPlugin', (compilation) => {
-            try {
-                const HtmlPlugin = resolveHtmlPlugin(compilerLike);
-                if (!HtmlPlugin) {
-                    console.warn('EnvironmentInjectionPlugin: HtmlRspackPlugin not found');
-                    return;
-                }
-                const hooks = HtmlPlugin.getHooks(compilation);
-                hooks.alterAssetTagGroups.tap('EnvironmentInjectionPlugin', (data) => {
-                    const mapped = mapToWindowEnvironment(this.options.environment ??
-                        process.env.FORCE_FRAMEWORK_ENVIRONMENT);
-                    const envTag = {
-                        tagName: 'script',
-                        voidTag: false,
-                        innerHTML: `(() => {
-  const templateValue = '{{environment}}';
-  const resolved =
-    templateValue && templateValue !== '{{environment}}'
-      ? templateValue
-      : ${JSON.stringify(mapped)};
-  window.ENVIRONMENT = resolved;
-})();`,
-                        attributes: {},
-                    };
-                    const headIndex = findMainJsIndex(data.headTags);
-                    if (headIndex !== -1) {
-                        data.headTags.splice(headIndex, 0, envTag);
-                        return data;
-                    }
-                    const bodyIndex = findMainJsIndex(data.bodyTags);
-                    if (bodyIndex !== -1) {
-                        data.bodyTags.splice(bodyIndex, 0, envTag);
-                        return data;
-                    }
-                    data.headTags.unshift(envTag);
-                    return data;
-                });
-            }
-            catch (error) {
-                console.error('Error in EnvironmentInjectionPlugin:', error);
-            }
-        });
-    }
-}
-exports.default = EnvironmentInjectionPlugin;
-function mapToWindowEnvironment(input) {
-    const value = (input || '').trim().toLowerCase();
-    if (value === 'boe')
-        return 'staging';
-    if (value === 'pre')
-        return 'gray';
-    if (value === 'online')
-        return 'online';
-    return '';
-}
-function findMainJsIndex(tags) {
-    if (!Array.isArray(tags))
-        return -1;
-    return tags.findIndex((tag) => {
-        if (!tag || tag.tagName !== 'script')
-            return false;
-        const src = tag.attributes?.src;
-        return typeof src === 'string' && src.includes('main.js');
-    });
-}
-function getCompilerLike(input) {
-    if (!input || typeof input !== 'object')
-        return;
-    const hooks = input.hooks;
-    if (!hooks || typeof hooks !== 'object')
-        return;
-    const compilation = hooks.compilation;
-    if (!compilation || typeof compilation !== 'object')
-        return;
-    const tap = compilation.tap;
-    if (typeof tap !== 'function')
-        return;
-    return input;
-}
-function resolveHtmlPlugin(compiler) {
-    const fromWebpack = getHtmlPluginLike(compiler.webpack?.HtmlRspackPlugin);
-    if (fromWebpack)
-        return fromWebpack;
-    const fromRspack = getHtmlPluginLike(compiler.rspack?.HtmlRspackPlugin);
-    if (fromRspack)
-        return fromRspack;
-    const fromCtor = getHtmlPluginLike(compiler.constructor?.webpack?.HtmlRspackPlugin);
-    if (fromCtor)
-        return fromCtor;
-    return;
-}
-function getHtmlPluginLike(value) {
-    if (!value)
-        return;
-    const type = typeof value;
-    if (type !== 'function' && type !== 'object')
-        return;
-    const getHooks = value.getHooks;
-    if (typeof getHooks !== 'function')
-        return;
-    return value;
-}