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

package/lib/action/release/release.d.ts

@@ -1,2 +1,2 @@
-import { type ReleaseOptions, type ReleaseManifest } from './types';
+import { type ReleaseManifest, type ReleaseOptions } from './types';
 export declare const releasePackages: (releaseManifests: ReleaseManifest[], releaseOptions: ReleaseOptions) => Promise<void>;

package/lib/action/release/types.d.ts

@@ -2,7 +2,7 @@ import { type RushConfigurationProject } from '@rushstack/rush-sdk';
 export interface ReleaseOptions {
     commit?: string;
     dryRun?: boolean;
-    registry: string;
+    registry?: string;
     packages?: PackageToPublish[];
     allowBranches?: string[];
 }

package/lib/const/index.d.ts

@@ -1,7 +1,3 @@
-/**
- * 默认的 NPM registry 地址
- */
-export declare const DEFAULT_NPM_REGISTRY = "https://registry.npmjs.org";
 /**
  * 默认的 Git 分支名前缀
  */

package/lib/index.js

@@ -148,11 +148,6 @@ const logger = {
 //  Copyright (c) 2025 coze-dev
 //  SPDX-License-Identifier: MIT
 
-/**
- * 默认的 NPM registry 地址
- */
-const DEFAULT_NPM_REGISTRY = 'https://registry.npmjs.org';
-
 /**
  * 默认的 Git 分支名前缀
  */
@@ -360,6 +355,62 @@ const buildMergeRequestUrl = (
   return null;
 };
 
+function _optionalChain$3(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+/**
+ * package.json 的类型定义
+ */
+
+
+
+
+
+
+
+
+/**
+ * 解析发布 registry 的优先级：
+ * 1. 命令行参数 --registry (最高优先级)
+ * 2. package.json 中的 publishConfig.registry
+ * 3. 使用 npm 配置的默认 registry (不传 --registry 参数)
+ *
+ * @param project - Rush 项目配置
+ * @param registryFromCli - 命令行参数传入的 registry
+ * @returns 解析后的 registry URL，如果为 undefined 则使用 npm 默认配置
+ */
+function resolveRegistry(
+  project,
+  registryFromCli,
+) {
+  // 1. 优先使用命令行参数
+  if (registryFromCli) {
+    logger.info(
+      `Using registry from CLI: ${registryFromCli} (${project.packageName})`,
+      false,
+    );
+    return registryFromCli;
+  }
+
+  // 2. 尝试读取 package.json 中的 publishConfig.registry
+  const packageJson = project.packageJson ;
+  const registryFromPackageJson = _optionalChain$3([packageJson, 'access', _ => _.publishConfig, 'optionalAccess', _2 => _2.registry]);
+
+  if (registryFromPackageJson) {
+    logger.info(
+      `Using registry from publishConfig: ${registryFromPackageJson} (${project.packageName})`,
+      false,
+    );
+    return registryFromPackageJson;
+  }
+
+  // 3. 返回 undefined，让 npm 使用自己配置的 registry
+  logger.info(
+    `Using npm configured registry (${project.packageName})`,
+    false,
+  );
+  return undefined;
+}
+
 //  Copyright (c) 2025 coze-dev
 //  SPDX-License-Identifier: MIT
 
@@ -472,7 +523,7 @@ const publishPackage = async (
   project,
   releaseOptions,
 ) => {
-  const { dryRun, registry } = releaseOptions;
+  const { dryRun } = releaseOptions;
   const token = process.env.NPM_AUTH_TOKEN;
   const { version } = project.packageJson;
   const tag = version.includes('alpha')
@@ -480,6 +531,10 @@ const publishPackage = async (
     : version.includes('beta')
       ? 'beta'
       : 'latest';
+
+  // 解析 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,
@@ -489,6 +544,7 @@ const publishPackage = async (
   if (dryRun) {
     args.push('--dry-run');
   }
+  // 只有明确指定了 registry 才传递参数，否则使用 npm 配置的默认值
   if (registry) {
     args.push(`--registry=${registry}`);
   }
@@ -708,8 +764,7 @@ const installAction$2 = (program) => {
     .option('--dry-run', '是否只执行不真实发布', false)
     .option(
       '-r, --registry <string>',
-      `发布到的 registry (默认: ${DEFAULT_NPM_REGISTRY})`,
-      DEFAULT_NPM_REGISTRY,
+      '发布到的 registry (优先级: CLI参数 > package.json publishConfig.registry > npm config)',
     )
     .option(
       '--allow-branches <branches...>',
@@ -1382,7 +1437,7 @@ const confirmForPublish = async (
   if (_optionalChain$1([options, 'optionalAccess', _ => _.isReleaseMode])) {
     logger.info('', false);
     logger.warn(chalk.yellow.bold('⚠️  Release Mode Enabled:'), false);
-    const registryMsg = `   Packages will be published directly to: ${chalk.bold(options.registry || 'default registry')}`;
+    const registryMsg = `   Packages will be published directly to: ${chalk.bold(options.registry || 'npm configured registry')}`;
     logger.warn(chalk.yellow(registryMsg), false);
   }
 
@@ -1804,7 +1859,7 @@ const publish = async (options) => {
     !!options.dryRun,
     {
       isReleaseMode: !!options.release,
-      registry: options.registry || DEFAULT_NPM_REGISTRY,
+      registry: options.registry,
     },
   );
 
@@ -1840,13 +1895,16 @@ const publish = async (options) => {
     // Release 模式：直接发布
     logger.info('Running in direct release mode...');
     logger.info('Starting package release...');
-    const registry = options.registry || DEFAULT_NPM_REGISTRY;
     // 将 PublishManifest[] 转换为 PackageToPublish[]
     const packages = publishManifests.map(manifest => ({
       packageName: manifest.project.packageName,
       version: manifest.newVersion,
     }));
-    await release({ dryRun: !!options.dryRun, registry, packages });
+    await release({
+      dryRun: !!options.dryRun,
+      registry: options.registry,
+      packages,
+    });
   } else {
     // 普通模式：创建并推送发布分支
     await pushToRemote({
@@ -1903,8 +1961,7 @@ const installAction$1 = (program) => {
     )
     .option(
       '--registry <url>',
-      `NPM registry URL (default: ${DEFAULT_NPM_REGISTRY})`,
-      DEFAULT_NPM_REGISTRY,
+      'NPM registry URL (优先级: CLI参数 > package.json publishConfig.registry > npm config)',
     )
     .action(async (options) => {
       try {

package/lib/utils/resolve-registry.d.ts

@@ -0,0 +1,12 @@
+import { type RushConfigurationProject } from '@rushstack/rush-sdk';
+/**
+ * 解析发布 registry 的优先级：
+ * 1. 命令行参数 --registry (最高优先级)
+ * 2. package.json 中的 publishConfig.registry
+ * 3. 使用 npm 配置的默认 registry (不传 --registry 参数)
+ *
+ * @param project - Rush 项目配置
+ * @param registryFromCli - 命令行参数传入的 registry
+ * @returns 解析后的 registry URL，如果为 undefined 则使用 npm 默认配置
+ */
+export declare function resolveRegistry(project: RushConfigurationProject, registryFromCli?: string): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/rush-publish-plugin",
-  "version": "0.0.5-alpha.a5f14f",
+  "version": "0.0.5-alpha.bba657",
   "description": "rush plugin to generate change log and publish packages",
   "keywords": [
     "rush",