@dd-code/uni-tools 1.0.9 → 1.0.10

package/dist/index.mjs.js

@@ -1,14 +1,15 @@
 import path from 'path';
 import fs from 'fs';
 import crypto from 'crypto';
+import chokidar from 'chokidar';
 import { MultiBar, Presets } from 'cli-progress';
 import chalk from 'chalk';
 import fsExtra from 'fs-extra';
-import chokidar from 'chokidar';
 import WebSocket, { WebSocketServer } from 'ws';
 import express from 'express';
 import http from 'http';
 import cors from 'cors';
+import 'child_process';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -151,6 +152,23 @@ function uniReadFile(filaPath) {
     }
     return "";
 }
+/**
+ * 读取文件内容
+ * 支持JSON文件的自动解析
+ * @param {string} filaPath - 文件路径
+ * @returns {string|Object} 返回文件内容，JSON文件返回对象，其他返回字符串
+ */
+function uniFsReadJSONFile(filaPath) {
+    try {
+        var res = fs.readFileSync(filaPath, "utf-8");
+        return JSON.parse(res);
+    }
+    catch (e) {
+        // console.error(`${filaPath} notfound`);
+        // console.log(e);
+    }
+    return {};
+}
 /**
  * 写入文件内容
  * 自动创建目录结构，支持对象和字符串内容
@@ -182,6 +200,7 @@ var loadViteConfig = function (mode) {
     return loadEnv(mode, ROOT, "MFE_");
 };
 var walkDir = function (outDir, emitted) {
+    if (emitted === void 0) { emitted = new Set(); }
     var root = path.isAbsolute(outDir)
         ? outDir
         : path.resolve(process.cwd(), outDir);
@@ -195,6 +214,7 @@ var walkDir = function (outDir, emitted) {
                 walk(p);
             else
                 all.push(path.relative(root, p));
+            // path.relative(root, p)
         });
     };
     walk(root);
@@ -226,6 +246,20 @@ function generateHash(content, algorithm, encoding) {
 function generateSHA256(content) {
     return generateHash(content, "sha256");
 }
+var genreFileInfoRow = function (row) {
+    var fileName = row.fileName, source = row.source;
+    var name = path.basename(fileName);
+    var dir = path.dirname(fileName);
+    var suffix = dir === "." ? "" : "".concat(dir, "/");
+    return {
+        fileName: fileName,
+        fileUrl: "".concat(suffix).concat(generateSHA256((source === null || source === void 0 ? void 0 : source.toString()) || "").slice(0, 8), "_").concat(name),
+    };
+};
+var createFileWatcher = function (filePath, opt) {
+    var watcher = chokidar.watch(filePath, __assign({ persistent: true, ignoreInitial: true, usePolling: true, interval: 100, awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 100 }, followSymlinks: true, depth: 99 }, opt));
+    return watcher;
+};
 
 var UniCdnManager = /** @class */ (function () {
     function UniCdnManager() {
@@ -258,10 +292,19 @@ var cdn = new UniCdnManager();
 
 // CDN 文件保存路径
 var SAVE_CDN_FILE_PATH = path.join(process.cwd(), "node_modules/@dd-code/uni-files");
+path.join(process.cwd(), "node_modules/@dd-code/__main-pwd.txt");
+path.join(process.cwd(), "node_modules/@dd-code/manifest-list.json");
 path.join(process.cwd(), "node_modules/@dd-code/current-files");
+// 发布目录路径
+var PUBLISH_PATH = path.join(process.cwd(), "dist/publish");
 // Manifest 文件名
 var MANIFEST_NAME = "mfe-uni-manifest.json";
-var ROOT_APP_CODE = "main"; //"__MFE_APP_ROOT__";
+var ROOT_APP_CODE = "__MFE_APP_ROOT__";
+var EBuildMode;
+(function (EBuildMode) {
+    EBuildMode["BUILD"] = "build";
+    EBuildMode["SERVE"] = "serve";
+})(EBuildMode || (EBuildMode = {}));
 // Manifest CDN 目录 URL 模板
 var MANIFEST_CND_DIR_URL = "{mode}/static-repository/mfe-uni/{code}/{appCode}";
 var getManifestCdnDirUrl = function (_a) {
@@ -352,6 +395,7 @@ var formatCliCommandConfig = function (mode) {
         code: viteEnv.MFE_UNI_CODE,
         mode: mode,
         cdn: viteEnv.MFE_CDN_HOST,
+        serve: viteEnv.MFE_UNI_SERVE, // 是否开启 serve 功能
     };
 };
 var checkIsRootManifest = function (manifest) {
@@ -359,12 +403,13 @@ var checkIsRootManifest = function (manifest) {
 };
 var WS_PORT = 3560;
 var WS_PATH = "/__mfe__ws__";
+var HTTP_PATH = "/__mfe__http__";
 var E_WS_TYPE;
 (function (E_WS_TYPE) {
     E_WS_TYPE["INIT"] = "init_files";
     E_WS_TYPE["CHANGE"] = "change_files";
 })(E_WS_TYPE || (E_WS_TYPE = {}));
-var getMainAppJSon = function (mode, appCode) {
+var getNodeModuleMainAppJSon = function (mode, appCode) {
     return path.join(SAVE_CDN_FILE_PATH, mode || "dev", appCode, "app.json");
 };
 var getMainAppJsonPath = function () {
@@ -420,10 +465,17 @@ var CliProgressManager = /** @class */ (function () {
 var CliProgressManager$1 = new CliProgressManager();
 
 var getDownloadedFilePath = function (conf) {
-    return path.resolve(SAVE_CDN_FILE_PATH, conf.env, conf.appCode);
+    if (!conf.mode && !conf.env) {
+        throw new Error("appCode: ".concat(conf.appCode, " mode or env is required"));
+    }
+    if (!conf.appCode) {
+        throw new Error("appCode is required");
+    }
+    return path.resolve(SAVE_CDN_FILE_PATH, conf.mode || conf.env, conf.appCode);
 };
 var getNodeModulesEnvAppCodeFilePath = function (conf, fileName) {
-    return path.resolve(getDownloadedFilePath(conf), fileName);
+    var savePath = getDownloadedFilePath(conf);
+    return path.resolve(savePath, fileName);
 };
 /**
  * 获取清单文件 URL 列表
@@ -592,19 +644,20 @@ var downloadProjectFiles = function (manifestList) { return __awaiter(void 0, vo
 }); };
 
 var checkDownloadFilesIsExpired = function (manifestList) {
-    return manifestList.filter(function (conf) {
+    var filterList = manifestList.filter(function (conf) {
         var targetPath = getNodeModulesEnvAppCodeFilePath(conf, MANIFEST_NAME);
         var oldJson = uniReadFile(targetPath);
         var flag = !oldJson || (oldJson === null || oldJson === void 0 ? void 0 : oldJson.hash) !== conf.hash;
         return flag;
     });
+    return filterList;
 };
 var createManifestManager = function () {
     var envObj = process.env;
     var row = {
         code: "",
         mode: "",
-        cdn: '',
+        cdn: "",
         hash: "",
         publicPath: "",
         appCode: "",
@@ -616,26 +669,29 @@ var createManifestManager = function () {
         get value() {
             return row;
         },
-        setFiles: function (outDir, all) {
-            var files = all.map(function (i) {
-                var filePath = path.resolve(outDir, i);
-                var content = fs.readFileSync(filePath, "utf-8");
-                var contentHash = generateSHA256(content);
-                return {
-                    fileName: i,
-                    fileUrl: "".concat(contentHash.slice(0, 8), "_").concat(path.basename(i)),
-                };
-            });
+        setFiles: function (files) {
+            // const files = all.map((i) => {
+            //   const filePath = path.resolve(outDir, i);
+            //   const content = fs.readFileSync(filePath, "utf-8");
+            //   const contentHash = generateSHA256(content).slice(0, 8);
+            //   const dirName = path.dirname(i);
+            //   const fileName = path.basename(i)
+            //   const suffixName = dirName === "." ? "" : `${dirName}/`;
+            //   return {
+            //     fileName: i,
+            //     fileUrl: `${suffixName}${contentHash}_${fileName}`,
+            //   };
+            // });
             row.files = files;
         },
         setPagesJson: function (pagesJson) {
             row.pagesJson = pagesJson;
         },
-        saveFile: function (outDir) {
-            var files = row.files.filter(function (i) { return i.fileName !== MANIFEST_NAME; });
-            row.hash = generateSHA256(JSON.stringify(__assign(__assign({}, row), { files: files })));
-            var filePath = path.resolve(outDir, MANIFEST_NAME);
-            writeFiles(filePath, JSON.stringify(row, null, 2));
+        saveFile: function (filePath) {
+            // const files = row.files.filter((i) => i.fileName !== MANIFEST_NAME);
+            var newManifest = __assign(__assign({}, row), { isServe: undefined });
+            newManifest.hash = generateSHA256(JSON.stringify(__assign({}, newManifest)));
+            writeFiles(filePath, JSON.stringify(newManifest, null, 2));
         },
         setEnv: function (mode) {
             // const env = loadViteConfig(mode);
@@ -650,6 +706,7 @@ var createManifestManager = function () {
                 row.isRoot = true;
                 row.apps = mfeJson.apps;
             }
+            row.isServe = env.serve;
             row.publicPath = getManifestCdnDirUrl(row);
         },
         dependencies: [],
@@ -664,15 +721,86 @@ var createManifestManager = function () {
     };
 };
 
-var resetOutDir = function (currentManifestJson, config) {
+var getMainProcess = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var URL, mainProcess, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                URL = "http://localhost:".concat(WS_PORT).concat(HTTP_PATH, "/root-path");
+                return [4 /*yield*/, fetch(URL)];
+            case 1:
+                mainProcess = _a.sent();
+                return [4 /*yield*/, mainProcess.json()];
+            case 2:
+                result = _a.sent();
+                console.log(result, "mainProcess");
+                return [2 /*return*/, result];
+        }
+    });
+}); };
+var getMainProcessLoop = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var mainProcess;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, getMainProcess()];
+            case 1:
+                mainProcess = _a.sent();
+                return [2 /*return*/, mainProcess];
+            case 2:
+                _a.sent();
+                return [3 /*break*/, 3];
+            case 3: return [2 /*return*/, new Promise(function (resolve) {
+                    setTimeout(function () {
+                        resolve(getMainProcessLoop());
+                    }, 1000);
+                })];
+        }
+    });
+}); };
+var resetOutDir = function (currentManifestJson, config) { return __awaiter(void 0, void 0, void 0, function () {
+    var childBuild, currentManifest, mainProcess, exp;
     var _a;
-    var exp = new RegExp("/(".concat(currentManifestJson.value.appCode, ")/?"));
-    process.env.MFE_SOURCE_OUTPUT_DIR = config.build.outDir;
-    process.env.MFE_ROOT_OUTPUT_DIR = (_a = process.env.MFE_SOURCE_OUTPUT_DIR) === null || _a === void 0 ? void 0 : _a.replace(exp, "/").replace(/\/$/, "");
-    // if (!currentManifestJson.value.isRoot)
-    process.env.UNI_OUTPUT_DIR = process.env.MFE_ROOT_OUTPUT_DIR;
-};
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                childBuild = process.env.MFE_TARGET_DIR === "root";
+                currentManifest = currentManifestJson.value;
+                if (!(!currentManifest.isRoot && childBuild && !currentManifest.isServe)) return [3 /*break*/, 2];
+                return [4 /*yield*/, getMainProcessLoop()];
+            case 1:
+                mainProcess = _b.sent();
+                // mainProcess.UNI_OUTPUT_DIR
+                config.build.outDir = "".concat(mainProcess.UNI_OUTPUT_DIR, "/").concat(currentManifest.appCode);
+                _b.label = 2;
+            case 2:
+                exp = new RegExp("/(".concat(currentManifest.appCode, ")/?"));
+                // http://localhost:3560/__mfe__http__/root-path
+                // if()
+                process.env.MFE_SOURCE_OUTPUT_DIR = config.build.outDir;
+                process.env.MFE_ROOT_OUTPUT_DIR = (_a = process.env.MFE_SOURCE_OUTPUT_DIR) === null || _a === void 0 ? void 0 : _a.replace(exp, "/").replace(/\/$/, "");
+                // if (!currentManifestJson.value.isRoot)
+                process.env.UNI_OUTPUT_DIR = process.env.MFE_ROOT_OUTPUT_DIR;
+                return [2 /*return*/];
+        }
+    });
+}); };
 
+var addUniCopyPluginHook = function (_a) {
+    var before = _a.before, after = _a.after;
+    var FileWatcher = require("@dcloudio/uni-cli-shared/dist/watcher").FileWatcher;
+    var originalCopy = FileWatcher.prototype.copy;
+    // Hook copy方法
+    FileWatcher.prototype.copy = function (from) {
+        var to = this.to(from);
+        var fromPath = this.from(from);
+        before === null || before === void 0 ? void 0 : before(fromPath, to);
+        var result = originalCopy.call(this, from);
+        after === null || after === void 0 ? void 0 : after(fromPath, to);
+        return result;
+    };
+};
 var copyFilesByTargetPath = function (sourcePath, targetPath) {
     if (!fs.existsSync(sourcePath))
         return;
@@ -849,42 +977,140 @@ var transformToWeixinFormat = function (uniPagesConfig) {
     return weixinConfig;
 };
 
+// import { addRunningAppToSave } from "../running-core";
+var CollectFiles = /** @class */ (function () {
+    function CollectFiles() {
+        this.callbackFiles = [];
+        this.callbackFiles = [];
+        this.emitted = new Map();
+        this.outDir = "";
+    }
+    Object.defineProperty(CollectFiles.prototype, "collectedBuildFiles", {
+        get: function () {
+            return Array.from(this.emitted.values());
+        },
+        enumerable: false,
+        configurable: true
+    });
+    CollectFiles.prototype.collectBoundleFile = function (bundles) {
+        var _this = this;
+        Object.keys(bundles).forEach(function (key) {
+            var boundle = bundles[key];
+            var fileName = boundle.fileName, source = boundle.source, code = boundle.code;
+            var fileInfo = genreFileInfoRow({ fileName: fileName, source: code || source });
+            _this.emitted.set(fileName, fileInfo);
+        });
+    };
+    CollectFiles.prototype.addManifestFile = function () {
+        this.emitted.set(MANIFEST_NAME, {
+            fileName: MANIFEST_NAME,
+            fileUrl: MANIFEST_NAME,
+        });
+    };
+    CollectFiles.prototype.collectCopyFiles = function () {
+        var _this = this;
+        this.callbackFiles.forEach(function (_a) {
+            var abs = _a.abs, filePath = _a.filePath;
+            try {
+                var stat = fs.statSync(abs);
+                if (stat.isFile()) {
+                    var fileInfo = genreFileInfoRow({
+                        fileName: filePath,
+                        source: fs.readFileSync(abs, "utf8"),
+                    });
+                    _this.emitted.set(filePath, fileInfo);
+                }
+                else if (stat.isDirectory()) {
+                    var files = walkDir(abs);
+                    files.forEach(function (file) {
+                        var absFilePath = path.resolve(abs, file);
+                        var fullFileName = path.join(filePath, file);
+                        _this.emitted.set(fullFileName, genreFileInfoRow({
+                            fileName: fullFileName,
+                            source: fs.readFileSync(absFilePath, "utf8"),
+                        }));
+                    });
+                }
+            }
+            catch (e) {
+                console.log(e);
+            }
+        });
+        this.addManifestFile();
+    };
+    CollectFiles.prototype.copyFilesToPublishDir = function () {
+        var _this = this;
+        this.collectedBuildFiles.forEach(function (_a) {
+            var fileName = _a.fileName, fileUrl = _a.fileUrl;
+            var sourcePath = path.resolve(_this.outDir, fileName);
+            var targetPath = path.resolve(PUBLISH_PATH, fileUrl);
+            copyFilesByTargetPath(sourcePath, targetPath);
+        });
+    };
+    return CollectFiles;
+}());
 var createManifestPlugin = function (manifestJson) {
-    var emitted = new Set();
+    var collectFiles = new CollectFiles();
     return {
         name: "@dd-code:genre-mainfest-file-list",
         enforce: "post",
+        config: function (config) {
+            var _a;
+            var outDir = ((_a = config.build) === null || _a === void 0 ? void 0 : _a.outDir) || "dist";
+            collectFiles.outDir = outDir;
+            addUniCopyPluginHook({
+                after: function (fromPath, to) {
+                    collectFiles.callbackFiles.push({
+                        abs: fromPath,
+                        filePath: path.relative(outDir, to),
+                    });
+                },
+            });
+        },
         renderStart: function () {
             var content = initPrePagesJson();
             var json = getPagesJson(content);
             manifestJson.setPagesJson(json);
         },
         writeBundle: function (_outputOptions, bundle) {
-            Object.values(bundle).forEach(function (item) {
-                if (item && item.fileName)
-                    emitted.add(item.fileName);
-            });
+            collectFiles.collectBoundleFile(bundle);
         },
         closeBundle: function () {
-            var outDir = process.env.MFE_SOURCE_OUTPUT_DIR || "dist";
-            var all = walkDir(outDir, emitted);
-            manifestJson.setFiles(outDir, all);
             var sourcePath = manifestJson.value.isRoot
                 ? process.env.MFE_ROOT_OUTPUT_DIR
                 : path.resolve(process.env.MFE_ROOT_OUTPUT_DIR, manifestJson.value.appCode);
-            // debugger;
-            manifestJson.saveFile(sourcePath);
-            // const targetPath = path.resolve(TEMP_FILE_PATH, manifestJson.value.appCode);
-            // copyFilesByTargetPath(sourcePath, targetPath);
+            var filePath = path.resolve(sourcePath, MANIFEST_NAME);
+            collectFiles.collectCopyFiles();
+            manifestJson.setFiles(collectFiles.collectedBuildFiles);
+            manifestJson.saveFile(filePath);
+            // console.log({ filePath }, "sourcePath");
+            // addRunningAppToSave(manifestJson.value.appCode, filePath);
+            setTimeout(function () {
+                collectFiles.copyFilesToPublishDir();
+            }, 0);
         },
     };
 };
 
+var app = null;
 var createHttpServer = function () {
-    var app = express();
+    if (app)
+        return app;
+    app = express();
     var server = http.createServer(app);
+    app.get("".concat(HTTP_PATH, "/root-path"), function (req, res) {
+        res.send(process.env);
+    });
     app.use(cors({ origin: "*" }));
-    return server;
+    return {
+        server: server,
+        start: function (type) {
+            var originKey = type || "http";
+            server.listen(WS_PORT, function () {
+                console.log("[uni-".concat(originKey, "] ").concat(originKey, "://localhost:").concat(WS_PORT).concat(HTTP_PATH));
+            });
+        },
+    };
 };
 
 var WsServer = /** @class */ (function () {
@@ -906,17 +1132,12 @@ var WsServer = /** @class */ (function () {
         if (this.wss)
             return; // 避免重复创建
         this.wss = new WebSocketServer({
-            server: this.httpServer, // 绑定到 Vite 的 HTTP 服务器
+            server: this.httpServer.server, // 绑定到 Vite 的 HTTP 服务器
             path: WS_PATH, // WS 连接路径，前端连接时用 ws://localhost:5173/__mfe__ws__
         });
         this.onMessage(this.handleMessage);
         this.onConnection();
-        this.start();
-    };
-    WsServer.prototype.start = function () {
-        this.httpServer.listen(WS_PORT, function () {
-            console.log("[uni-WS] \u72EC\u7ACB\u670D\u52A1\u5DF2\u542F\u52A8\uFF1Aws://localhost:".concat(WS_PORT).concat(WS_PATH));
-        });
+        this.httpServer.start('ws');
     };
     WsServer.prototype.onMessage = function (callback) {
         // WebSocketServer 不支持直接监听 message，必须在 connection 后的 socket 上监听
@@ -1046,9 +1267,37 @@ var WsClientServer = /** @class */ (function () {
 // export const mfeServer = new WsServer();
 // export const mfeClientServer = new WsClientServer();
 
-/**
- * 过滤 Manifest 列表并获取主应用 app.json 路径
- */
+// export const addRunningAppToSave = (appCode, filePath: string) => {
+//   const content = uniReadFile(SERVE_MPWEIXIN_MANIFEST);
+//   if (content) {
+//     content[appCode] = filePath;
+//   }
+//   writeFiles(SERVE_MPWEIXIN_MANIFEST, JSON.stringify(content, null, 2));
+// };
+var getAppsManifestList = function (mode) {
+    var _a;
+    var manifest = formatCliCommandConfig(mode);
+    if (!manifest.isRoot) {
+        return [];
+    }
+    if (manifest.serve) {
+        return [];
+    }
+    var mfeJson = getMfeJson();
+    if (!((_a = mfeJson === null || mfeJson === void 0 ? void 0 : mfeJson.apps) === null || _a === void 0 ? void 0 : _a.length)) {
+        throw new Error("mfeJson.apps is empty");
+    }
+    var apps = ((mfeJson === null || mfeJson === void 0 ? void 0 : mfeJson.apps) || []).map(function (_a) {
+        var appCode = _a.appCode;
+        return {
+            appCode: appCode,
+            filePath: "".concat(process.env.UNI_OUTPUT_DIR, "/").concat(appCode, "/").concat(MANIFEST_NAME),
+        };
+    });
+    // console.log(apps);
+    return apps;
+};
+
 var filterManifestJsonListAndMainPageJson = function (manifestJsonList) {
     var outputPageJsonPath = getMainAppJsonPath();
     return {
@@ -1056,9 +1305,6 @@ var filterManifestJsonListAndMainPageJson = function (manifestJsonList) {
         manifestList: manifestJsonList.filter(function (item) { return !checkIsRootManifest(item); }),
     };
 };
-/**
- * 根据 Manifest 列表渲染 app.json 的 subPackages
- */
 var renderPagesJsonByArray = function (appPages, pageJson) {
     var _loop_1 = function (app) {
         var _a = getPagesJson(JSON.stringify((app === null || app === void 0 ? void 0 : app.pagesJson) || {}), true).pages, pages = _a === void 0 ? [] : _a;
@@ -1066,7 +1312,6 @@ var renderPagesJsonByArray = function (appPages, pageJson) {
             root: app.appCode,
             pages: __spreadArray([], pages, true),
         };
-        // 移除旧的 subPackage 配置并添加新的
         pageJson.subPackages = pageJson.subPackages.filter(function (i) { return i.root !== currentTemp.root; });
         pageJson.subPackages.push(currentTemp);
         pageJson.subPackages = pageJson.subPackages.filter(function (i) { return i.pages.length; });
@@ -1080,62 +1325,43 @@ var renderPagesJsonByArray = function (appPages, pageJson) {
     }
     return pageJson;
 };
-/**
- * 生成完整的主应用 app.json
- */
 var genreFullMainAppJsonByManifestList = function (appJson, manifestList) {
     return renderPagesJsonByArray(manifestList, appJson);
 };
-/**
- * 监听 dist 目录变化并同步文件
- */
-var watchDistChangeAndSyncFile = function (mainPwd, onReady, onChange) {
-    var root = process.env.MFE_SOURCE_OUTPUT_DIR;
-    if (!root) {
-        console.error("[Watcher] MFE_SOURCE_OUTPUT_DIR not set");
-        return;
+var DistWatcher = /** @class */ (function () {
+    function DistWatcher() {
     }
-    var filePath = path.resolve(root);
-    // 确保目录存在，避免监听失效
-    checkAndgenreDir(filePath);
-    // 监听父级目录，过滤出目标目录下的变化，解决目录重建导致监听失效的问题
-    var parentDir = path.dirname(filePath);
-    var watcher = chokidar.watch(parentDir, {
-        persistent: true,
-        ignoreInitial: true,
-        usePolling: true,
-        interval: 100,
-        awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 100 },
-        followSymlinks: true,
-        depth: 99
-    });
-    var isTargetFile = function (p) {
-        return p.startsWith(filePath + path.sep) || p === filePath;
-    };
-    watcher.on("ready", onReady);
-    ["add", "change", "unlink"].forEach(function (evt) {
-        // @ts-ignore
-        watcher.on(evt, function (p) {
-            if (!isTargetFile(p))
-                return;
-            var rel = path.relative(filePath, p);
-            var sourcePath = p;
-            var targetPath = path.join(mainPwd, rel);
-            // 仅文件内容变化才执行复制操作，目录变化由构建工具处理
-            if (["add", "change"].includes(evt)) {
-                copyFilesByTargetPath(sourcePath, targetPath);
-            }
-            onChange === null || onChange === void 0 ? void 0 : onChange({ type: evt, p: p, sourcePath: sourcePath, targetPath: targetPath });
+    DistWatcher.prototype.start = function (mainPwd, onReady, onChange) {
+        var root = process.env.MFE_SOURCE_OUTPUT_DIR;
+        if (!root)
+            return;
+        var filePath = path.resolve(root);
+        checkAndgenreDir(filePath);
+        var parentDir = path.dirname(filePath);
+        var watcher = createFileWatcher(parentDir);
+        var isTargetFile = function (p) {
+            return p.startsWith(filePath + path.sep) || p === filePath;
+        };
+        watcher.on("ready", onReady);
+        ["add", "change", "unlink"].forEach(function (evt) {
+            // @ts-ignore
+            watcher.on(evt, function (p) {
+                if (!isTargetFile(p))
+                    return;
+                var rel = path.relative(filePath, p);
+                var sourcePath = p;
+                var targetPath = path.join(mainPwd, rel);
+                if (["add", "change"].includes(evt)) {
+                    copyFilesByTargetPath(sourcePath, targetPath);
+                }
+                onChange === null || onChange === void 0 ? void 0 : onChange({ type: evt, p: p, sourcePath: sourcePath, targetPath: targetPath });
+            });
         });
-    });
-    watcher.on('error', function (err) { return console.error('[Watcher] error:', err); });
-};
-/**
- * 生成新的 app.json 文件
- */
-var genreNewAppJson = function (outputPageJsonPath, mainAppJsonPath, manifestList) {
+    };
+    return DistWatcher;
+}());
+var genreNewAppJson = function (outputPageJsonPath, appJson, manifestList) {
     try {
-        var appJson = uniReadFile(mainAppJsonPath);
         var newAppJSon = genreFullMainAppJsonByManifestList(__assign({ subPackages: [] }, appJson), manifestList);
         writeFiles(outputPageJsonPath, newAppJSon);
     }
@@ -1143,9 +1369,6 @@ var genreNewAppJson = function (outputPageJsonPath, mainAppJsonPath, manifestLis
         console.error("[AppJSON] Genre failed:", error);
     }
 };
-/**
- * 处理主应用服务端逻辑
- */
 var createMainAppServer = function (manifestJson) {
     var mfeServer = WsServer.getInstance(function (opt) {
         var type = opt.type, data = opt.data;
@@ -1154,9 +1377,8 @@ var createMainAppServer = function (manifestJson) {
             var manifestPath = path.join(process.env.UNI_OUTPUT_DIR, data.appCode, MANIFEST_NAME);
             try {
                 var manifestChildJson = uniReadFile(manifestPath);
-                genreNewAppJson(outputPageJsonPath, outputPageJsonPath, [
-                    manifestChildJson,
-                ]);
+                var mainAppJson = uniReadFile(outputPageJsonPath);
+                genreNewAppJson(outputPageJsonPath, mainAppJson, [manifestChildJson]);
             }
             catch (e) {
                 console.error("[Server] Handle child change failed:", e);
@@ -1166,9 +1388,6 @@ var createMainAppServer = function (manifestJson) {
     mfeServer.createServer();
     return mfeServer;
 };
-/**
- * 处理子应用客户端逻辑
- */
 var createMainAppClient = function (manifestJson, onInit) {
     var client = WsClientServer.getInstance(function (opt) {
         if (opt.type === E_WS_TYPE.INIT) {
@@ -1178,19 +1397,44 @@ var createMainAppClient = function (manifestJson, onInit) {
     client.connect(manifestJson.value.appCode);
     return client;
 };
-/**
- * 创建主应用插件
- */
 var createMainAppPlugin = function (manifestJson) {
     var mainPwd = "";
     var isWatcherReady = false;
     var mfeClientServer;
     var fn = null;
+    var isBuild = function () { return process.env.MFE_BUILD_MODE === EBuildMode.BUILD; };
+    var isServe = function () { return manifestJson.value.isServe; };
+    var isStartServer = function () {
+        if (isBuild())
+            return false;
+        return isServe();
+    };
+    var watchFile = function () {
+        var allManifest = getAppsManifestList(manifestJson.value.mode);
+        var watchFileList = allManifest.map(function (item) { return item.filePath; });
+        var watcher = createFileWatcher(watchFileList);
+        watcher.on("change", function (path) {
+            var manifestJson = uniFsReadJSONFile(path);
+            var outputPageJsonPath = getMainAppJsonPath();
+            var mainAppJson = uniFsReadJSONFile(outputPageJsonPath);
+            genreNewAppJson(outputPageJsonPath, mainAppJson, [manifestJson]);
+        });
+    };
+    var distWatcher = new DistWatcher();
     var serverPlugin = {
         name: "@dd-code:main-app:serve",
         config: function () {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
+                var isServe, _a, start;
+                return __generator(this, function (_b) {
+                    isServe = isStartServer();
+                    if (!isServe) {
+                        if (!isBuild() && manifestJson.value.isRoot) {
+                            _a = createHttpServer(), _a.server, start = _a.start;
+                            start();
+                        }
+                        return [2 /*return*/];
+                    }
                     if (manifestJson.value.isRoot) {
                         createMainAppServer();
                     }
@@ -1204,6 +1448,9 @@ var createMainAppPlugin = function (manifestJson) {
             });
         },
         closeBundle: function () {
+            var isServe = isStartServer();
+            if (!isServe)
+                return;
             if (!manifestJson.value.isRoot) {
                 serverPlugin.initWatchChange();
                 fn === null || fn === void 0 ? void 0 : fn();
@@ -1213,9 +1460,8 @@ var createMainAppPlugin = function (manifestJson) {
         initWatchChange: function () {
             if (isWatcherReady)
                 return;
-            watchDistChangeAndSyncFile(mainPwd, function () {
+            distWatcher.start(mainPwd, function () {
                 isWatcherReady = true;
-                // console.log(`[Watcher] Ready watching: ${process.env.MFE_SOURCE_OUTPUT_DIR}`);
             }, function (change) {
                 fn = function () {
                     return mfeClientServer.sendMessage(E_WS_TYPE.CHANGE, __assign(__assign({}, change), { appCode: manifestJson.value.appCode }));
@@ -1236,18 +1482,38 @@ var createMainAppPlugin = function (manifestJson) {
     };
     return [
         serverPlugin,
+        {
+            name: "@dd-code:main-app:watch",
+            closeBundle: function () {
+                return __awaiter(this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        if (isBuild())
+                            return [2 /*return*/];
+                        if (isServe())
+                            return [2 /*return*/];
+                        // if (!isServe) return;
+                        watchFile === null || watchFile === void 0 ? void 0 : watchFile();
+                        watchFile = null;
+                        return [2 /*return*/];
+                    });
+                });
+            },
+        },
         {
             name: "@dd-code:main-app",
             enforce: "post",
             closeBundle: function () {
                 return __awaiter(this, void 0, void 0, function () {
-                    var _a, outputPageJsonPath, manifestList, mainAppJsonPath;
+                    var _a, outputPageJsonPath, manifestList, mainAppJsonPath, mainAppJson;
                     return __generator(this, function (_b) {
                         _a = filterManifestJsonListAndMainPageJson(__spreadArray(__spreadArray([], manifestJson.dependencies, true), [
                             manifestJson.value,
                         ], false)), outputPageJsonPath = _a.outputPageJsonPath, manifestList = _a.manifestList;
-                        mainAppJsonPath = getMainAppJSon(manifestJson.value.mode, ROOT_APP_CODE);
-                        genreNewAppJson(outputPageJsonPath, mainAppJsonPath, manifestList);
+                        mainAppJsonPath = !manifestJson.value.isRoot
+                            ? getNodeModuleMainAppJSon(manifestJson.value.mode, ROOT_APP_CODE)
+                            : getMainAppJsonPath();
+                        mainAppJson = uniReadFile(mainAppJsonPath);
+                        genreNewAppJson(outputPageJsonPath, mainAppJson, manifestList);
                         return [2 /*return*/];
                     });
                 });
@@ -1263,8 +1529,18 @@ var createMpWeixinUniPlugin = function (options) {
             name: "@dd-code:genre-params",
             enforce: "pre",
             config: function (config) {
-                currentManifestJson.setEnv(config.mode);
-                resetOutDir(currentManifestJson, config);
+                return __awaiter(this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                currentManifestJson.setEnv(config.mode);
+                                return [4 /*yield*/, resetOutDir(currentManifestJson, config)];
+                            case 1:
+                                _a.sent();
+                                return [2 /*return*/];
+                        }
+                    });
+                });
             },
         },
         createAppsAssetsPlugin(currentManifestJson),