@dd-code/uni-tools 1.0.11 → 1.0.13

package/dist/cli.js

@@ -3,6 +3,7 @@
 
 var shared = require('@dd-code/shared');
 var path = require('path');
+var fsExtra = require('fs-extra');
 var fs = require('fs');
 require('crypto');
 require('chokidar');
@@ -118,6 +119,17 @@ var loadViteConfig = function (mode) {
     var ROOT = process.cwd();
     return loadEnv(mode, ROOT, "MFE_");
 };
+var unlinkDeepDirOrFile = function (filePath) {
+    try {
+        if (fsExtra.pathExistsSync(filePath)) {
+            // 同步检查是否存在
+            fsExtra.removeSync(filePath); // 同步递归删除
+        }
+    }
+    catch (err) {
+        console.error("删除文件夹失败：", err);
+    }
+};
 
 // 项目 Git 子模块路径
 var PROJECT_GIT_PATH = "src/subtree";
@@ -253,6 +265,7 @@ var fetchAppsRepo = function () { return __awaiter(void 0, void 0, void 0, funct
                     if (repoUrl) {
                         var fileName = appCode.replace(/\//g, "_");
                         var dir = PROJECT_GIT_PATH;
+                        unlinkDeepDirOrFile(path.join(dir, fileName));
                         checkAndgenreDir(dir);
                         child_process.execSync("cd ".concat(dir, " && git clone ").concat(repoUrl, " ").concat(fileName), {
                             stdio: "inherit",

package/dist/cli.mjs.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { program } from '@dd-code/shared';
 import path from 'path';
+import fsExtra from 'fs-extra';
 import fs from 'fs';
 import 'crypto';
 import 'chokidar';
@@ -116,6 +117,17 @@ var loadViteConfig = function (mode) {
     var ROOT = process.cwd();
     return loadEnv(mode, ROOT, "MFE_");
 };
+var unlinkDeepDirOrFile = function (filePath) {
+    try {
+        if (fsExtra.pathExistsSync(filePath)) {
+            // 同步检查是否存在
+            fsExtra.removeSync(filePath); // 同步递归删除
+        }
+    }
+    catch (err) {
+        console.error("删除文件夹失败：", err);
+    }
+};
 
 // 项目 Git 子模块路径
 var PROJECT_GIT_PATH = "src/subtree";
@@ -251,6 +263,7 @@ var fetchAppsRepo = function () { return __awaiter(void 0, void 0, void 0, funct
                     if (repoUrl) {
                         var fileName = appCode.replace(/\//g, "_");
                         var dir = PROJECT_GIT_PATH;
+                        unlinkDeepDirOrFile(path.join(dir, fileName));
                         checkAndgenreDir(dir);
                         execSync("cd ".concat(dir, " && git clone ").concat(repoUrl, " ").concat(fileName), {
                             stdio: "inherit",

package/dist/index.js

@@ -1,17 +1,17 @@
 'use strict';
 
 var path = require('path');
+var fsExtra = require('fs-extra');
 var fs = require('fs');
 var crypto = require('crypto');
 var chokidar = require('chokidar');
 var cliProgress = require('cli-progress');
 var chalk = require('chalk');
-var fsExtra = require('fs-extra');
+require('child_process');
 var WebSocket = require('ws');
 var express = require('express');
 var http = require('http');
 var cors = require('cors');
-require('child_process');
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -264,6 +264,17 @@ var createFileWatcher = function (filePath, opt) {
 };
 var checkIsBuildInChild = function () { return process.env.MFE_TARGET_DIR === "root"; };
 var checkIsInnerBuild = function () { return process.env.MFE_INNER_BUILD === "true"; };
+var unlinkDeepDirOrFile = function (filePath) {
+    try {
+        if (fsExtra.pathExistsSync(filePath)) {
+            // 同步检查是否存在
+            fsExtra.removeSync(filePath); // 同步递归删除
+        }
+    }
+    catch (err) {
+        console.error("删除文件夹失败：", err);
+    }
+};
 
 var UniCdnManager = /** @class */ (function () {
     function UniCdnManager() {
@@ -405,7 +416,7 @@ var formatCliCommandConfig = function (mode) {
 var checkIsRootManifest = function (manifest) {
     return manifest.isRoot || manifest.appCode === ROOT_APP_CODE;
 };
-var WS_PORT = 3560;
+var WS_PORT = 3561;
 var WS_PATH = "/__mfe__ws__";
 var HTTP_PATH = "/__mfe__http__";
 var E_WS_TYPE;
@@ -481,18 +492,6 @@ var getNodeModulesEnvAppCodeFilePath = function (conf, fileName) {
     var savePath = getDownloadedFilePath(conf);
     return path.resolve(savePath, fileName);
 };
-/**
- * 获取清单文件 URL 列表
- * @description 根据环境和配置生成所有应用的清单文件 URL
- * @param {string} mode - 环境标识，默认为 'dev'
- * @returns {Array<Object>} 清单 URL 对象数组
- * @returns {string} returns[].url - 清单文件 URL
- * @returns {string} returns[].appCode - 应用代码
- * @returns {string} returns[].code - 项目代码
- * @example
- * const urls = getManifestJsonUrl('prod');
- * // 返回: [{ url: '...', appCode: 'main', code: 'my-project' }]
- */
 var getManifestJsonUrl = function (mode) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, _b, isRoot, _c, code, apps, mfeJson, configApps, result;
     return __generator(this, function (_d) {
@@ -514,14 +513,11 @@ var getManifestJsonUrl = function (mode) { return __awaiter(void 0, void 0, void
                 configApps = __spreadArray(__spreadArray([], configApps, true), [{ appCode: ROOT_APP_CODE }], false);
                 _d.label = 4;
             case 4:
-                // console.log(JSON, isRoot, "JSON");
-                // debugger
-                // const configApps = JSON.apps; // isRoot ? JSON.apps : [{ appCode: ROOT_APP_CODE }];
                 apps = Array.from(new Set(__spreadArray([], (configApps || []).map(function (i) { return i.appCode; }), true)));
                 return [3 /*break*/, 6];
             case 5:
                 _d.sent();
-                apps = []; // BASE_APP_CODE_LIST;
+                apps = [];
                 return [3 /*break*/, 6];
             case 6:
                 result = apps.map(function (appCode) {
@@ -563,24 +559,6 @@ var downloadManifestJson = function (urls) { return __awaiter(void 0, void 0, vo
         }
     });
 }); };
-/**
- * 下载项目文件
- * @description 根据清单列表并行下载所有项目文件到指定目录
- * @param {Array<Object>} manifestList - 清单数据数组
- * @param {string} manifestList[].env - 环境标识
- * @returns {Promise<void>} 下载完成
- * @example
- * await downloadProjectFiles([
- *   { env: 'prod', files: [...] },
- *   { env: 'test', files: [...] }
- * ]);
- */
-/**
- * 根据manifest文件下载所有相关文件
- * 用于微前端架构中的模块文件下载
- * @param {Object} manifestJson - manifest文件内容
- * @param {string} outDir - 输出目录
- */
 function downloadFilesByManifestJson(manifestJson, outDir, onDownload) {
     return __awaiter(this, void 0, void 0, function () {
         var cdn, appCode, publicPath, files, _a, _b, _c, _i, i, file, fileUrl, fileName, downloadUrl, content;
@@ -605,7 +583,6 @@ function downloadFilesByManifestJson(manifestJson, outDir, onDownload) {
                     return [4 /*yield*/, fetchFileByPath(downloadUrl)];
                 case 2:
                     content = _d.sent();
-                    // console.log(path.join(outDir, appCode || "", fileName), 'path.join(outDir, appCode || "", fileName)');
                     writeFiles(path.join(outDir, appCode || "", fileName), content);
                     onDownload && onDownload(Number(i), file.length);
                     _d.label = 3;
@@ -674,31 +651,17 @@ var createManifestManager = function () {
             return row;
         },
         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 (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);
             var env = formatCliCommandConfig(mode);
             var mfeJson = getMfeJson();
             row.cdn = env.cdn;
@@ -717,11 +680,6 @@ var createManifestManager = function () {
         setDependencies: function (list) {
             this.dependencies = list;
         },
-        // getFullManifestJsonList() {
-        //   const files = import.meta.globEager("./**/*.json");
-        //   console.log(files);
-        //   // return [...this.dependencies, this.value];
-        // },
     };
 };
 
@@ -812,7 +770,6 @@ 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);
@@ -830,7 +787,23 @@ var copyFilesByTargetPath = function (sourcePath, targetPath) {
         fsExtra.ensureDirSync(targetDir);
     }
     catch (err) { }
-    fsExtra.copySync(sourcePath, targetPath, { overwrite: true });
+    var shouldSkip = function () {
+        try {
+            var s = fs.statSync(sourcePath);
+            var t = fs.statSync(targetPath);
+            if (s.isDirectory() || t.isDirectory())
+                return false;
+            var sb = fs.readFileSync(sourcePath);
+            var tb = fs.readFileSync(targetPath);
+            return sb.length === tb.length && sb.equals(tb);
+        }
+        catch (_a) {
+            return false;
+        }
+    };
+    if (!shouldSkip()) {
+        fsExtra.copySync(sourcePath, targetPath, { overwrite: true });
+    }
 };
 
 var downloadFullApps = function (manifestJson) { return __awaiter(void 0, void 0, void 0, function () {
@@ -915,24 +888,18 @@ var getPagesJson = function (jsonFile, isFormat) {
     var platform = process.env.UNI_PLATFORM;
     initPreContext(platform);
     var context = getPreVueContext();
-    // 使用uni的预处理器处理pages.json
     var processedJsonStr = preprocess(jsonFile, context, { type: "js" });
-    // 解析为JSON对象
     var pagesConfig = eval("(".concat(processedJsonStr, ")"));
-    // 针对微信小程序平台，处理特有的配置项
     if (isFormat && platform === "mp-weixin") {
         return transformToWeixinFormat(pagesConfig);
     }
     return pagesConfig;
 };
-// 将uni-app的pages.json转换为微信小程序格式
 var transformToWeixinFormat = function (uniPagesConfig) {
     var _a;
     var weixinConfig = __assign({ pages: [], window: {}, tabBar: null, subPackages: [], usingComponents: {} }, uniPagesConfig);
-    // 处理globalStyle -> window
     if (uniPagesConfig.globalStyle) {
         var globalStyle = uniPagesConfig.globalStyle;
-        // 基础窗口配置
         weixinConfig.window = {
             navigationBarBackgroundColor: globalStyle.navigationBarBackgroundColor || "#000000",
             navigationBarTextStyle: globalStyle.navigationBarTextStyle || "white",
@@ -942,30 +909,25 @@ var transformToWeixinFormat = function (uniPagesConfig) {
             enablePullDownRefresh: globalStyle.enablePullDownRefresh || false,
             onReachBottomDistance: globalStyle.onReachBottomDistance || 50,
         };
-        // 处理微信小程序特有配置
         if (globalStyle.pageOrientation) {
             weixinConfig.window.pageOrientation = globalStyle.pageOrientation;
         }
         if (globalStyle.renderingMode) {
             weixinConfig.window.renderingMode = globalStyle.renderingMode;
         }
-        // 处理usingComponents
         if (globalStyle.usingComponents) {
             weixinConfig.usingComponents = globalStyle.usingComponents;
         }
-        // 处理微信小程序平台特定配置
         if (globalStyle["mp-weixin"]) {
             Object.assign(weixinConfig.window, globalStyle["mp-weixin"]);
         }
     }
-    // 处理pages配置
     if (uniPagesConfig.pages) {
         weixinConfig.pages = uniPagesConfig.pages.map(function (page) {
             var weixinPage = page.path;
             return weixinPage;
         });
     }
-    // 处理tabBar配置
     if (uniPagesConfig.tabBar) {
         weixinConfig.tabBar = __assign(__assign({}, uniPagesConfig.tabBar), { list: (_a = uniPagesConfig.tabBar.list) === null || _a === void 0 ? void 0 : _a.map(function (item) { return ({
                 pagePath: item.pagePath,
@@ -974,7 +936,6 @@ var transformToWeixinFormat = function (uniPagesConfig) {
                 selectedIconPath: item.selectedIconPath,
             }); }) });
     }
-    // 处理分包配置
     if (uniPagesConfig.subPackages) {
         weixinConfig.subPackages = uniPagesConfig.subPackages.map(function (subPackage) {
             var _a;
@@ -984,11 +945,9 @@ var transformToWeixinFormat = function (uniPagesConfig) {
             });
         });
     }
-    // 处理预下载规则
     if (uniPagesConfig.preloadRule) {
         weixinConfig.preloadRule = uniPagesConfig.preloadRule;
     }
-    // 移除uni-app特有的配置项
     delete weixinConfig.globalStyle;
     delete weixinConfig.easycom;
     delete weixinConfig.condition;
@@ -1076,7 +1035,6 @@ var createManifestPlugin = function (manifestJson) {
     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";
@@ -1108,17 +1066,100 @@ var createManifestPlugin = function (manifestJson) {
             manifestJson.saveFile(filePath);
             // console.log({ filePath }, "sourcePath");
             // addRunningAppToSave(manifestJson.value.appCode, filePath);
-            setTimeout(function () {
-                collectFiles.copyFilesToPublishDir();
-            }, 0);
+            // setTimeout(() => {
+            collectFiles.copyFilesToPublishDir();
+            // }, 0);
         },
     };
 };
 
+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;
+        var currentTemp = {
+            root: app.appCode,
+            pages: __spreadArray([], pages, true),
+        };
+        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; });
+    };
+    for (var _i = 0, appPages_1 = appPages; _i < appPages_1.length; _i++) {
+        var app = appPages_1[_i];
+        _loop_1(app);
+    }
+    if (!pageJson.tabBar) {
+        delete pageJson.tabBar;
+    }
+    return pageJson;
+};
+var genreFullMainAppJsonByManifestList = function (appJson, manifestList) {
+    return renderPagesJsonByArray(manifestList, appJson);
+};
+var genreNewAppJson = function (outputPageJsonPath, appJson, manifestList) {
+    var newAppJSon = genreFullMainAppJsonByManifestList(__assign({ subPackages: [] }, appJson), manifestList);
+    var old = uniFsReadJSONFile(outputPageJsonPath) || {};
+    var nextStr = JSON.stringify(newAppJSon);
+    var oldStr = JSON.stringify(old);
+    if (nextStr !== oldStr) {
+        writeFiles(outputPageJsonPath, newAppJSon);
+    }
+};
+
+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),
+        };
+    });
+    return apps;
+};
+var startDistWatcher = 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 });
+        });
+    });
+};
+
 var app = null;
 var createHttpServer = function () {
     if (app)
-        return app;
+        return { server: app, start: function () { } };
     app = express();
     var server = http.createServer(app);
     app.get("".concat(HTTP_PATH, "/root-path"), function (req, res) {
@@ -1290,37 +1331,6 @@ var WsClientServer = /** @class */ (function () {
 // export const mfeServer = new WsServer();
 // export const mfeClientServer = new WsClientServer();
 
-// 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 {
@@ -1328,71 +1338,7 @@ var filterManifestJsonListAndMainPageJson = function (manifestJsonList) {
         manifestList: manifestJsonList.filter(function (item) { return !checkIsRootManifest(item); }),
     };
 };
-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;
-        var currentTemp = {
-            root: app.appCode,
-            pages: __spreadArray([], pages, true),
-        };
-        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; });
-    };
-    for (var _i = 0, appPages_1 = appPages; _i < appPages_1.length; _i++) {
-        var app = appPages_1[_i];
-        _loop_1(app);
-    }
-    if (!pageJson.tabBar) {
-        delete pageJson.tabBar;
-    }
-    return pageJson;
-};
-var genreFullMainAppJsonByManifestList = function (appJson, manifestList) {
-    return renderPagesJsonByArray(manifestList, appJson);
-};
-var DistWatcher = /** @class */ (function () {
-    function DistWatcher() {
-    }
-    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 });
-            });
-        });
-    };
-    return DistWatcher;
-}());
-var genreNewAppJson = function (outputPageJsonPath, appJson, manifestList) {
-    try {
-        var newAppJSon = genreFullMainAppJsonByManifestList(__assign({ subPackages: [] }, appJson), manifestList);
-        writeFiles(outputPageJsonPath, newAppJSon);
-    }
-    catch (error) {
-        console.error("[AppJSON] Genre failed:", error);
-    }
-};
-var createMainAppServer = function (manifestJson) {
+var createMainAppServer = function () {
     var mfeServer = WsServer.getInstance(function (opt) {
         var type = opt.type, data = opt.data;
         if (type === E_WS_TYPE.CHANGE) {
@@ -1421,17 +1367,36 @@ var createMainAppClient = function (manifestJson, onInit) {
     return client;
 };
 var createMainAppPlugin = function (manifestJson) {
-    var mainPwd = "";
-    var isWatcherReady = false;
-    var mfeClientServer;
-    var fn = null;
+    var state = {
+        mainPwd: "",
+        isWatcherReady: false,
+        mfeClientServer: undefined,
+        fn: null,
+    };
     var isBuild = function () { return process.env.MFE_BUILD_MODE === EBuildMode.BUILD; };
     var isServe = function () { return manifestJson.value.isServe; };
     var isRoot = function () { return manifestJson.value.isRoot; };
-    var isStartServer = function () {
-        if (isBuild())
-            return false;
-        return isServe();
+    var initSync = function () {
+        if (state.isWatcherReady)
+            return;
+        startDistWatcher(state.mainPwd, function () {
+            state.isWatcherReady = true;
+        }, function (change) {
+            state.fn = function () {
+                return state.mfeClientServer.sendMessage(E_WS_TYPE.CHANGE, __assign(__assign({}, change), { appCode: manifestJson.value.appCode }));
+            };
+        });
+    };
+    var copyAppDistModule = function (_a) {
+        var pwd = _a.pwd;
+        if (!process.env.MFE_SOURCE_OUTPUT_DIR) {
+            console.error("[Plugin] MFE_SOURCE_OUTPUT_DIR not defined");
+            return;
+        }
+        state.mainPwd = path.join(pwd, manifestJson.value.appCode);
+        var targetPath = state.mainPwd;
+        var sourcePath = process.env.MFE_SOURCE_OUTPUT_DIR;
+        copyFilesByTargetPath(sourcePath, targetPath);
     };
     var watchFile = function () {
         var allManifest = getAppsManifestList(manifestJson.value.mode);
@@ -1444,70 +1409,53 @@ var createMainAppPlugin = function (manifestJson) {
             genreNewAppJson(outputPageJsonPath, mainAppJson, [manifestJson]);
         });
     };
-    var distWatcher = new DistWatcher();
-    var serverPlugin = {
+    var createServePlugin = function () { return ({
         name: "@dd-code:main-app:serve",
         config: function () {
             return __awaiter(this, void 0, void 0, function () {
-                var isServe, _a, start;
-                return __generator(this, function (_b) {
-                    isServe = isStartServer();
-                    if (isBuild())
-                        return [2 /*return*/];
-                    if (!isServe) {
-                        if (!isBuild() && isRoot()) {
-                            _a = createHttpServer(), _a.server, start = _a.start;
-                            start();
-                        }
+                var start;
+                return __generator(this, function (_a) {
+                    if (isBuild()) {
                         return [2 /*return*/];
                     }
                     if (isRoot()) {
+                        if (!isServe()) {
+                            start = createHttpServer().start;
+                            start();
+                            return [2 /*return*/];
+                        }
                         createMainAppServer();
+                        // const subs = findLocalSubApps();
+                        // if (subs.length) {
+                        // startLocalSubApps(subs, "mp-weixin", manifestJson.value.mode);
+                        // }
                     }
                     else {
-                        mfeClientServer = createMainAppClient(manifestJson, function (data) {
-                            serverPlugin.copyAppDistModule(data);
+                        state.mfeClientServer = createMainAppClient(manifestJson, function (data) {
+                            copyAppDistModule(data);
                         });
                     }
                     return [2 /*return*/];
                 });
             });
         },
-        closeBundle: function () {
-            var isServe = isStartServer();
-            if (!isServe)
-                return;
-            if (!isRoot()) {
-                serverPlugin.initWatchChange();
-                fn === null || fn === void 0 ? void 0 : fn();
-                fn = null;
-            }
-        },
-        initWatchChange: function () {
-            if (isWatcherReady)
-                return;
-            distWatcher.start(mainPwd, function () {
-                isWatcherReady = true;
-            }, function (change) {
-                fn = function () {
-                    return mfeClientServer.sendMessage(E_WS_TYPE.CHANGE, __assign(__assign({}, change), { appCode: manifestJson.value.appCode }));
-                };
-            });
-        },
-        copyAppDistModule: function (_a) {
-            var pwd = _a.pwd;
-            if (!process.env.MFE_SOURCE_OUTPUT_DIR) {
-                console.error("[Plugin] MFE_SOURCE_OUTPUT_DIR not defined");
-                return;
-            }
-            mainPwd = path.join(pwd, manifestJson.value.appCode);
-            var targetPath = mainPwd;
-            var sourcePath = process.env.MFE_SOURCE_OUTPUT_DIR;
-            copyFilesByTargetPath(sourcePath, targetPath);
-        },
-    };
+    }); };
     return [
-        serverPlugin,
+        createServePlugin(),
+        {
+            name: "@dd-code:main-app:sync",
+            closeBundle: function () {
+                var _a;
+                var start = isServe();
+                if (!start || isBuild())
+                    return;
+                if (isRoot())
+                    return;
+                initSync();
+                (_a = state.fn) === null || _a === void 0 ? void 0 : _a.call(state);
+                state.fn = null;
+            },
+        },
         {
             name: "@dd-code:main-app:watch",
             closeBundle: function () {
@@ -1519,7 +1467,6 @@ var createMainAppPlugin = function (manifestJson) {
                             return [2 /*return*/];
                         if (!checkIsBuildInChild())
                             return [2 /*return*/];
-                        // if (!isServe) return;
                         watchFile === null || watchFile === void 0 ? void 0 : watchFile();
                         watchFile = null;
                         return [2 /*return*/];
@@ -1565,6 +1512,8 @@ var createMpWeixinUniPlugin = function (options) {
                         switch (_a.label) {
                             case 0:
                                 currentManifestJson.setEnv(config.mode);
+                                // 清空 PUBLISH_PATH 目录
+                                unlinkDeepDirOrFile(PUBLISH_PATH);
                                 return [4 /*yield*/, resetOutDir(currentManifestJson, config)];
                             case 1:
                                 _a.sent();

package/dist/index.mjs.js

@@ -1,15 +1,15 @@
 import path from 'path';
+import fsExtra from 'fs-extra';
 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 'child_process';
 import WebSocket, { WebSocketServer } from 'ws';
 import express from 'express';
 import http from 'http';
 import cors from 'cors';
-import 'child_process';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -262,6 +262,17 @@ var createFileWatcher = function (filePath, opt) {
 };
 var checkIsBuildInChild = function () { return process.env.MFE_TARGET_DIR === "root"; };
 var checkIsInnerBuild = function () { return process.env.MFE_INNER_BUILD === "true"; };
+var unlinkDeepDirOrFile = function (filePath) {
+    try {
+        if (fsExtra.pathExistsSync(filePath)) {
+            // 同步检查是否存在
+            fsExtra.removeSync(filePath); // 同步递归删除
+        }
+    }
+    catch (err) {
+        console.error("删除文件夹失败：", err);
+    }
+};
 
 var UniCdnManager = /** @class */ (function () {
     function UniCdnManager() {
@@ -403,7 +414,7 @@ var formatCliCommandConfig = function (mode) {
 var checkIsRootManifest = function (manifest) {
     return manifest.isRoot || manifest.appCode === ROOT_APP_CODE;
 };
-var WS_PORT = 3560;
+var WS_PORT = 3561;
 var WS_PATH = "/__mfe__ws__";
 var HTTP_PATH = "/__mfe__http__";
 var E_WS_TYPE;
@@ -479,18 +490,6 @@ var getNodeModulesEnvAppCodeFilePath = function (conf, fileName) {
     var savePath = getDownloadedFilePath(conf);
     return path.resolve(savePath, fileName);
 };
-/**
- * 获取清单文件 URL 列表
- * @description 根据环境和配置生成所有应用的清单文件 URL
- * @param {string} mode - 环境标识，默认为 'dev'
- * @returns {Array<Object>} 清单 URL 对象数组
- * @returns {string} returns[].url - 清单文件 URL
- * @returns {string} returns[].appCode - 应用代码
- * @returns {string} returns[].code - 项目代码
- * @example
- * const urls = getManifestJsonUrl('prod');
- * // 返回: [{ url: '...', appCode: 'main', code: 'my-project' }]
- */
 var getManifestJsonUrl = function (mode) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, _b, isRoot, _c, code, apps, mfeJson, configApps, result;
     return __generator(this, function (_d) {
@@ -512,14 +511,11 @@ var getManifestJsonUrl = function (mode) { return __awaiter(void 0, void 0, void
                 configApps = __spreadArray(__spreadArray([], configApps, true), [{ appCode: ROOT_APP_CODE }], false);
                 _d.label = 4;
             case 4:
-                // console.log(JSON, isRoot, "JSON");
-                // debugger
-                // const configApps = JSON.apps; // isRoot ? JSON.apps : [{ appCode: ROOT_APP_CODE }];
                 apps = Array.from(new Set(__spreadArray([], (configApps || []).map(function (i) { return i.appCode; }), true)));
                 return [3 /*break*/, 6];
             case 5:
                 _d.sent();
-                apps = []; // BASE_APP_CODE_LIST;
+                apps = [];
                 return [3 /*break*/, 6];
             case 6:
                 result = apps.map(function (appCode) {
@@ -561,24 +557,6 @@ var downloadManifestJson = function (urls) { return __awaiter(void 0, void 0, vo
         }
     });
 }); };
-/**
- * 下载项目文件
- * @description 根据清单列表并行下载所有项目文件到指定目录
- * @param {Array<Object>} manifestList - 清单数据数组
- * @param {string} manifestList[].env - 环境标识
- * @returns {Promise<void>} 下载完成
- * @example
- * await downloadProjectFiles([
- *   { env: 'prod', files: [...] },
- *   { env: 'test', files: [...] }
- * ]);
- */
-/**
- * 根据manifest文件下载所有相关文件
- * 用于微前端架构中的模块文件下载
- * @param {Object} manifestJson - manifest文件内容
- * @param {string} outDir - 输出目录
- */
 function downloadFilesByManifestJson(manifestJson, outDir, onDownload) {
     return __awaiter(this, void 0, void 0, function () {
         var cdn, appCode, publicPath, files, _a, _b, _c, _i, i, file, fileUrl, fileName, downloadUrl, content;
@@ -603,7 +581,6 @@ function downloadFilesByManifestJson(manifestJson, outDir, onDownload) {
                     return [4 /*yield*/, fetchFileByPath(downloadUrl)];
                 case 2:
                     content = _d.sent();
-                    // console.log(path.join(outDir, appCode || "", fileName), 'path.join(outDir, appCode || "", fileName)');
                     writeFiles(path.join(outDir, appCode || "", fileName), content);
                     onDownload && onDownload(Number(i), file.length);
                     _d.label = 3;
@@ -672,31 +649,17 @@ var createManifestManager = function () {
             return row;
         },
         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 (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);
             var env = formatCliCommandConfig(mode);
             var mfeJson = getMfeJson();
             row.cdn = env.cdn;
@@ -715,11 +678,6 @@ var createManifestManager = function () {
         setDependencies: function (list) {
             this.dependencies = list;
         },
-        // getFullManifestJsonList() {
-        //   const files = import.meta.globEager("./**/*.json");
-        //   console.log(files);
-        //   // return [...this.dependencies, this.value];
-        // },
     };
 };
 
@@ -810,7 +768,6 @@ 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);
@@ -828,7 +785,23 @@ var copyFilesByTargetPath = function (sourcePath, targetPath) {
         fsExtra.ensureDirSync(targetDir);
     }
     catch (err) { }
-    fsExtra.copySync(sourcePath, targetPath, { overwrite: true });
+    var shouldSkip = function () {
+        try {
+            var s = fs.statSync(sourcePath);
+            var t = fs.statSync(targetPath);
+            if (s.isDirectory() || t.isDirectory())
+                return false;
+            var sb = fs.readFileSync(sourcePath);
+            var tb = fs.readFileSync(targetPath);
+            return sb.length === tb.length && sb.equals(tb);
+        }
+        catch (_a) {
+            return false;
+        }
+    };
+    if (!shouldSkip()) {
+        fsExtra.copySync(sourcePath, targetPath, { overwrite: true });
+    }
 };
 
 var downloadFullApps = function (manifestJson) { return __awaiter(void 0, void 0, void 0, function () {
@@ -913,24 +886,18 @@ var getPagesJson = function (jsonFile, isFormat) {
     var platform = process.env.UNI_PLATFORM;
     initPreContext(platform);
     var context = getPreVueContext();
-    // 使用uni的预处理器处理pages.json
     var processedJsonStr = preprocess(jsonFile, context, { type: "js" });
-    // 解析为JSON对象
     var pagesConfig = eval("(".concat(processedJsonStr, ")"));
-    // 针对微信小程序平台，处理特有的配置项
     if (isFormat && platform === "mp-weixin") {
         return transformToWeixinFormat(pagesConfig);
     }
     return pagesConfig;
 };
-// 将uni-app的pages.json转换为微信小程序格式
 var transformToWeixinFormat = function (uniPagesConfig) {
     var _a;
     var weixinConfig = __assign({ pages: [], window: {}, tabBar: null, subPackages: [], usingComponents: {} }, uniPagesConfig);
-    // 处理globalStyle -> window
     if (uniPagesConfig.globalStyle) {
         var globalStyle = uniPagesConfig.globalStyle;
-        // 基础窗口配置
         weixinConfig.window = {
             navigationBarBackgroundColor: globalStyle.navigationBarBackgroundColor || "#000000",
             navigationBarTextStyle: globalStyle.navigationBarTextStyle || "white",
@@ -940,30 +907,25 @@ var transformToWeixinFormat = function (uniPagesConfig) {
             enablePullDownRefresh: globalStyle.enablePullDownRefresh || false,
             onReachBottomDistance: globalStyle.onReachBottomDistance || 50,
         };
-        // 处理微信小程序特有配置
         if (globalStyle.pageOrientation) {
             weixinConfig.window.pageOrientation = globalStyle.pageOrientation;
         }
         if (globalStyle.renderingMode) {
             weixinConfig.window.renderingMode = globalStyle.renderingMode;
         }
-        // 处理usingComponents
         if (globalStyle.usingComponents) {
             weixinConfig.usingComponents = globalStyle.usingComponents;
         }
-        // 处理微信小程序平台特定配置
         if (globalStyle["mp-weixin"]) {
             Object.assign(weixinConfig.window, globalStyle["mp-weixin"]);
         }
     }
-    // 处理pages配置
     if (uniPagesConfig.pages) {
         weixinConfig.pages = uniPagesConfig.pages.map(function (page) {
             var weixinPage = page.path;
             return weixinPage;
         });
     }
-    // 处理tabBar配置
     if (uniPagesConfig.tabBar) {
         weixinConfig.tabBar = __assign(__assign({}, uniPagesConfig.tabBar), { list: (_a = uniPagesConfig.tabBar.list) === null || _a === void 0 ? void 0 : _a.map(function (item) { return ({
                 pagePath: item.pagePath,
@@ -972,7 +934,6 @@ var transformToWeixinFormat = function (uniPagesConfig) {
                 selectedIconPath: item.selectedIconPath,
             }); }) });
     }
-    // 处理分包配置
     if (uniPagesConfig.subPackages) {
         weixinConfig.subPackages = uniPagesConfig.subPackages.map(function (subPackage) {
             var _a;
@@ -982,11 +943,9 @@ var transformToWeixinFormat = function (uniPagesConfig) {
             });
         });
     }
-    // 处理预下载规则
     if (uniPagesConfig.preloadRule) {
         weixinConfig.preloadRule = uniPagesConfig.preloadRule;
     }
-    // 移除uni-app特有的配置项
     delete weixinConfig.globalStyle;
     delete weixinConfig.easycom;
     delete weixinConfig.condition;
@@ -1074,7 +1033,6 @@ var createManifestPlugin = function (manifestJson) {
     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";
@@ -1106,17 +1064,100 @@ var createManifestPlugin = function (manifestJson) {
             manifestJson.saveFile(filePath);
             // console.log({ filePath }, "sourcePath");
             // addRunningAppToSave(manifestJson.value.appCode, filePath);
-            setTimeout(function () {
-                collectFiles.copyFilesToPublishDir();
-            }, 0);
+            // setTimeout(() => {
+            collectFiles.copyFilesToPublishDir();
+            // }, 0);
         },
     };
 };
 
+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;
+        var currentTemp = {
+            root: app.appCode,
+            pages: __spreadArray([], pages, true),
+        };
+        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; });
+    };
+    for (var _i = 0, appPages_1 = appPages; _i < appPages_1.length; _i++) {
+        var app = appPages_1[_i];
+        _loop_1(app);
+    }
+    if (!pageJson.tabBar) {
+        delete pageJson.tabBar;
+    }
+    return pageJson;
+};
+var genreFullMainAppJsonByManifestList = function (appJson, manifestList) {
+    return renderPagesJsonByArray(manifestList, appJson);
+};
+var genreNewAppJson = function (outputPageJsonPath, appJson, manifestList) {
+    var newAppJSon = genreFullMainAppJsonByManifestList(__assign({ subPackages: [] }, appJson), manifestList);
+    var old = uniFsReadJSONFile(outputPageJsonPath) || {};
+    var nextStr = JSON.stringify(newAppJSon);
+    var oldStr = JSON.stringify(old);
+    if (nextStr !== oldStr) {
+        writeFiles(outputPageJsonPath, newAppJSon);
+    }
+};
+
+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),
+        };
+    });
+    return apps;
+};
+var startDistWatcher = 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 });
+        });
+    });
+};
+
 var app = null;
 var createHttpServer = function () {
     if (app)
-        return app;
+        return { server: app, start: function () { } };
     app = express();
     var server = http.createServer(app);
     app.get("".concat(HTTP_PATH, "/root-path"), function (req, res) {
@@ -1288,37 +1329,6 @@ var WsClientServer = /** @class */ (function () {
 // export const mfeServer = new WsServer();
 // export const mfeClientServer = new WsClientServer();
 
-// 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 {
@@ -1326,71 +1336,7 @@ var filterManifestJsonListAndMainPageJson = function (manifestJsonList) {
         manifestList: manifestJsonList.filter(function (item) { return !checkIsRootManifest(item); }),
     };
 };
-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;
-        var currentTemp = {
-            root: app.appCode,
-            pages: __spreadArray([], pages, true),
-        };
-        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; });
-    };
-    for (var _i = 0, appPages_1 = appPages; _i < appPages_1.length; _i++) {
-        var app = appPages_1[_i];
-        _loop_1(app);
-    }
-    if (!pageJson.tabBar) {
-        delete pageJson.tabBar;
-    }
-    return pageJson;
-};
-var genreFullMainAppJsonByManifestList = function (appJson, manifestList) {
-    return renderPagesJsonByArray(manifestList, appJson);
-};
-var DistWatcher = /** @class */ (function () {
-    function DistWatcher() {
-    }
-    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 });
-            });
-        });
-    };
-    return DistWatcher;
-}());
-var genreNewAppJson = function (outputPageJsonPath, appJson, manifestList) {
-    try {
-        var newAppJSon = genreFullMainAppJsonByManifestList(__assign({ subPackages: [] }, appJson), manifestList);
-        writeFiles(outputPageJsonPath, newAppJSon);
-    }
-    catch (error) {
-        console.error("[AppJSON] Genre failed:", error);
-    }
-};
-var createMainAppServer = function (manifestJson) {
+var createMainAppServer = function () {
     var mfeServer = WsServer.getInstance(function (opt) {
         var type = opt.type, data = opt.data;
         if (type === E_WS_TYPE.CHANGE) {
@@ -1419,17 +1365,36 @@ var createMainAppClient = function (manifestJson, onInit) {
     return client;
 };
 var createMainAppPlugin = function (manifestJson) {
-    var mainPwd = "";
-    var isWatcherReady = false;
-    var mfeClientServer;
-    var fn = null;
+    var state = {
+        mainPwd: "",
+        isWatcherReady: false,
+        mfeClientServer: undefined,
+        fn: null,
+    };
     var isBuild = function () { return process.env.MFE_BUILD_MODE === EBuildMode.BUILD; };
     var isServe = function () { return manifestJson.value.isServe; };
     var isRoot = function () { return manifestJson.value.isRoot; };
-    var isStartServer = function () {
-        if (isBuild())
-            return false;
-        return isServe();
+    var initSync = function () {
+        if (state.isWatcherReady)
+            return;
+        startDistWatcher(state.mainPwd, function () {
+            state.isWatcherReady = true;
+        }, function (change) {
+            state.fn = function () {
+                return state.mfeClientServer.sendMessage(E_WS_TYPE.CHANGE, __assign(__assign({}, change), { appCode: manifestJson.value.appCode }));
+            };
+        });
+    };
+    var copyAppDistModule = function (_a) {
+        var pwd = _a.pwd;
+        if (!process.env.MFE_SOURCE_OUTPUT_DIR) {
+            console.error("[Plugin] MFE_SOURCE_OUTPUT_DIR not defined");
+            return;
+        }
+        state.mainPwd = path.join(pwd, manifestJson.value.appCode);
+        var targetPath = state.mainPwd;
+        var sourcePath = process.env.MFE_SOURCE_OUTPUT_DIR;
+        copyFilesByTargetPath(sourcePath, targetPath);
     };
     var watchFile = function () {
         var allManifest = getAppsManifestList(manifestJson.value.mode);
@@ -1442,70 +1407,53 @@ var createMainAppPlugin = function (manifestJson) {
             genreNewAppJson(outputPageJsonPath, mainAppJson, [manifestJson]);
         });
     };
-    var distWatcher = new DistWatcher();
-    var serverPlugin = {
+    var createServePlugin = function () { return ({
         name: "@dd-code:main-app:serve",
         config: function () {
             return __awaiter(this, void 0, void 0, function () {
-                var isServe, _a, start;
-                return __generator(this, function (_b) {
-                    isServe = isStartServer();
-                    if (isBuild())
-                        return [2 /*return*/];
-                    if (!isServe) {
-                        if (!isBuild() && isRoot()) {
-                            _a = createHttpServer(), _a.server, start = _a.start;
-                            start();
-                        }
+                var start;
+                return __generator(this, function (_a) {
+                    if (isBuild()) {
                         return [2 /*return*/];
                     }
                     if (isRoot()) {
+                        if (!isServe()) {
+                            start = createHttpServer().start;
+                            start();
+                            return [2 /*return*/];
+                        }
                         createMainAppServer();
+                        // const subs = findLocalSubApps();
+                        // if (subs.length) {
+                        // startLocalSubApps(subs, "mp-weixin", manifestJson.value.mode);
+                        // }
                     }
                     else {
-                        mfeClientServer = createMainAppClient(manifestJson, function (data) {
-                            serverPlugin.copyAppDistModule(data);
+                        state.mfeClientServer = createMainAppClient(manifestJson, function (data) {
+                            copyAppDistModule(data);
                         });
                     }
                     return [2 /*return*/];
                 });
             });
         },
-        closeBundle: function () {
-            var isServe = isStartServer();
-            if (!isServe)
-                return;
-            if (!isRoot()) {
-                serverPlugin.initWatchChange();
-                fn === null || fn === void 0 ? void 0 : fn();
-                fn = null;
-            }
-        },
-        initWatchChange: function () {
-            if (isWatcherReady)
-                return;
-            distWatcher.start(mainPwd, function () {
-                isWatcherReady = true;
-            }, function (change) {
-                fn = function () {
-                    return mfeClientServer.sendMessage(E_WS_TYPE.CHANGE, __assign(__assign({}, change), { appCode: manifestJson.value.appCode }));
-                };
-            });
-        },
-        copyAppDistModule: function (_a) {
-            var pwd = _a.pwd;
-            if (!process.env.MFE_SOURCE_OUTPUT_DIR) {
-                console.error("[Plugin] MFE_SOURCE_OUTPUT_DIR not defined");
-                return;
-            }
-            mainPwd = path.join(pwd, manifestJson.value.appCode);
-            var targetPath = mainPwd;
-            var sourcePath = process.env.MFE_SOURCE_OUTPUT_DIR;
-            copyFilesByTargetPath(sourcePath, targetPath);
-        },
-    };
+    }); };
     return [
-        serverPlugin,
+        createServePlugin(),
+        {
+            name: "@dd-code:main-app:sync",
+            closeBundle: function () {
+                var _a;
+                var start = isServe();
+                if (!start || isBuild())
+                    return;
+                if (isRoot())
+                    return;
+                initSync();
+                (_a = state.fn) === null || _a === void 0 ? void 0 : _a.call(state);
+                state.fn = null;
+            },
+        },
         {
             name: "@dd-code:main-app:watch",
             closeBundle: function () {
@@ -1517,7 +1465,6 @@ var createMainAppPlugin = function (manifestJson) {
                             return [2 /*return*/];
                         if (!checkIsBuildInChild())
                             return [2 /*return*/];
-                        // if (!isServe) return;
                         watchFile === null || watchFile === void 0 ? void 0 : watchFile();
                         watchFile = null;
                         return [2 /*return*/];
@@ -1563,6 +1510,8 @@ var createMpWeixinUniPlugin = function (options) {
                         switch (_a.label) {
                             case 0:
                                 currentManifestJson.setEnv(config.mode);
+                                // 清空 PUBLISH_PATH 目录
+                                unlinkDeepDirOrFile(PUBLISH_PATH);
                                 return [4 /*yield*/, resetOutDir(currentManifestJson, config)];
                             case 1:
                                 _a.sent();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dd-code/uni-tools",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Universal tools for code utilities",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",