@plugin-light/cli 1.0.16 → 1.0.19

package/README.md

@@ -5,8 +5,8 @@
   <img src="https://img.shields.io/npm/unpacked-size/@plugin-light/cli">
   <img src="https://img.shields.io/npm/v/@plugin-light/cli">
   <img src="https://img.shields.io/npm/l/@plugin-light/cli">
-  <img src="https://img.shields.io/github/last-commit/novlan1/plugin-light">
-  <img src="https://img.shields.io/github/created-at/novlan1/plugin-light">
+  <img src="https://img.shields.io/badge/TypeScript-strict-blue?logo=typescript&logoColor=white" alt="TypeScript strict">
+  <img src="https://img.shields.io/badge/created-2022--01-blue?logo=github&logoColor=white">
 </p>
 
 可以在 `nodejs` 或 `bash` 中使用。

package/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@plugin-light/cli",
-  "version": "1.0.16",
+  "version": "1.0.19",
+  "description": "本地发布",
+  "keywords": [
+    "plugin-light",
+    "plugin-light-cli"
+  ],
   "homepage": "https://novlan1.github.io/docs/plugin-light/zh/plugin-light-cli.html",
   "bugs": {
     "url": "https://github.com/novlan1/plugin-light/issues"
@@ -24,9 +29,9 @@
     "@tdesign/uniapp": "^0.7.3",
     "@tdesign/uniapp-chat": "^0.2.1",
     "axios": "^1.12.2",
-    "t-comm": "^3.0.24",
-    "@plugin-light/const": "^0.1.4",
-    "@plugin-light/shared": "^1.0.24"
+    "t-comm": "latest",
+    "@plugin-light/const": "^0.1.6",
+    "@plugin-light/shared": "^1.0.25"
   },
   "publishConfig": {
     "access": "public",

package/script/release/monorepo/pipeline-release.script.js

@@ -48,20 +48,30 @@ function toPublish({
     doCommand('pnpm run init');
   }
 
-  releaseCore({
-    version: versionType,
-    pwd,
-
-    needVersionTip,
-    ignoreBuild,
-    ignorePublish,
-  });
+  let releaseOk = false;
+  try {
+    releaseCore({
+      version: versionType,
+      pwd,
+
+      needVersionTip,
+      ignoreBuild,
+      ignorePublish,
+    });
+    releaseOk = true;
+  } catch (e) {
+    console.error('🚀 [release] releaseCore failed:', (e && e.message) || e);
+    // 保守策略：发布过程任何阶段失败 → 不 push commit、不 push tag，由人工介入
+    process.exitCode = 1;
+  }
 
-  if (!ignorePushOrigin) {
+  if (!ignorePushOrigin && releaseOk) {
     doCommand('git remote remove origin');
     doCommand(`git remote add origin git@git.a.com:${repo}.git`);
     doCommand(`git push origin ${branch}`);
     doCommand('git push origin --tags');
+  } else if (!releaseOk) {
+    console.error('🚀 [release] release failed, skip git push (both commit and tag).');
   }
 }
 

package/script/release/monorepo/release-core.js

@@ -4,6 +4,7 @@
 // pnpm --filter="pixui-runtime" release beta --ignoreBuild --ignorePublish
 // pnpm --filter="pixui-runtime" release beta --ignoreBuild --ignorePublish --needVersionTip
 
+const { execSync } = require('child_process');
 const path = require('path');
 
 const { execCommand, readFileSync, writeFileSync, getNextVersion } = require('t-comm');
@@ -16,6 +17,39 @@ function log(...args) {
   console.log('🚀 [release] ', ...args);
 }
 
+/**
+ * 检测 tag 是否存在（同时检测本地与远程 origin）
+ * 任一存在即视为存在
+ */
+function tagExists(tag) {
+  // 1) 本地 tag
+  try {
+    const localOut = execSync(`git tag -l ${tag}`, { encoding: 'utf8' }).trim();
+    if (localOut === tag) {
+      return true;
+    }
+  } catch (e) {
+    // 本地命令失败不阻塞，继续判断远程
+    log(`[tagExists] local check error: ${e.message}`);
+  }
+
+  // 2) 远程 tag
+  try {
+    const remoteOut = execSync(`git ls-remote --tags origin refs/tags/${tag}`, {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+    if (remoteOut.includes(`refs/tags/${tag}`)) {
+      return true;
+    }
+  } catch (e) {
+    // 远程不可达时保守认为不存在，让后续 git tag 自己报错
+    log(`[tagExists] remote check error: ${e.message}`);
+  }
+
+  return false;
+}
+
 
 function packageBuild(pkgName) {
   log(`build ${pkgName}`);
@@ -27,11 +61,20 @@ function packageBuild(pkgName) {
 function bumpVersion({
   pwd,
   pkgName,
+  purePkgName,
   version,
 }) {
   log(`origin version is ${version}`);
 
-  const newVersion = getNextVersion(pkgName, version);
+  const newVersion = getNextVersion(pkgName, version, {
+    checkTagExists: (v) => {
+      const exists = tagExists(`${purePkgName}@${v}`);
+      if (exists) {
+        log(`⚠️  tag ${purePkgName}@${v} already exists, will bump again`);
+      }
+      return exists;
+    },
+  });
   log(`new version is ${newVersion}`);
 
   const jsonFile = path.resolve(pwd, './package.json');
@@ -58,8 +101,15 @@ function doChangeLog(pwd, pkgName) {
 
 
 function genTag(purePkgName, newVersion) {
-  log('new version is ', newVersion);
-  execCommand(`git tag ${purePkgName}@${newVersion}`, process.cwd(), 'inherit');
+  const tag = `${purePkgName}@${newVersion}`;
+  log('new tag is ', tag);
+
+  // 双保险：bumpVersion 已经做了避让，这里再校验一次，避免极端竞态
+  if (tagExists(tag)) {
+    throw new Error(`tag ${tag} 已存在，发布中断（请检查 npm dist-tag 与 git tag 是否一致）`);
+  }
+
+  execCommand(`git tag ${tag}`, process.cwd(), 'inherit');
 }
 
 
@@ -84,7 +134,9 @@ function getPublishTag(version) {
 function publish({ pkgName, version }) {
   const tag = getPublishTag(version);
   log(`publish tag is ${tag}`);
-  execCommand(`pnpm --filter=${pkgName} publish ${tag ? `--tag ${tag}` : ''}  --no-git-checks`, process.cwd(), 'inherit');
+  execCommand(`pnpm --filter=${pkgName} publish ${tag ? `--tag ${tag}` : ''}  --no-git-checks`, process.cwd(), 'inherit', {
+    throwError: true,
+  });
 }
 
 /**
@@ -127,6 +179,7 @@ function releaseCore({
   const newVersion = bumpVersion({
     pwd,
     pkgName,
+    purePkgName,
     version,
   });
 
@@ -139,6 +192,8 @@ function releaseCore({
     pwd,
   });
 
+  // genTag 失败会直接抛错，下方 publish/sendVersionTip 不会执行；
+  // 调用方（pipeline-release）应在 catch 中跳过 push commit / push tag
   genTag(purePkgName, newVersion);
 
   if (!ignorePublish) {
@@ -151,6 +206,12 @@ function releaseCore({
   if (needVersionTip) {
     sendVersionTip(pwd);
   }
+
+  return {
+    pkgName,
+    purePkgName,
+    newVersion,
+  };
 }
 
 module.exports = {

package/script/release/version-tip/index.js

@@ -1,11 +1,17 @@
-const { batchSendWxRobotMarkdown, genVersionTip  } = require('t-comm');
+const {
+  batchSendWxRobotMarkdown,
+  genVersionTip,
+  resolveNpmLink,
+  collectPackageSize,
+} = require('t-comm');
 
 
-function sendVersionTip({
+async function sendVersionTip({
   readmeFilePath,
   appInfo,
   publisher,
   webhookUrl,
+  registry,
 }) {
   console.log('[webhookUrl]: ', webhookUrl);
   if (!webhookUrl) {
@@ -13,11 +19,16 @@ function sendVersionTip({
     return;
   }
 
+  const packageSize = await collectPackageSize(appInfo, { registry });
+
   const content = genVersionTip({
     appInfo,
-    showNpmLink: false,
+    showNpmLink: true,
     readmeFilePath,
     publisher: publisher || process.env.creator || '',
+    pipelineUrl: process.env.BK_CI_BUILD_URL || '',
+    packageSize,
+    npmLink: resolveNpmLink(appInfo.name),
   });
 
   console.log('content:\n', content);
@@ -32,4 +43,3 @@ function sendVersionTip({
 module.exports = {
   sendVersionTip,
 };
-