@coze-arch/rush-publish-plugin 0.0.5-alpha.bba657 → 0.0.5-alpha.d99d0c

package/lib/index.js

@@ -6,6 +6,7 @@ var commander = require('commander');
 var shelljs = require('shelljs');
 var fs = require('fs/promises');
 var rushSdk = require('@rushstack/rush-sdk');
+var minimatch = require('minimatch');
 var crypto = require('crypto');
 var semver = require('semver');
 var chalk = require('chalk');
@@ -236,11 +237,6 @@ const getCurrentCommitHash = async () => {
   return stdout.trim();
 };
 
-const isMainBranch = async () => {
-  const currentBranchName = await getCurrentBranchName();
-  return currentBranchName === 'main';
-};
-
 const getChangedFiles = async () => {
   const output = await exec('git diff --name-only --diff-filter=ACMR');
   return serializeFilesName(output.stdout);
@@ -404,10 +400,7 @@ function resolveRegistry(
   }
 
   // 3. 返回 undefined，让 npm 使用自己配置的 registry
-  logger.info(
-    `Using npm configured registry (${project.packageName})`,
-    false,
-  );
+  logger.info(`Using npm configured registry (${project.packageName})`, false);
   return undefined;
 }
 
@@ -535,11 +528,7 @@ const publishPackage = async (
   // 解析 registry：CLI 参数 > package.json publishConfig > npm 配置
   const registry = resolveRegistry(project, releaseOptions.registry);
 
-  const setToken = `npm config set //bnpm.byted.org/:_authToken ${token}`;
-  await exec(setToken, {
-    cwd: project.projectFolder,
-  });
-
+  // 使用环境变量传递 authToken，npm 会自动应用到任何 registry
   const args = [`NODE_AUTH_TOKEN=${token}`, 'npm', 'publish', `--tag ${tag}`];
   if (dryRun) {
     args.push('--dry-run');
@@ -587,6 +576,12 @@ const releasePackages = async (
   );
 };
 
+//  Copyright (c) 2025 coze-dev
+//  SPDX-License-Identifier: MIT
+
+
+
+
 var ReleaseType; (function (ReleaseType) {
   const ALPHA = 'alpha'; ReleaseType["ALPHA"] = ALPHA;
   const BETA = 'beta'; ReleaseType["BETA"] = BETA;
@@ -613,6 +608,36 @@ const calReleasePlan = (releaseManifests) => {
   return ReleaseType.ALPHA;
 };
 
+/**
+ * Check if a branch name matches any of the allowed patterns.
+ * Supports exact matches, glob patterns (using minimatch), and regex patterns.
+ *
+ * @param branchName - The current branch name
+ * @param allowPatterns - Array of patterns (exact strings, glob patterns, or regex strings starting with '/')
+ * @returns true if the branch matches any pattern, false otherwise
+ */
+const isBranchAllowed = (
+  branchName,
+  allowPatterns,
+) =>
+  allowPatterns.some(pattern => {
+    // Check if it's a regex pattern (enclosed in forward slashes)
+    if (pattern.startsWith('/') && pattern.endsWith('/')) {
+      const regexPattern = pattern.slice(1, -1);
+      try {
+        // eslint-disable-next-line security/detect-non-literal-regexp -- User-provided patterns are validated
+        const regex = new RegExp(regexPattern);
+        return regex.test(branchName);
+      } catch (e) {
+        // Invalid regex, fall back to exact match
+        return pattern === branchName;
+      }
+    }
+
+    // Use minimatch for glob patterns and exact matches
+    return minimatch.minimatch(branchName, pattern);
+  });
+
 const checkReleasePlan = (
   releaseManifests,
   branchName,
@@ -621,7 +646,7 @@ const checkReleasePlan = (
   const releasePlan = calReleasePlan(releaseManifests);
   if (
     releasePlan === ReleaseType.LATEST &&
-    !allowBranches.includes(branchName)
+    !isBranchAllowed(branchName, allowBranches)
   ) {
     throw new Error(
       `For LATEST release, should be on one of these branches: ${allowBranches.join(', ')}. Current Branch: ${branchName}`,
@@ -902,19 +927,20 @@ const calculateNewVersion = (
       return semver.inc(cc, bumpType) || currentVersion;
     }
     case BumpType.BETA: {
-      // 如果当前已经是 beta 版本，增加 beta 版本号
+      // If already a beta version, increment beta number
       if (prerelease[0] === 'beta') {
         const nextVersion = semver.inc(currentVersion, 'prerelease', 'beta');
         return nextVersion || currentVersion;
       }
-      // 否则基于当前版本创建新的 beta 版本
-      const baseVersion = `${major}.${minor}.${patch}`;
+      // Based on the next patch version to create beta version
+      const nextPatch = prerelease.length > 0 ? patch : patch + 1;
+      const baseVersion = `${major}.${minor}.${nextPatch}`;
       return `${baseVersion}-beta.1`;
     }
     case BumpType.ALPHA: {
-      // 否则基于当前版本创建新的 alpha 版本
-      const baseVersion = `${major}.${minor}.${patch}`;
-      // 生成随机哈希值
+      // Based on the next patch version to create alpha version
+      const nextPatch = prerelease.length > 0 ? patch : patch + 1;
+      const baseVersion = `${major}.${minor}.${nextPatch}`;
       return `${baseVersion}-alpha.${sessionId || randomHash(6)}`;
     }
     default: {
@@ -1810,8 +1836,10 @@ const applyPublishManifest = async (
 // 2. beta: 本分支直接切换版本号，并发布
 // 3. 正式版本：发起MR，MR 合入 main 后，触发发布
 
+const SESSION_ID_LENGTH = 6;
+
 const publish = async (options) => {
-  const sessionId = randomHash(6);
+  const sessionId = randomHash(SESSION_ID_LENGTH);
   const rushConfiguration = getRushConfiguration$1();
   const rushFolder = rushConfiguration.rushJsonFolder;
   if (
@@ -1842,17 +1870,6 @@ const publish = async (options) => {
   const isBetaPublish = [BumpType.BETA, BumpType.ALPHA].includes(
     bumpPolicy ,
   );
-  if (
-    process.env.SKIP_BRANCH_CHECK !== 'true' &&
-    isBetaPublish === false &&
-    (await isMainBranch()) === false
-  ) {
-    // 只允许在主分支发布
-    logger.error(
-      'You are not in main branch, please switch to main branch and try again.',
-    );
-    return;
-  }
 
   const continuePublish = await confirmForPublish(
     publishManifests,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/rush-publish-plugin",
-  "version": "0.0.5-alpha.bba657",
+  "version": "0.0.5-alpha.d99d0c",
   "description": "rush plugin to generate change log and publish packages",
   "keywords": [
     "rush",
@@ -13,6 +13,7 @@
   "author": "tecvan.fe@gmail.com",
   "maintainers": [],
   "main": "./lib/index.js",
+  "types": "lib/index.d.ts",
   "bin": {
     "rush-publish": "./lib/index.js"
   },
@@ -36,6 +37,7 @@
     "conventional-changelog-angular": "^5.0.13",
     "conventional-commits-parser": "^3.2.4",
     "dayjs": "^1.11.13",
+    "minimatch": "^10.0.0",
     "open": "~10.1.0",
     "semver": "^7.7.1",
     "shelljs": "^0.9.2"
@@ -70,6 +72,5 @@
     },
     "main": "./lib/index.js",
     "types": "lib/index.d.ts"
-  },
-  "types": "lib/index.d.ts"
+  }
 }

package/lib/utils/get-plugin-config.d.ts

@@ -1,8 +0,0 @@
-export interface IPublishPluginConfig {
-    branchPrefix?: string;
-}
-/**
- * Read plugin configuration from common/config/rush-plugins/@coze-arch/rush-publish-plugin.json
- * @returns Plugin configuration object
- */
-export declare function getPluginConfig(): IPublishPluginConfig;