qdmp-cli 0.1.27 → 0.1.29

package/README.md

@@ -26,12 +26,17 @@ npm install -g qdmp-cli
 {
   "appId": "your_app_id",
   "devAppId": "your_dev_app_id",
+  "loader": "EMP"
 }
 ```
 ### 初始化项目
 ```bash
-qdmp-cli create [options] <app-name>
+qdmp-cli create <app-name> -t default
 ```
+新建项目使用官方 2.0（EMP）模板，创建后验证配置。`package.json.version` 是业务包版本，模板中的 `1.0.0` 不代表 1.0 小程序。保留模板的 loader，不通过改写该字段转换工程。
+
+关联 AppID 后执行 `qdmp-cli getMe` 核对本地与平台应用类型；上传前也会校验一致性。仅支持 2.0（EMP）项目，不再支持 SPA/effuse 工程；构建必须完成 EMP 编译。
+
 ### 拉取配置
 ```bash
 qdmp-cli init -a appId 

package/actions.js

@@ -19,10 +19,11 @@ import {
   preUpload,
   cleanWorkSpaceFolder,
 } from "./utils/common.js";
+import { readProjectLoader, assertMatchingLoader, assertEMPTemplate } from "./utils/projectLoader.js";
 import { assertCompilerRuntime } from "./utils/compilerRuntime.js";
 import { getAppInfo, uploadVersion, uploadApp } from "./api.js";
 
-function createProject(appName, template) {
+async function createProject(appName, template) {
   printLogo();
   if (template) {
     console.log("\n" + chalk.dim("─".repeat(60)) + "\n");
@@ -35,7 +36,9 @@ function createProject(appName, template) {
     info(`   ${chalk.dim("仓库:")} ${chalk.green(template.value)}`);
     info(`⏳ 正在创建 ${chalk.bold(appName)} 项目...`);
     console.log("\n" + chalk.dim("─".repeat(60)) + "\n");
-    download(appName, template.value);
+    const targetPath = await download(appName, template.value);
+    assertEMPTemplate(targetPath);
+    success("已验证 2.0（EMP）模板；package.json.version 不代表小程序运行时版本。");
   } else {
     listAction();
     error(`未找到模板`);
@@ -50,9 +53,13 @@ export const initAction = async (appName, option) => {
   if (appName.match(invalidChars)) {
     error("名称不能包含中文及特殊字符");
   }
-  const inputTemplate = option.template || TEMPLATES[0].name;
+  const inputTemplate = option.template || "default";
   const template = TEMPLATES.find((t) => t.name === inputTemplate);
-  await createProject(appName, template);
+  try {
+    await createProject(appName, template);
+  } catch (e) {
+    error(e.message);
+  }
 };
 
 export const listAction = () => {
@@ -100,6 +107,9 @@ export const getMyInfoAction = async (option) => {
     const appInfo = await getAppInfo(appId, option.env);
     info(`当前用户：${nickname}`);
     info(`当前授权应用：${appInfo?.name} - ${appId}`);
+    const localLoader = readProjectLoader();
+    info(`小程序类型：${appInfo?.loader === "EMP" ? "2.0（EMP）" : "不支持"}`);
+    assertMatchingLoader(localLoader, appInfo?.loader);
   } catch (e) {
     error(e?.message);
   }
@@ -117,6 +127,7 @@ export async function uploadAction(option) {
     if (!remoteApp) {
       error("未找到应用，请检查appId是否正确");
     }
+    assertMatchingLoader(readProjectLoader(), remoteApp.loader);
     const description = option.description?.trim()
       ?? (process.stdin.isTTY ? await inquirerVersionDescription() : "");
     if (Array.from(description).length > 200) {
@@ -167,9 +178,12 @@ export const initConfigAction = async (option) => {
     const appId = option.appId;
     if (!appId) return error("未配置应用ID，请使用-a参数指定应用ID");
     const appInfo = await getAppInfo(appId, option.env);
+    if (!appInfo || appInfo.loader !== "EMP") {
+      throw new Error("仅支持平台 EMP 应用，未写入配置");
+    }
     const config = {
       name: appInfo.name,
-      appId: appInfo.appId,
+      [option.env === "dev" ? "devAppId" : "appId"]: appInfo.appId,
       loader: appInfo.loader,
       latest: appInfo.latest,
     };
@@ -187,6 +201,7 @@ export const buildAction = async () => {
       return;
     }
     const config = JSON.parse(fs.readFileSync(qdmpJsonPath, "utf8"));
+    readProjectLoader();
     switch (config.loader) {
       case "EMP":
         await assertCompilerRuntime();
@@ -226,7 +241,7 @@ export const buildAction = async () => {
 
       default:
         error(
-          `不支持的构建类型：${option.loader} 如果是空请检查qdmp.json配置文件是否正确`,
+          `不支持的构建类型：${config.loader ?? "未配置"}，请检查 qdmp.json；2.0 必须使用 EMP，不能改用 H5 绕过`,
         );
         break;
     }

package/constants.js

@@ -6,18 +6,7 @@ export const TEMPLATES = [
     emoji: "🟢",
     fullUrl: true,
   },
-  // {
-  //   name: "qdmp",
-  //   value: "frontend/miniapp-taro-template",
-  //   desc: "千岛小程序默认模版(1.0)",
-  //   emoji: "🟡",
-  // },
-  // {
-  //   name: "h5",
-  //   value: "frontend/h5-template",
-  //   desc: "h5模版",
-  //   emoji: "🔵",
-  // },
+
 ];
 
 export const WORKSPACE_DIR = "qdmp-output";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qdmp-cli",
-    "version": "0.1.27",
+    "version": "0.1.29",
     "description": "qdmp-cli",
     "main": "index.js",
     "type": "module",
@@ -45,9 +45,5 @@
     },
     "engines": {
         "node": "^20.19.0 || >=22.12.0"
-    },
-    "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  }
+    }
 }

package/utils/common.js

@@ -68,20 +68,6 @@ export const isUrlAccessible = async (url) => {
   }
 };
 
-/** 重命名文件夹
- * @param {*} dirname 旧文件夹名
- * @param {*} newname 新文件夹名
- */
-export async function renameDistFolder(dirname, newname) {
-  try {
-    if (fs.existsSync(newname)) return true;
-    fs.renameSync(dirname, newname);
-    return true;
-  } catch (e) {
-    error("重命名文件夹失败：", e);
-    return false;
-  }
-}
 /** 创建工作文件夹
  * @param {*} dirname 文件夹名
  */
@@ -105,69 +91,15 @@ export async function createWorkSpaceFolder(dirname = "") {
 // 压缩项目
 async function compressProject(output, dirname = "", loader, appId) {
   try {
-    if (loader !== "EMP") {
-      const zip = new AdmZip();
-      const h5Path = path.join(dirname, "h5");
-
-      if (!fs.existsSync(h5Path)) {
-        throw new Error("h5 目录不存在");
-      }
-
-      // 添加文件夹时指定目标路径为 h5
-      zip.addLocalFolder(h5Path, "h5");
-      zip.writeZip(path.join(dirname, `${output}.zip`));
-    } else {
-      // 直接压缩dist
-      const zip = new AdmZip();
-      zip.addLocalFolder(path.join(dirname, "dist"), `${appId}`);
-      zip.writeZip(path.join(dirname, `${output}.zip`));
-    }
+    if (loader !== "EMP") throw new Error("仅支持 EMP 产物");
+    const zip = new AdmZip();
+    zip.addLocalFolder(path.join(dirname, "dist"), `${appId}`);
+    zip.writeZip(path.join(dirname, `${output}.zip`));
     return true;
   } catch (error) {
     return false;
   }
 }
-/** 复制文件夹
- * @param {*} dirname 文件夹名
- */
-async function copyDistFolder(dirname) {
-  try {
-    info("正在查找 index.html 文件...");
-    let indexPath = null;
-    function findIndexHtml(dir) {
-      const files = fs.readdirSync(dir);
-      for (const file of files) {
-        const fullPath = path.join(dir, file);
-        const stat = fs.statSync(fullPath);
-        if (stat.isDirectory()) {
-          const found = findIndexHtml(fullPath);
-          if (found) return found;
-        } else if (file === "index.html") {
-          return fullPath;
-        }
-      }
-      return null;
-    }
-    indexPath = findIndexHtml(dirname);
-    if (!indexPath) {
-      throw new Error("未找到index.html文件");
-    }
-    success("找到 index.html 文件");
-
-    const parentDir = path.dirname(indexPath);
-    const targetDir = path.join(WORKSPACE_DIR, "dist");
-
-    info("正在复制文件...");
-    // 直接复制整个目录
-    fs.cpSync(parentDir, targetDir, { recursive: true });
-    success("文件复制完成");
-    return true;
-  } catch (e) {
-    error(e);
-    return false;
-  }
-}
-
 function hasCompiledMainDir(dirname) {
   try {
     return fs.statSync(path.join(dirname, "main")).isDirectory();
@@ -250,7 +182,6 @@ async function copyAndSetEmpDistFolder(appId, code) {
  * 预上传准备工作
  * 1. 创建工作空间
  * 2. 复制构建产物
- * 3. 重命名文件夹（非EMP构建模式）
  * 4. 压缩项目
  * @param {string} loader - 构建加载器类型
  * @param {string} targetName - 目标文件名
@@ -258,6 +189,7 @@ async function copyAndSetEmpDistFolder(appId, code) {
  */
 export async function preUpload(loader, targetName, appId, code) {
   try {
+    if (loader !== "EMP") throw new Error("仅支持 2.0（EMP）小程序上传");
     // 1. 创建工作空间文件夹
     if (!(await createWorkSpaceFolder(WORKSPACE_DIR))) {
       error("创建工作空间失败");
@@ -265,10 +197,7 @@ export async function preUpload(loader, targetName, appId, code) {
     }
 
     // 2. 根据构建类型复制对应产物
-    const isCopySuccess =
-      loader === "EMP"
-        ? await copyAndSetEmpDistFolder(appId, code)
-        : await copyAndRenameDistFolder();
+    const isCopySuccess = await copyAndSetEmpDistFolder(appId, code);
 
     if (!isCopySuccess) {
       error("复制构建产物失败");
@@ -278,7 +207,7 @@ export async function preUpload(loader, targetName, appId, code) {
     // 3. 复制 qdmp.json 到产物目录
     const qdmpJsonPath = path.resolve(process.cwd(), "qdmp.json");
     if (fs.existsSync(qdmpJsonPath)) {
-      const distDir = loader === "EMP" ? "dist" : "h5";
+      const distDir = "dist";
       fs.copyFileSync(qdmpJsonPath, path.join(WORKSPACE_DIR, distDir, "qdmp.json"));
       info("已将 qdmp.json 复制到产物目录");
     }
@@ -299,23 +228,6 @@ export async function preUpload(loader, targetName, appId, code) {
   }
 }
 
-/**
- * 复制并创建标准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 (err) {
-    error("复制并重命名文件夹过程出错:", err);
-    return false;
-  }
-}
 /** 清理工作文件夹
  * @param {*} dirname 文件夹名
  */

package/utils/gitClone.js

@@ -23,15 +23,16 @@ export const download = async (projectName, repo) => {
         `文件夹 ${projectName} 已存在，是否创建新名称: ${name}`
       );
       if (confirm) {
-        clone(repo, name);
+        await clone(repo, name);
       } else {
         error(`文件夹 ${projectName} 已存在, 请更名后重新创建`);
       }
     } else {
-      clone(repo, name);
+      await clone(repo, name);
     }
-  } catch (error) {
-    error(`${error.message}`);
+    return path.join(process.cwd(), name);
+  } catch (err) {
+    throw err;
   }
 };
 
@@ -81,5 +82,6 @@ const clone = async (repo, name) => {
     spinner.succeed(chalk.green(`模版创建成功！请进入 ${name} 目录开始开发`));
   } catch (err) {
     spinner.fail(chalk.red(`模版创建失败: ${err.message}`));
+    throw err;
   }
 };

package/utils/projectLoader.js

@@ -0,0 +1,36 @@
+import fs from "node:fs";
+import path from "node:path";
+
+export function readProjectLoader(cwd = process.cwd()) {
+  const config = JSON.parse(fs.readFileSync(path.join(cwd, "qdmp.json"), "utf8"));
+  if (config.loader !== "EMP") {
+    throw new Error("仅支持 2.0（EMP）小程序；qdmp.json 的 loader 必须为 EMP。不支持 SPA/effuse 工程，不能只修改 loader 转换工程。");
+  }
+  const packagePath = path.join(cwd, "package.json");
+  if (fs.existsSync(packagePath)) {
+    const pkg = JSON.parse(fs.readFileSync(packagePath, "utf8"));
+    for (const field of ["dependencies", "devDependencies", "optionalDependencies", "peerDependencies"]) {
+      for (const [name, version] of Object.entries(pkg[field] || {})) {
+        if (/effuse|effues/i.test(name) || /effuse|effues/i.test(String(version))) {
+          throw new Error(`不支持 effuse/effues 依赖：${name}。请使用官方 2.0 模板迁移业务，不要仅修改 loader。`);
+        }
+      }
+    }
+  }
+  return config.loader;
+}
+
+export function assertMatchingLoader(localLoader, remoteLoader) {
+  if (localLoader !== "EMP" || remoteLoader !== "EMP") {
+    throw new Error(`应用类型不一致或不受支持（仅支持 EMP）：本地 ${localLoader}，平台 ${remoteLoader ?? "未提供"}。请关联匹配的应用或完成工程迁移，不能仅修改 loader。`);
+  }
+}
+
+export function assertEMPTemplate(cwd) {
+  if (readProjectLoader(cwd) !== "EMP") {
+    throw new Error("创建结果不是 2.0（EMP）模板，请检查官方模板来源。");
+  }
+  const pkg = JSON.parse(fs.readFileSync(path.join(cwd, "package.json"), "utf8"));
+  if (!pkg.scripts?.build) throw new Error("模板缺少 build 脚本。");
+  // package.json.version 是业务包版本，不是小程序运行时版本。
+}