qdmp-cli 0.1.1 → 0.1.3

package/README.md

@@ -29,7 +29,6 @@ qdmp-cli create [options] <app-name>
 ```
 ### 拉取配置
 ```bash
-qdmp-cli init
 qdmp-cli init -a appId 
 ```
 ### 查看可选模版
@@ -46,6 +45,10 @@ qdmp-cli login -e dev //登录开发环境
 qdmp-cli getMe
 qdmp-cli getMe -e dev //查看开发环境用户
 ```
+### 打包
+```bash
+qdmp-cli upload -t emp //目前仅支持taro类型的emp
+```
 ### 上传版本
 ```bash
 qdmp-cli upload

package/actions.js

@@ -113,7 +113,7 @@ export async function uploadAction(option) {
     const loader = remoteApp.loader;
     // 预上传
     const targetName = `${appId}_${code}`;
-    const localPath = await preUpload(loader, targetName, appId);
+    const localPath = await preUpload(loader, targetName, appId, code);
     if (!localPath) {
       error("预上传失败");
     }
@@ -161,3 +161,29 @@ export const initConfigAction = async (option) => {
     error(e.message);
   }
 };
+export const buildAction = async (option) => {
+  try {
+    switch (option.type) {
+      case "emp":
+        info("开始构建...");
+        const buildResult = shell.exec("taro build --type weapp");
+        if (buildResult.code !== 0) {
+          throw new Error("构建失败");
+        }
+        shell.cd("dist");
+        const dmccResult = shell.exec("dmcc build --no-app-id-dir");
+        if (dmccResult.code !== 0) {
+          throw new Error("dmcc 构建失败");
+        }
+        shell.cd("..");
+        success("构建完成");
+        break;
+
+      default:
+        error("不支持的构建类型");
+        break;
+    }
+  } catch (e) {
+    error(e?.message || "构建过程出错");
+  }
+};

package/index.js

@@ -13,6 +13,7 @@ import {
   loginAction,
   getMyInfoAction,
   uploadAction,
+  buildAction,
 } from "./actions.js";
 import { printLogo } from "./utils/logHandler.js";
 // import.meta.url： esm模块化中的属性,获取模块文件的绝对地址
@@ -57,6 +58,11 @@ program
   .description("查看登录用户")
   .option("-e, --env <env>", "当前环境")
   .action(getMyInfoAction);
+program
+  .command("build")
+  .description("部署项目")
+  .option("-t, --type <type>", "部署类型")
+  .action(buildAction);
 program
   .command("upload")
   .description("上传项目")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdmp-cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "qdmp-cli",
   "main": "index.js",
   "type": "module",

package/utils/common.js

@@ -3,6 +3,7 @@ import AdmZip from "adm-zip";
 import { WORKSPACE_DIR } from "../constants.js";
 import fs from "fs";
 import path from "path";
+import child_process from "child_process";
 
 /** 获取上传链接
  * @param {*} appId 文件
@@ -142,10 +143,28 @@ async function copyDistFolder(dirname) {
 /** 复制EMP文件夹
  * @param {*} dirname 文件夹名
  */
-async function copyEmpDistFolder() {
+async function copyAndSetEmpDistFolder(appId, code) {
   //直接复制根目录下dist文件夹
   try {
     fs.cpSync("dist", `${WORKSPACE_DIR}/dist`, { recursive: true });
+    if (!fs.existsSync(`${WORKSPACE_DIR}/dist/main/qdmp.json`)) {
+      fs.writeFileSync(
+        `${WORKSPACE_DIR}/dist/main/qdmp.json`,
+        JSON.stringify({
+          appId,
+          version: code,
+        })
+      );
+    } else {
+      const qdmpJson = JSON.parse(
+        fs.readFileSync(`${WORKSPACE_DIR}/dist/main/qdmp.json`, "utf8")
+      );
+      qdmpJson.version = code;
+      fs.writeFileSync(
+        `${WORKSPACE_DIR}/dist/main/qdmp.json`,
+        JSON.stringify(qdmpJson)
+      );
+    }
     success("文件复制完成");
     return true;
   } catch (e) {
@@ -163,7 +182,7 @@ async function copyEmpDistFolder() {
  * @param {string} targetName - 目标文件名
  * @returns {Promise<string|boolean>} 压缩文件路径或操作失败返回false
  */
-export async function preUpload(loader, targetName, appId) {
+export async function preUpload(loader, targetName, appId, code) {
   try {
     // 1. 创建工作空间文件夹
     if (!(await createWorkSpaceFolder(WORKSPACE_DIR))) {
@@ -174,7 +193,7 @@ export async function preUpload(loader, targetName, appId) {
     // 2. 根据构建类型复制对应产物
     const isCopySuccess =
       loader === "EMP"
-        ? await copyEmpDistFolder()
+        ? await copyAndSetEmpDistFolder(appId, code)
         : await copyAndRenameDistFolder();
 
     if (!isCopySuccess) {
@@ -229,3 +248,14 @@ export async function cleanWorkSpaceFolder(dirname) {
     return false;
   }
 }
+export async function execSync(cmd) {
+  return new Promise((resolve, reject) => {
+    child_process.exec(cmd, function (err, stdout, stderr) {
+      if (err) {
+        reject(new Error(stderr || err.message));
+        return;
+      }
+      resolve(stdout);
+    });
+  });
+}

package/utils/gitClone.js

@@ -1,4 +1,3 @@
-import child_process from "child_process";
 import ora from "ora";
 import path from "path";
 import chalk from "chalk";
@@ -6,6 +5,7 @@ import { rm } from "fs/promises";
 import { existsSync } from "fs";
 import { inquirerConfirm } from "./interactive.js";
 import { error } from "./logHandler.js";
+import { execSync } from "./common.js";
 /**
  * 下载项目
  * @param {string} projectName - 项目名称
@@ -35,18 +35,6 @@ export const download = async (projectName, repo) => {
   }
 };
 
-const execSync = async (cmd) => {
-  return new Promise((resolve, reject) => {
-    child_process.exec(cmd, function (err, stdout, stderr) {
-      if (err) {
-        reject(new Error(stderr || err.message));
-        return;
-      }
-      resolve(stdout);
-    });
-  });
-};
-
 const clone = async (repo, name) => {
   const spinner = ora("正在拉取项目......").start();
   try {