qdmp-cli 0.0.9 → 0.0.10

package/actions.js

@@ -110,10 +110,10 @@ export async function uploadAction(option) {
     const code = +remoteApp.latest + 1;
     const uploadPath = getUploadPath(appId, code);
     const url = `https://crane.qiandaocdn.com/${uploadPath}`;
-
+    const loader = remoteApp.loader;
     // 预上传
     const targetName = `${appId}_${code}`;
-    const localPath = await preUpload(targetName);
+    const localPath = await preUpload(loader, targetName);
     if (!localPath) {
       error("预上传失败");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdmp-cli",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "qdmp-cli",
   "main": "index.js",
   "type": "module",
@@ -8,8 +8,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
-    "qdmp": "./index.js",
-    "qdmp-cli": "./index.js"
+    "qdmp": "index.js",
+    "qdmp-cli": "index.js"
   },
   "keywords": [
     "千岛小程序",
@@ -27,5 +27,8 @@
     "ora": "^8.2.0",
     "shelljs": "^0.10.0",
     "table": "^6.9.0"
+  },
+  "engines": {
+    "node": ">=20"
   }
 }

package/utils/common.js

@@ -75,18 +75,25 @@ export async function createWorkSpaceFolder(dirname = "") {
  * @param {*} dirname 文件夹名
  */
 // 压缩项目
-async function compressProject(output, dirname = "") {
+async function compressProject(output, dirname = "", loader) {
   try {
-    const zip = new AdmZip();
-    const h5Path = path.join(dirname, "h5");
+    if (loader !== "EMP") {
+      const zip = new AdmZip();
+      const h5Path = path.join(dirname, "h5");
 
-    if (!fs.existsSync(h5Path)) {
-      throw new Error("h5 目录不存在");
-    }
+      if (!fs.existsSync(h5Path)) {
+        throw new Error("h5 目录不存在");
+      }
 
-    // 添加文件夹时指定目标路径为 h5
-    zip.addLocalFolder(h5Path, "h5");
-    zip.writeZip(path.join(dirname, `${output}.zip`));
+      // 添加文件夹时指定目标路径为 h5
+      zip.addLocalFolder(h5Path, "h5");
+      zip.writeZip(path.join(dirname, `${output}.zip`));
+    } else {
+      // 直接压缩dist
+      const zip = new AdmZip();
+      zip.addLocalFolder(path.join(dirname, "dist"), "dist");
+      zip.writeZip(path.join(dirname, `${output}.zip`));
+    }
     return true;
   } catch (error) {
     return false;
@@ -132,25 +139,80 @@ async function copyDistFolder(dirname) {
     return false;
   }
 }
-
-/**预上传
- *
+/** 复制EMP文件夹
+ * @param {*} dirname 文件夹名
+ */
+async function copyEmpDistFolder() {
+  //直接复制根目录下dist文件夹
+  try {
+    fs.cpSync("dist", `${WORKSPACE_DIR}/dist`, { recursive: true });
+    success("文件复制完成");
+    return true;
+  } catch (e) {
+    error(e);
+    return false;
+  }
+}
+/**
+ * 预上传准备工作
+ * 1. 创建工作空间
+ * 2. 复制构建产物
+ * 3. 重命名文件夹（非EMP构建模式）
+ * 4. 压缩项目
+ * @param {string} loader - 构建加载器类型
+ * @param {string} targetName - 目标文件名
+ * @returns {Promise<string|boolean>} 压缩文件路径或操作失败返回false
  */
-export async function preUpload(targetName) {
+export async function preUpload(loader, targetName) {
   try {
-    if (!(await createWorkSpaceFolder(WORKSPACE_DIR))) return false;
+    // 1. 创建工作空间文件夹
+    if (!(await createWorkSpaceFolder(WORKSPACE_DIR))) {
+      error("创建工作空间失败");
+      return false;
+    }
 
-    if (!(await copyDistFolder("dist"))) return false;
+    // 2. 根据构建类型复制对应产物
+    const isCopySuccess =
+      loader === "EMP"
+        ? await copyEmpDistFolder()
+        : await copyAndRenameDistFolder();
 
-    if (
-      !(await renameDistFolder(`${WORKSPACE_DIR}/dist`, `${WORKSPACE_DIR}/h5`))
-    )
+    if (!isCopySuccess) {
+      error("复制构建产物失败");
       return false;
+    }
 
-    if (!(await compressProject(targetName, WORKSPACE_DIR))) return false;
-    return `./${WORKSPACE_DIR}/${targetName}.zip`;
-  } catch (e) {
-    error(e);
+    // 3. 压缩项目
+    if (!(await compressProject(targetName, WORKSPACE_DIR, loader))) {
+      error("压缩项目失败");
+      return false;
+    }
+
+    // 4. 返回压缩文件路径
+    const zipFilePath = `./${WORKSPACE_DIR}/${targetName}.zip`;
+    success(`预上传准备完成，压缩包路径: ${zipFilePath}`);
+    return zipFilePath;
+  } catch (error) {
+    error(`预上传过程出错: ${error.message}`);
+    return false;
+  }
+}
+
+/**
+ * 复制并创建标准H5文件夹结构
+ * 对于非EMP构建模式，复制dist内容并重命名为h5
+ * @returns {Promise<boolean>} 操作是否成功
+ */
+async function copyAndRenameDistFolder() {
+  try {
+    if (!(await copyDistFolder("dist"))) {
+      return false;
+    }
+
+    return renameDistFolder(`${WORKSPACE_DIR}/dist`, `${WORKSPACE_DIR}/h5`);
+  } catch (error) {
+    error("复制并重命名文件夹过程出错:", error);
+    return false;
   }
 }
 /** 清理工作文件夹