npm - @lark-apaas/fullstack-rspack-preset - Versions diffs - 1.0.14-alpha.tea.1 → 1.0.14 - Mend

@lark-apaas/fullstack-rspack-preset 1.0.14-alpha.tea.1 → 1.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/index.js +3 -2
package/lib/module-alias/echartThemeUD.json +148 -0
package/lib/preset.js +3 -2
package/lib/rspack-plugins/slardar-performance-monitor-plugin.js +1 -40
package/lib/utils/normalize-base-path.d.ts +6 -0
package/lib/utils/normalize-base-path.js +14 -0
package/package.json +1 -1

package/lib/index.js CHANGED Viewed

@@ -5,6 +5,7 @@ exports.defineConfig = createFullstackRspackConfig;
 const webpack_merge_1 = require("webpack-merge");
 const devtool_kits_1 = require("@lark-apaas/devtool-kits");
 const preset_1 = require("./preset");
+const normalize_base_path_1 = require("./utils/normalize-base-path");
 /**
  * 定义 Fullstack Rspack 配置
  *
@@ -56,9 +57,9 @@ function createFullstackRspackConfig(overrides = {}) {
     const needRoutes = process.env.NEED_ROUTES !== 'false'; // 默认 true
     // 3. 处理路径配置
     const clientBasePath = (0, devtool_kits_1.normalizeBasePath)(process.env.CLIENT_BASE_PATH || '/');
-    const publicPath = isDev
+    const publicPath = (0, normalize_base_path_1.normalizeBasePathWithoutTrailingSlash)(isDev
         ? process.env.CLIENT_BASE_PATH || '/'
-        : process.env.ASSETS_CDN_PATH || '/';
+        : process.env.ASSETS_CDN_PATH || '/');
     // 4. 调用原有的 preset 函数生成基础配置
     // 注意：enableInspector 目前在 preset 中由 isDev 控制，暂不暴露为独立参数
     const baseConfig = (0, preset_1.createRecommendRspackConfig)({

package/lib/module-alias/echartThemeUD.json ADDED Viewed

@@ -0,0 +1,148 @@
+{
+    "version": 1,
+    "themeName": "UD Theme Style",
+    "theme": {
+        "seriesCnt": "6",
+        "backgroundColor": "rgba(0,0,0,0)",
+        "titleColor": "#1f2329",
+        "subtitleColor": "#8f959e",
+        "textColorShow": false,
+        "textColor": "#333",
+        "markTextColor": "#ffffff",
+        "color": [
+            "#3370eb",
+            "#1bcebf",
+            "#ffc60a",
+            "#ed6d0c",
+            "#dca1e4",
+            "#25b2e5",
+            "#6dcdeb",
+            "#288fcb",
+            "#94b5f5",
+            "#8f61d1",
+            "#8f61d1",
+            "#bf78e9",
+            "#008280",
+            "#27ad8e",
+            "#7bc335"
+        ],
+        "borderColor": "#dee0e3",
+        "borderWidth": 0,
+        "visualMapColor": ["#25b2e5", "#6dcdeb", "#288fcb"],
+        "legendTextColor": "#8f959e",
+        "kColor": "#fdc6c4",
+        "kColor0": "transparent",
+        "kBorderColor": "#f54a45",
+        "kBorderColor0": "#32a645",
+        "kBorderWidth": "2",
+        "lineWidth": "1",
+        "symbolSize": "6",
+        "symbol": "emptyCircle",
+        "symbolBorderWidth": "1",
+        "lineSmooth": true,
+        "graphLineWidth": 1,
+        "graphLineColor": "#dee0e3",
+        "mapLabelColor": "#000",
+        "mapLabelColorE": "#516b91",
+        "mapBorderColor": "#516b91",
+        "mapBorderColorE": "#516b91",
+        "mapBorderWidth": 0.5,
+        "mapBorderWidthE": 1,
+        "mapAreaColor": "#f3f3f3",
+        "mapAreaColorE": "#a5e7f0",
+        "axes": [
+            {
+                "type": "all",
+                "name": "通用坐标轴",
+                "axisLineShow": true,
+                "axisLineColor": "#dee0e3",
+                "axisTickShow": false,
+                "axisTickColor": "#333",
+                "axisLabelShow": true,
+                "axisLabelColor": "#8f959e",
+                "splitLineShow": true,
+                "splitLineColor": ["#dee0e3"],
+                "splitAreaShow": false,
+                "splitAreaColor": ["rgba(250,250,250,0.05)", "rgba(200,200,200,0.02)"]
+            },
+            {
+                "type": "category",
+                "name": "类目坐标轴",
+                "axisLineShow": true,
+                "axisLineColor": "#333",
+                "axisTickShow": true,
+                "axisTickColor": "#333",
+                "axisLabelShow": true,
+                "axisLabelColor": "#333",
+                "splitLineShow": false,
+                "splitLineColor": ["#ccc"],
+                "splitAreaShow": false,
+                "splitAreaColor": ["rgba(250,250,250,0.3)", "rgba(200,200,200,0.3)"]
+            },
+            {
+                "type": "value",
+                "name": "数值坐标轴",
+                "axisLineShow": true,
+                "axisLineColor": "#333",
+                "axisTickShow": true,
+                "axisTickColor": "#333",
+                "axisLabelShow": true,
+                "axisLabelColor": "#333",
+                "splitLineShow": true,
+                "splitLineColor": ["#ccc"],
+                "splitAreaShow": false,
+                "splitAreaColor": ["rgba(250,250,250,0.3)", "rgba(200,200,200,0.3)"]
+            },
+            {
+                "type": "log",
+                "name": "对数坐标轴",
+                "axisLineShow": true,
+                "axisLineColor": "#333",
+                "axisTickShow": true,
+                "axisTickColor": "#333",
+                "axisLabelShow": true,
+                "axisLabelColor": "#333",
+                "splitLineShow": true,
+                "splitLineColor": ["#ccc"],
+                "splitAreaShow": false,
+                "splitAreaColor": ["rgba(250,250,250,0.3)", "rgba(200,200,200,0.3)"]
+            },
+            {
+                "type": "time",
+                "name": "时间坐标轴",
+                "axisLineShow": true,
+                "axisLineColor": "#333",
+                "axisTickShow": true,
+                "axisTickColor": "#333",
+                "axisLabelShow": true,
+                "axisLabelColor": "#333",
+                "splitLineShow": true,
+                "splitLineColor": ["#ccc"],
+                "splitAreaShow": false,
+                "splitAreaColor": ["rgba(250,250,250,0.3)", "rgba(200,200,200,0.3)"]
+            }
+        ],
+        "axisSeperateSetting": false,
+        "toolboxColor": "#8f959e",
+        "toolboxEmphasisColor": "#1f2329",
+        "tooltipAxisColor": "#dee0e3",
+        "tooltipAxisWidth": 1,
+        "timelineLineColor": "#336df4",
+        "timelineLineWidth": "-1",
+        "timelineItemColor": "#336df4",
+        "timelineItemColorE": "#1456f0",
+        "timelineCheckColor": "#1456f0",
+        "timelineCheckBorderColor": "#94b4ff",
+        "timelineItemBorderWidth": "0.5",
+        "timelineControlColor": "#336df4",
+        "timelineControlBorderColor": "#336df4",
+        "timelineControlBorderWidth": 0.5,
+        "timelineLabelColor": "#8f959e",
+        "datazoomBackgroundColor": "rgba(0,0,0,0)",
+        "datazoomDataColor": "rgba(255,255,255,0.3)",
+        "datazoomFillColor": "rgba(167,183,204,0.4)",
+        "datazoomHandleColor": "#a7b7cc",
+        "datazoomHandleWidth": "100",
+        "datazoomLabelColor": "#333"
+    }
+}

package/lib/preset.js CHANGED Viewed

@@ -16,6 +16,7 @@ const dev_server_snapdom_proxy_1 = require("./utils/dev-server-snapdom-proxy");
 function createRecommendRspackConfig(options) {
     const { isDev = true, enableReactRefresh = isDev, needRoutes = true, clientBasePath = '', publicPath = '', // 静态资源路径
      } = options;
+    const assetsCDNPath = publicPath + '/';
     const rootDir = process.cwd();
     const serverPort = process.env.SERVER_PORT || '3000';
     return {
@@ -152,7 +153,7 @@ function createRecommendRspackConfig(options) {
                 },
                 minify: false, // 关闭 html 压缩，导致数据注入异常
             }),
-            // 性能监控&tea埋点sdk插件
+            // 性能监控插件
             new slardar_performance_monitor_plugin_1.default(),
             // 视图上下文注入插件
             new view_context_injection_plugin_1.default(),
@@ -313,7 +314,7 @@ function createRecommendRspackConfig(options) {
             },
         },
         output: {
-            publicPath,
+            publicPath: assetsCDNPath,
             path: path_1.default.resolve(rootDir, 'dist/client'),
             clean: false,
             globalObject: 'this',

package/lib/rspack-plugins/slardar-performance-monitor-plugin.js CHANGED Viewed

@@ -38,7 +38,6 @@ class SlardarPerformanceMonitorPlugin {
                         bid: this.options.bid,
                         globalName: this.options.globalName,
                     });
-                    const teaSnippet = getTeaScriptContent();
                     if (!snippet)
                         return data;
                     // 创建 Slardar 脚本标签对象
@@ -48,13 +47,6 @@ class SlardarPerformanceMonitorPlugin {
                         innerHTML: snippet,
                         attributes: {},
                     };
-                    // 创建 Tea 脚本标签对象
-                    const teaTag = {
-                        tagName: 'script',
-                        voidTag: false,
-                        innerHTML: teaSnippet,
-                        attributes: {},
-                    };
                     // 找到 main.js 的索引位置
                     const mainJsIndex = data.headTags.findIndex((tag) => tag.tagName === 'script' &&
                         tag.attributes &&
@@ -62,12 +54,11 @@ class SlardarPerformanceMonitorPlugin {
                         tag.attributes.src.includes('main.js'));
                     if (mainJsIndex !== -1) {
                         // 在 main.js 之前插入 Slardar 脚本
-                        data.headTags.splice(mainJsIndex, 0, slardarTag, teaTag);
+                        data.headTags.splice(mainJsIndex, 0, slardarTag);
                     }
                     else {
                         // 如果没找到 main.js，插入到 headTags 最前面
                         data.headTags.unshift(slardarTag);
-                        data.headTags.unshift(teaTag);
                     }
                     return data;
                 });
@@ -115,33 +106,3 @@ function getSlardarScriptContent(option = {}) {
     document.head.appendChild(performanceScript);
   `;
 }
-// 获取 tea sdk 脚本
-function getTeaScriptContent() {
-    return `
-  (function (win, export_obj) {
-    win['LogAnalyticsObject'] = export_obj;
-    if (!win[export_obj]) {
-      function _collect() {
-        _collect.q.push(arguments);
-      }
-      _collect.q = _collect.q || [];
-      win[export_obj] = _collect;
-    }
-    win[export_obj].l = +new Date();
-  })(window, 'collectEvent');
-  // 创建 tea sdk 脚本元素
-    const teaScript = document.createElement('script');
-    teaScript.src = 'https://lf3-cdn-tos.bytescm.com/obj/static/log-sdk/collect/5.1/collect.js';
-    teaScript.crossOrigin = 'anonymous';
-    teaScript.async = true;
-    // 添加错误处理
-    teaScript.onerror = function() {
-      console.warn('Failed to load Tea script');
-    };
-    // 将脚本添加到页面
-    document.head.appendChild(teaScript);
-  `;
-}

package/lib/utils/normalize-base-path.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+/**
+ * 标准化基础路径，确保以 '/' 开头且不包含 trailing slash
+ * @param basePath 原始基础路径
+ * @returns 标准化后的基础路径
+ */
+export declare function normalizeBasePathWithoutTrailingSlash(basePath: string): string;

package/lib/utils/normalize-base-path.js ADDED Viewed

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeBasePathWithoutTrailingSlash = normalizeBasePathWithoutTrailingSlash;
+/**
+ * 标准化基础路径，确保以 '/' 开头且不包含 trailing slash
+ * @param basePath 原始基础路径
+ * @returns 标准化后的基础路径
+ */
+function normalizeBasePathWithoutTrailingSlash(basePath) {
+    const basePathWithoutTrailingSlash = basePath.endsWith('/')
+        ? basePath.slice(0, -1)
+        : basePath;
+    return basePathWithoutTrailingSlash;
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-rspack-preset",
-  "version": "1.0.14-alpha.tea.1",
+  "version": "1.0.14",
   "files": [
     "lib",
     "patches",