@lark-apaas/fullstack-rspack-preset 1.0.30-alpha.1 → 1.0.30-alpha.2

package/lib/overlay/index.js

@@ -129,13 +129,35 @@ function removeAllChildren(element, skip) {
         element.removeChild(childList[i]);
     }
 }
+// 获取父窗口 origin
+function getPreviewParentOrigin() {
+    const { origin } = window.location;
+    if (origin.includes('force.feishuapp.net')) {
+        return 'https://force.feishu.cn';
+    }
+    if (origin.includes('force-pre.feishuapp.net')) {
+        return 'https://force.feishu-pre.cn';
+    }
+    // force BOE环境
+    if (origin.includes('force.byted.org')) {
+        return 'https://force.feishu-boe.cn';
+    }
+    // MIAODA 线上环境
+    if (origin.includes('feishuapp.cn') ||
+        origin.includes('miaoda.feishuapp.net')) {
+        return 'https://miaoda.feishu.cn';
+    }
+    // MIAODA PRE 环境
+    if (origin.includes('fsapp.kundou.cn') ||
+        origin.includes('miaoda-pre.feishuapp.net')) {
+        return 'https://miaoda.feishu-pre.cn';
+    }
+    // MIAODA BOE 环境
+    return 'https://miaoda.feishu-boe.cn';
+}
 function sendPostMessage(message, targetOrigin) {
     try {
-        const parentOrigin = process.env.FORCE_FRAMEWORK_DOMAIN_MAIN;
-        const origin = targetOrigin || parentOrigin;
-        if (!origin) {
-            return;
-        }
+        const origin = targetOrigin || getPreviewParentOrigin();
         window.parent.postMessage(message, origin);
     }
     catch (error) {

package/lib/preset.js

@@ -146,7 +146,6 @@ function createRecommendRspackConfig(options) {
                 'process.env.NODE_ENV': JSON.stringify(isDev ? 'development' : 'production'),
                 'process.env.runtimeMode': JSON.stringify('fullstack'),
                 'process.env.CLIENT_BASE_PATH': JSON.stringify(clientBasePath),
-                'process.env.FORCE_FRAMEWORK_DOMAIN_MAIN': JSON.stringify(process.env.FORCE_FRAMEWORK_DOMAIN_MAIN ?? ''),
                 'process.env.CWD': JSON.stringify(''),
                 // 解决 window 未定义问题
                 'typeof window': JSON.stringify('object'),
@@ -193,7 +192,7 @@ function createRecommendRspackConfig(options) {
             ? {}
             : {
                 moduleIds: 'deterministic',
-                concatenateModules: true,
+                concatenateModules: false, // 1.6.8 中 echarts + rspack 会 panic
                 minimize: true, // 对应vite的minify配置
                 minimizer: [
                     new core_1.default.SwcJsMinimizerRspackPlugin({
@@ -266,13 +265,25 @@ function createRecommendRspackConfig(options) {
                 },
                 overlay: false,
             },
-            headers: (_req) => {
-                const allowedOrigin = process.env.FORCE_FRAMEWORK_DOMAIN_MAIN;
-                const headers = {};
-                if (!allowedOrigin)
-                    return headers;
-                headers['Access-Control-Allow-Origin'] = allowedOrigin;
-                return headers;
+            headers: (req) => {
+                // 获取请求的Origin头
+                const requestOrigin = req.headers.origin ?? '';
+                // 定义允许的域名白名单
+                const allowedOrigins = [
+                    'https://force.feishu-boe.cn',
+                    'https://force.feishu.cn',
+                    'https://force.feishu-pre.cn',
+                    'https://miaoda.feishu.cn',
+                    'https://miaoda.feishu-boe.cn',
+                    'https://miaoda.feishu-pre.cn',
+                ];
+                // 检查请求的Origin是否在允许的列表中
+                const allowedOrigin = allowedOrigins.includes(requestOrigin)
+                    ? requestOrigin
+                    : allowedOrigins[0]; // 默认返回第一个允许的域名
+                return {
+                    'Access-Control-Allow-Origin': allowedOrigin,
+                };
             },
             onListening(server) {
                 (0, dev_server_listener_1.listenHmrTiming)(server);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-rspack-preset",
-  "version": "1.0.30-alpha.1",
+  "version": "1.0.30-alpha.2",
   "files": [
     "lib",
     "patches",
@@ -31,7 +31,7 @@
     "@babel/parser": "^7.28.0",
     "@babel/traverse": "^7.28.0",
     "@babel/types": "^7.28.2",
-    "@lark-apaas/devtool-kits": "1.2.14-alpha.0",
+    "@lark-apaas/devtool-kits": "^1.2.13",
     "@lark-apaas/miaoda-inspector-babel-plugin": "^1.0.0",
     "@lark-apaas/miaoda-inspector-jsx-runtime": "^1.0.0",
     "@rspack/plugin-react-refresh": "^1.5.1",