@taole/deploy-helper 0.6.1 → 0.6.4

package/index.mjs

@@ -124,7 +124,7 @@ async function main() {
     // return;
     // other commands
     let command = process.argv[2];
-    if (!["init", "prod", "test", "scp", "scpevt", "pipeline", "rmofflinepkg"].includes(command)) {
+    if (!["init", "prod", "test", "scp", "scpevt", "pipeline", "offlinepkgrm"].includes(command)) {
         command = "help";
     }
 
@@ -139,7 +139,7 @@ async function main() {
         console.log(`command: scpevt {file} 复制文件{file}到events测试服务器{file}`);
         console.log(`command: scpevt {file} {dest} 复制文件{file}到events测试服务器{dest}`);
         console.log(`command: pipeline {pipelineName|pipelineId} [branch] 触发流水线{pipelineName|pipelineId}， 指定分支(可省略)`);
-        console.log(`command: rmofflinepkg {name} [mode] 删除离线包{name}， 指定模式(可省略，默认test)`);
+        console.log(`command: offlinepkgrm {name} [mode] 删除离线包{name}， 指定模式(可省略，默认test)`);
         process.exit(0);
     }
     log(`deploy-helper v${version} start`);
@@ -201,7 +201,7 @@ async function main() {
             process.exit(1);
         }
 
-    } else if (command === "rmofflinepkg") {
+    } else if (command === "offlinepkgrm") {
         const name = process.argv[3];
         if (!name) {
             log(`name参数不能为空`);
@@ -218,7 +218,6 @@ async function main() {
             process.exit(1);
         }
         await syncOfflinePkgApi(userDeployHelperConfig, mode, { name, remove: true }, null);
-        log(`${mode === 'prod' ? '线上' : '测试'}环境删除离线包${name}完成`);
         process.exit(0);
     }
     try {

package/lib/offlinePkg.mjs

@@ -80,6 +80,7 @@ export async function syncApi(userDeployHelperConfig, mode, offlineConfig, packa
         }
         jsonData.packages = jsonData.packages.filter(item => item.name !== offlineConfig.name);
     }
+    jsonData.packages = jsonData.packages.filter(item => item.name);
     if (needSetData) {
         // console.log('jsonData', jsonData);
         var formdata = new FormData();
@@ -92,7 +93,7 @@ export async function syncApi(userDeployHelperConfig, mode, offlineConfig, packa
         if (!setData || setData.error !== 0) {
             throw new Error(`更新离线包列表失败, 更新离线包当前配置失败: ${setData.error_msg || "未知错误"}`);
         }
-        log(`离线包列表更新完成: ${JSON.stringify(setData)}`);
+        log(`${mode === "prod" ? "线上" : "测试"}环境离线包列表更新完成: ${JSON.stringify(setData)}`);
         // 再次获取列表，确保更新成功
         const nowRes2 = await fetch(getUrl);
         const nowData2 = await nowRes2.json();
@@ -103,8 +104,7 @@ export async function syncApi(userDeployHelperConfig, mode, offlineConfig, packa
     }
 
     const packages = finalJsonData.packages || [];
-    console.log(`${mode === "prod" ? "线上" : "测试"}环境当前离线包列表:`, packages);
-
+    console.log(`${mode === "prod" ? "线上" : "测试"}环境当前离线包列表:`, packages.map(item => ({...item,items:'省略' + item.items.length + '个条目'})));
 }
 
 
@@ -135,17 +135,30 @@ export function checkOfflinePkg(config) {
     const packageJson = getJsonConfig(config.workDir, "package.json");
     const userDeployHelperConfig = getUserDeployHelperConfig();
     const distPath = join(config.workDir, offlineConfig.distDir);
+
+    // 如果offlineConfig.remove为true，则不构建离线包
+    const willRemovePkg = offlineConfig && offlineConfig.name && offlineConfig.remove === true && offlineConfig.skip !== true;
+    if (willRemovePkg) {
+        return {
+            canBuild: true,
+            errorMsg: "",
+            hookPostBuild: async () => {
+                log(`开始删除离线包${offlineConfig.name}`);
+                await syncApi(userDeployHelperConfig, config.mode, offlineConfig, null);
+            }
+        }
+    }
     if (!fs.existsSync(distPath)) {
         errorMsg = `构建产物${distPath}不存在, 请先构建项目`;
         canBuildOfflinePkg = false;
-    } else if (!offlineConfig || !offlineConfig.name) {
+    } else if (!offlineConfig || !offlineConfig.name || offlineConfig.skip === true) {
         errorMsg = ""; // 没有离线包配置文件，跳过构建离线包
         canBuildOfflinePkg = false;
     } else if (!userDeployHelperConfig || !userDeployHelperConfig.offlineApi || !userDeployHelperConfig.offlineApi.get || !userDeployHelperConfig.offlineApi.set) {
-        errorMsg = "未配置离线包接口";
+        errorMsg = "未配置离线包接口, 请移步看配置文档: https://alidocs.dingtalk.com/i/nodes/R1zknDm0WRkbz13oHn0LDz3ZVBQEx5rG?doc_type=wiki_doc";
         canBuildOfflinePkg = false;
     } else if (!packageJson) {
-        errorMsg = "package.json";
+        errorMsg = "啊没有package.json?";
         canBuildOfflinePkg = false;
     } else {
         // 暂时不检查这个
@@ -153,8 +166,8 @@ export function checkOfflinePkg(config) {
             ...packageJson.devDependencies,
             ...packageJson.dependencies,
         };
-        if(!allDeps['@vitejs/plugin-legacy'] || !allDeps['vite-plugin-dynamic-base']){
-            errorMsg = "检查到项目中未安装依赖@vitejs/plugin-legacy和vite-plugin-dynamic-base, 请先安装依赖并调整构建代码以支持离线化";
+        if (!allDeps['@vitejs/plugin-legacy'] || !allDeps['vite-plugin-dynamic-base']) {
+            errorMsg = "检查到项目中未安装依赖@vitejs/plugin-legacy和vite-plugin-dynamic-base, 请先安装依赖并调整构建代码以支持离线化，相关文档：https://alidocs.dingtalk.com/i/nodes/ydxXB52LJqexwD71F9K5XNMrJqjMp697?doc_type=wiki_doc";
             canBuildOfflinePkg = false;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.6.1",
+  "version": "0.6.4",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",