fix: support private registry

Author: tomgao365

src/npm.ts

@@ -58,17 +58,22 @@ const _getNpmRegistry = async (pm: PackageManager, pkg?: PackageInfo) => {
   try {
     const pkgName = pkg?.name;
     let registry = pkg?.packageJson.publishConfig?.registry;
-    if (!registry) {
-      const cmd = pm.id === 'berry' ? getBerryRegistryCmd(pkgName) : getNpmRegistryCmd(pm, pkgName);
+    if (registry) {
+      return removeTrailingSlashes(registry);
+    }
 
-      registry = await run(cmd, {
-        trim: true,
-        cwd: ['npm', 'yarn'].includes(pm.id) ? undefined : pkg?.dir,
-      });
+    const cmd = pm.id === 'berry' ? getBerryRegistryCmd(pkgName) : getNpmRegistryCmd(pm, pkgName);
 
-      registry = registry === 'undefined' ? '' : registry;
-    }
+    registry = await run(cmd, {
+      trim: true,
+      cwd: ['npm', 'yarn'].includes(pm.id) ? undefined : pkg?.dir,
+    });
+
+    registry = registry === 'undefined' ? '' : registry;
+
+    return removeTrailingSlashes(registry) || NPM_REGISTRY;
   } catch {}
+
   return NPM_REGISTRY;
 };
 

src/publish.ts

@@ -50,13 +50,13 @@ async function bumpVersionAndTag(opts: ReleaseOptions) {
 }
 
 async function runPublishPackages(opts: ReleaseOptions) {
-  const { pkgs, dryRun } = opts;
+  const { pkgs, dryRun, packageManager: pm } = opts;
   const twoFactorState = getTwoFactorState(opts);
 
   if (opts.publish) {
     for (const pkg of pkgs) {
       if (!dryRun && opts.build && pkg.packageJson?.scripts?.build) {
-        await run('npm run build', { cwd: pkg.dir });
+        await run(`${pm.cli} run build`, { cwd: pkg.dir });
       }
       await publishOnePackage(pkg, opts, twoFactorState);
       const tag = `${pkg.name}@${pkg.newVersion}`;
@@ -66,10 +66,8 @@ async function runPublishPackages(opts: ReleaseOptions) {
 
   const gitUrl = await getRepositoryUrl();
   if (gitUrl) {
-    try {
-      await run(`git push --follow-tags`, { dryRun });
-    } catch {
-      await run(`git push`, { dryRun });
+    await run(`git push`, { dryRun });
+    if (!opts.releaseDraft) {
       await run(`git push --tags`, { dryRun });
     }
   }

src/utils.ts

@@ -123,15 +123,15 @@ export async function run(cmd: string | string[], options?: RunExecaOptions): Pr
 
   try {
     const { stdout } = await $(execOpts)`${cmd}`;
-
+    const std = Array.isArray(stdout) ? stdout.join('\n') : (stdout as string) || '';
     spin && spin.stop();
 
-    log(stdout);
+    log(std);
 
     if (trim) {
-      return stdout.trim().replace(/\n|\r/g, '');
+      return std.trim().replace(/\n|\r/g, '');
     }
-    return stdout.trim();
+    return std.trim();
   } catch (e: any) {
     spin && spin.stop();