@lark-apaas/fullstack-rspack-preset 1.0.45 → 1.0.47

package/lib/overlay/index.js

@@ -129,6 +129,25 @@ function removeAllChildren(element, skip) {
         element.removeChild(childList[i]);
     }
 }
+function getParentOriginFromParams() {
+    try {
+        var params = new URLSearchParams(window.location.search);
+        var origin = params.get('__parentOrigin');
+        if (origin) {
+            sessionStorage.setItem('__parentOrigin', origin);
+            return origin;
+        }
+    }
+    catch (e) {
+        // ignore
+    }
+    try {
+        return sessionStorage.getItem('__parentOrigin') || '';
+    }
+    catch (e) {
+        return '';
+    }
+}
 function getLegacyParentOrigin() {
     const currentOrigin = window.location?.origin || '';
     if (currentOrigin.includes('force.feishuapp.net')) {
@@ -150,7 +169,7 @@ function getLegacyParentOrigin() {
 }
 function sendPostMessage(message, targetOrigin) {
     try {
-        const parentOrigin = process?.env?.FORCE_FRAMEWORK_DOMAIN_MAIN || getLegacyParentOrigin();
+        const parentOrigin = getParentOriginFromParams() || process?.env?.FORCE_FRAMEWORK_DOMAIN_MAIN || getLegacyParentOrigin();
         const origin = targetOrigin || parentOrigin;
         window.parent.postMessage(message, origin);
     }

package/lib/preset.js

@@ -18,6 +18,7 @@ const runtime_injection_plugin_1 = __importDefault(require("./rspack-plugins/run
 const css_legacy_plugin_1 = __importDefault(require("./rspack-plugins/css-legacy-plugin"));
 const polyfill_plugin_1 = __importDefault(require("./rspack-plugins/polyfill-plugin"));
 const static_assets_plugin_1 = __importDefault(require("./rspack-plugins/static-assets-plugin"));
+const source_map_upload_plugin_1 = __importDefault(require("./rspack-plugins/source-map-upload-plugin"));
 const dev_server_snapdom_proxy_1 = require("./utils/dev-server-snapdom-proxy");
 function sendBackendUnavailable502(_err, _req, res) {
     if (res.headersSent)
@@ -47,6 +48,8 @@ function createRecommendRspackConfig(options) {
     const appFlags = readAppFlags(rootDir);
     // 提前创建实例，以便在 plugins 和 setupMiddlewares 中复用
     const staticAssetsPlugin = new static_assets_plugin_1.default({ clientBasePath, rootDir });
+    // 优先从环境变量获取 RELEASE_ID，否则使用时间戳作为兜底
+    const releaseId = process.env.RELEASE_ID || new Date().toISOString();
     return {
         mode: isDev ? 'development' : 'production',
         cache: false,
@@ -167,6 +170,10 @@ function createRecommendRspackConfig(options) {
         plugins: [
             // 运行时注入插件 - 自动将 @lark-apaas/client-toolkit/runtime 注入到所有入口之前
             new runtime_injection_plugin_1.default(),
+            new core_1.default.BannerPlugin({
+                banner: `window.__RELEASE_COMMIT_ID__ = '${releaseId}';`,
+                raw: true,
+            }),
             // 针对 clsx/echarts/echarts-for-react 等包，让其默认好用
             new core_1.default.NormalModuleReplacementPlugin(/^(clsx|echarts|echarts-for-react)$/, function (resource) {
                 if (!resource.context.endsWith('module-alias')) {
@@ -240,6 +247,10 @@ function createRecommendRspackConfig(options) {
                     module: path_1.default.resolve(__dirname, 'overlay/index.js'),
                 },
             }),
+            // 生产环境下，收集 sourcemap
+            !isDev && new source_map_upload_plugin_1.default({
+                outputDir: path_1.default.resolve(rootDir, 'dist/sourcemaps'),
+            }),
         ],
         optimization: isDev
             ? {}
@@ -288,7 +299,7 @@ function createRecommendRspackConfig(options) {
                 mergeDuplicateChunks: true,
                 splitChunks: false, // 禁用代码分割，保持单文件输出
             },
-        devtool: isDev ? 'source-map' : false, // 对应vite的sourcemap配置
+        devtool: isDev ? 'source-map' : 'hidden-source-map', // 对应vite的sourcemap配置
         devServer: {
             port: process.env.CLIENT_DEV_PORT || 8080,
             host: process.env.CLIENT_DEV_HOST || 'localhost',

package/lib/rspack-plugins/source-map-upload-plugin.d.ts

@@ -0,0 +1,10 @@
+import { type Compiler } from '@rspack/core';
+interface SourceMapUploadPluginOptions {
+    outputDir: string;
+}
+declare class SourceMapUploadPlugin {
+    private options;
+    constructor(options: SourceMapUploadPluginOptions);
+    apply(compiler: Compiler): void;
+}
+export default SourceMapUploadPlugin;

package/lib/rspack-plugins/source-map-upload-plugin.js

@@ -0,0 +1,104 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = __importDefault(require("@rspack/core"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+class SourceMapUploadPlugin {
+    constructor(options) {
+        if (!options.outputDir) {
+            throw new Error('SourceMapUploadPlugin: outputDir is required');
+        }
+        this.options = options;
+    }
+    apply(compiler) {
+        compiler.hooks.afterEmit.tapPromise('SourceMapUploadPlugin', async (compilation) => {
+            console.log('SourceMapUploadPlugin: Starting sourcemap consolidation process...');
+            const outputPath = compiler.options.output.path;
+            if (!outputPath) {
+                compilation.warnings.push(new core_1.default.WebpackError('SourceMapUploadPlugin: compiler.options.output.path is not defined. Skipping sourcemap consolidation.'));
+                return;
+            }
+            const assets = compilation.getAssets();
+            const sourceMaps = assets.filter(asset => asset.name.endsWith('.map'));
+            if (sourceMaps.length === 0) {
+                console.log('SourceMapUploadPlugin: No sourcemaps found to consolidate.');
+                return;
+            }
+            const outputBaseDir = path.basename(outputPath); // e.g., 'client'
+            const sourcemapTargetDir = path.join(this.options.outputDir, outputBaseDir); // e.g., 'dist/sourcemaps/client'
+            for (const sourceMap of sourceMaps) {
+                const assetName = sourceMap.name;
+                const destinationPath = path.join(sourcemapTargetDir, assetName);
+                const originalPath = path.join(outputPath, assetName);
+                try {
+                    // Ensure the destination directory for the specific file exists.
+                    const destinationDir = path.dirname(destinationPath);
+                    if (!fs.existsSync(destinationDir)) {
+                        fs.mkdirSync(destinationDir, { recursive: true });
+                    }
+                    // The asset source may be a Buffer or a string.
+                    const source = sourceMap.source.source();
+                    const sourceBuffer = Buffer.isBuffer(source) ? source : Buffer.from(source, 'utf-8');
+                    fs.writeFileSync(destinationPath, sourceBuffer);
+                    console.log(`SourceMapUploadPlugin: Consolidated ${assetName} to ${destinationPath}`);
+                    // Delete the original sourcemap file.
+                    try {
+                        fs.unlinkSync(originalPath);
+                        console.log(`SourceMapUploadPlugin: Deleted original sourcemap ${originalPath}`);
+                    }
+                    catch (deleteError) {
+                        const deleteErrorMessage = `SourceMapUploadPlugin: Failed to delete original sourcemap ${originalPath}.`;
+                        compilation.warnings.push(new core_1.default.WebpackError(`${deleteErrorMessage} Error: ${String(deleteError)}`));
+                    }
+                }
+                catch (error) {
+                    const errorMessage = `SourceMapUploadPlugin: Failed to consolidate ${assetName}.`;
+                    console.error(errorMessage, error);
+                    if (error instanceof Error) {
+                        compilation.errors.push(new Error(`${errorMessage} Error: ${error.message}`));
+                    }
+                    else {
+                        compilation.errors.push(new Error(`${errorMessage} Error: ${String(error)}`));
+                    }
+                }
+            }
+        });
+    }
+}
+exports.default = SourceMapUploadPlugin;

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

@@ -171,8 +171,12 @@ class StaticAssetsPlugin {
             return `export default window.__STATIC_JSON__['${key}'];`;
         }
         else {
-            const staticUrl = `${this.options.clientBasePath}/static/${relativePath}`;
-            return `export default '${staticUrl}';`;
+            const envBaseUrl = typeof process !== 'undefined' ? process.env?.STATIC_ASSETS_BASE_URL : undefined;
+            // envBaseUrl (downloadURLPrefix) 已指向 static 目录，无需再拼 /static/
+            const staticUrl = envBaseUrl
+                ? `${envBaseUrl.replace(/\/+$/, '')}/${relativePath}`
+                : `${this.options.clientBasePath}/static/${relativePath}`;
+            return `export default ${JSON.stringify(staticUrl)};`;
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-rspack-preset",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "files": [
     "lib",
     "patches",
@@ -32,7 +32,7 @@
     "@babel/traverse": "^7.28.0",
     "@babel/types": "^7.28.2",
     "@lark-apaas/devtool-kits": "^1.2.18",
-    "@lark-apaas/miaoda-inspector-babel-plugin": "^1.0.2",
+    "@lark-apaas/miaoda-inspector-babel-plugin": "^1.0.1",
     "@lark-apaas/styled-jsx": "^1.0.1",
     "@rspack/plugin-react-refresh": "^1.5.1",
     "@swc/plugin-styled-jsx": "^11.0.0",