@taole/deploy-helper 1.1.3 → 1.1.5-beta.1

package/lib/lightDeploy.mjs

@@ -18,7 +18,10 @@ function getErrorMessage(resJson, fallback) {
   return fallback;
 }
 
-async function apiCdnUpload({ distZipPath, prefix, mode, includeHtml, entryHtmlMap, type, version }, userCache) {
+async function apiCdnUpload(
+  { distZipPath, prefix, mode, includeHtml, entryHtmlMap, type, version },
+  userCache
+) {
   const formData = new FormData();
   formData.append("prefix", prefix);
   formData.append("mode", mode);
@@ -31,7 +34,9 @@ async function apiCdnUpload({ distZipPath, prefix, mode, includeHtml, entryHtmlM
   }
   if (entryHtmlMap) {
     const entryHtmlMapStr =
-      typeof entryHtmlMap === "string" ? entryHtmlMap : JSON.stringify(entryHtmlMap);
+      typeof entryHtmlMap === "string"
+        ? entryHtmlMap
+        : JSON.stringify(entryHtmlMap);
     formData.append("entryHtmlMap", entryHtmlMapStr);
   }
   formData.append(
@@ -60,9 +65,17 @@ async function apiCdnUpload({ distZipPath, prefix, mode, includeHtml, entryHtmlM
  * @param {*} mode 部署环境
  */
 export async function lightDeploy(config, mode) {
-  const projectJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), "package.json"), "utf-8"));
+  const projectJson = JSON.parse(
+    fs.readFileSync(path.join(process.cwd(), "package.json"), "utf-8")
+  );
   const version = projectJson.version;
-  log(`light模式, 开始部署`, { mode, prefix: config.prefix, includeHtml: config.includeHtml, type: config.cdnType, version });
+  log(`light模式, 开始部署`, {
+    mode,
+    prefix: config.prefix,
+    includeHtml: config.includeHtml,
+    type: config.cdnType,
+    version,
+  });
 
   if (!mode || (mode !== "test" && mode !== "prod")) {
     throw new Error("部署环境无效，仅支持 test 或 prod");
@@ -85,7 +98,7 @@ export async function lightDeploy(config, mode) {
     throw new Error(`${distPath} 不存在，请先执行构建`);
   }
 
-  const distZipPath = path.join(workDir, "dist.zip");
+  const distZipPath = path.join(workDir, "cdnDist.zip");
   if (fs.existsSync(distZipPath)) {
     fs.unlinkSync(distZipPath);
   }
@@ -95,23 +108,30 @@ export async function lightDeploy(config, mode) {
   log(`打包完成: ${distZipPath}`);
 
   const includeHtml = config.includeHtml === true;
-  log(`开始上传至 CDN，mode=${mode}, prefix=${prefix}, type=${config.cdnType || "project"}, version=${version}, includeHtml=${includeHtml}`);
-  const result = await apiCdnUpload(
-    {
-      distZipPath,
-      prefix,
-      mode,
-      includeHtml,
-      entryHtmlMap: config.entryHtmlMap,
-      type: config.cdnType,
-      version,
-    },
-    userCache
+  log(
+    `开始上传至 CDN，mode=${mode}, prefix=${prefix}, type=${
+      config.cdnType || "project"
+    }, version=${version}, includeHtml=${includeHtml}`
   );
-
-  if (fs.existsSync(distZipPath)) {
-    fs.unlinkSync(distZipPath);
+  try {
+    const result = await apiCdnUpload(
+      {
+        distZipPath,
+        prefix,
+        mode,
+        includeHtml,
+        entryHtmlMap: config.entryHtmlMap,
+        type: config.cdnType,
+        version,
+      },
+      userCache
+    );
+    log(`CDN 上传成功`, result);
+  } catch (error) {
+    throw error;
+  } finally {
+    if (fs.existsSync(distZipPath)) {
+      fs.unlinkSync(distZipPath);
+    }
   }
-
-  log(`CDN 上传成功`, result);
 }

package/lib/project.mjs

@@ -8,6 +8,25 @@ import { getCache as getLoginCache } from "./login.mjs";
 
 const isDev = false;
 const apiHost = isDev ? "http://localhost:9000" : "https://fapi.tuwan.com";
+const WEB_ACT_REPO_PATH = "69b3821af7b43e00d420cb32/Web-Act";
+
+function extractWebActProjectNameFromRemote(remoteUrl) {
+  if (!remoteUrl) {
+    return null;
+  }
+  const match = remoteUrl.match(new RegExp(`${WEB_ACT_REPO_PATH}/([^/.]+)(?:\\.git)?/?$`));
+  return match ? match[1] : null;
+}
+
+async function checkPackageNameWithGitRemote(git, packageName) {
+  const remotes = await git.getRemotes(true);
+  const remoteUrls = remotes.flatMap((remote) => [remote.refs.fetch, remote.refs.push]).filter(Boolean);
+  const gitProjectName = remoteUrls.map(extractWebActProjectNameFromRemote).find(Boolean);
+
+  if (gitProjectName && gitProjectName !== packageName) {
+    throw new Error(`项目名称不匹配: git仓库项目名称为${gitProjectName}, package.json name为${packageName}`);
+  }
+}
 
 export function genArchive(outputPath, dir) {
   return new Promise((resolve, reject) => {
@@ -240,6 +259,7 @@ export const cmdProjectPublish = async () => {
     log("package.json或者其version字段或name字段不存在");
     process.exit(1);
   }
+  await checkPackageNameWithGitRemote(git, packageJson.name);
 
   const newVersion = await apiGetProjectVersion(packageJson.name, userCache);
   packageJson.version = newVersion;

package/package.json

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