feat: remove opt

Author: tomgao365

src/cli.ts

@@ -45,7 +45,6 @@ Options
   --no-publish          Skips publishing
   --build               Run build script before publishing (You can also use "prepublishOnly")
   --no-tag-merge        When publishing multiple packages, each package has its own independent tag and commit
-  --otp                 This is a one-time password from a two-factor authenticator
   --no-release-draft    Skips opening a GitHub release draft
   --dry-run             Don't actually release, just simulate the process
   --only-publish        Only publish the current package
@@ -125,9 +124,6 @@ Options
       releaseDraft: {
         type: 'boolean',
       },
-      otp: {
-        type: 'string',
-      },
       dryRun: {
         type: 'boolean',
       },
@@ -214,13 +210,15 @@ else {
       if (e.code === ReleaseErrorCode.WARNING || e.code === ReleaseErrorCode.EXIT) {
         logger.warning(msg);
       }
+      else if (e.code === ReleaseErrorCode.ROLLBACK) {
+        logger.error(msg);
+        await resetGitSubmit(getOptions() as any);
+      }
       else {
         logger.error(msg);
       }
     }
 
-    await resetGitSubmit(getOptions() as any);
-
     if (cliOpts.verbose) {
       console.log();
       console.log();

src/git.ts

@@ -312,24 +312,12 @@ export async function resetGitSubmit(opts: ReleaseOptions) {
 
   // remote git tag
   for (const pkg of pkgs) {
-    const tag = getGitTagVersion(pkg.tagName, pkg.version, opts);
+    const tag = getGitTagVersion(pkg.tagName, pkg.newVersion, opts);
     const res = await run(`git tag -l ${tag}`);
     if (res) {
       await run(`git tag -d ${tag}`);
     }
   }
 
-  // reset git commit
-  const res = await run(`git --no-pager log -n ${pkgs.length}  --pretty="format:%h"`);
-  const shaList = res
-    .split('\n')
-    .map(s => s.trim())
-    .filter(s => s);
-
-  for (const sha of shaList) {
-    if (sha === gitSHA) {
-      return;
-    }
-    await run(`git reset --hard ${sha}`);
-  }
+  await run(`git reset --hard HEAD~1`);
 }

src/npm.ts

@@ -1,5 +1,5 @@
 import type { PackageManager } from '@tomjs/pkg';
-import type { NpmInfo, PackageInfo, ReleaseOptions } from './types';
+import type { NpmInfo, PackageInfo } from './types';
 import fs from 'node:fs';
 import path from 'node:path';
 import inquirer from 'inquirer';
@@ -106,46 +106,6 @@ export function updatePackageVersion(pkg: PackageInfo) {
   fs.writeFileSync(jsonPath, `${JSON.stringify(json, null, 2)}\n`);
 }
 
-async function getTokenIsRequired() {
-  try {
-    const result = await run('npm profile get --json', {
-      env: getNpmEnv(),
-    });
-
-    const json = JSON.parse(result);
-    if (json.error || !json.tfa || !json.tfa.mode) {
-      return false;
-    }
-    return json.tfa.mode === 'auth-and-writes';
-  }
-  catch (e: any) {
-    logger.error('Error while checking if token is required', e.message);
-    return false;
-  }
-}
-
-export function getTwoFactorState(opts: ReleaseOptions): TwoFactorState {
-  const { otp, pkgs } = opts;
-  if (otp) {
-    return {
-      token: otp,
-      isRequired: Promise.resolve(true),
-    };
-  }
-
-  if (pkgs.some(pkg => pkg.registry !== NPM_REGISTRY)) {
-    return {
-      token: null,
-      isRequired: Promise.resolve(false),
-    };
-  }
-
-  return {
-    token: null,
-    isRequired: getTokenIsRequired(),
-  };
-}
-
 // const otpAskLimit = pLimit(1);
 async function askForOtpCode(twoFactorState: TwoFactorState) {
   if (twoFactorState.token !== null)

src/publish.ts

@@ -1,9 +1,9 @@
-import type { TwoFactorState } from './npm';
 import type { PackageInfo, ReleaseOptions } from './types';
 import chalk from 'chalk';
 import { execa } from 'execa';
 import open from 'open';
 import semver from 'semver';
+import { ReleaseError } from './error';
 import {
   getGitTagVersion,
   getGitTagVersionRelease,
@@ -12,7 +12,7 @@ import {
   releaseNotes,
 } from './git';
 import { logger } from './logger';
-import { getNpmEnv, getOtpCode, getTwoFactorState, updatePackageVersion } from './npm';
+import { getNpmEnv, updatePackageVersion } from './npm';
 import { run } from './utils';
 
 export async function runPublish(opts: ReleaseOptions) {
@@ -56,14 +56,13 @@ async function bumpVersionAndTag(opts: ReleaseOptions) {
 
 async function runPublishPackages(opts: ReleaseOptions) {
   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(`${pm.cli} run build`, { cwd: pkg.dir });
       }
-      await publishOnePackage(pkg, opts, twoFactorState);
+      await publishOnePackage(pkg, opts);
       const tag = `${pkg.name}@${pkg.newVersion}`;
       logger.success(`Publish ${chalk.green(tag)} successfully 🎉`);
     }
@@ -85,7 +84,6 @@ async function runPublishPackages(opts: ReleaseOptions) {
 async function publishOnePackage(
   pkg: PackageInfo,
   opts: ReleaseOptions,
-  twoFactorState: TwoFactorState,
 ) {
   const { packageManager: pm, dryRun } = opts;
   const args: string[] = ['publish', '--access', pkg.access, '--tag', pkg.tag];
@@ -98,10 +96,6 @@ async function publishOnePackage(
     args.push(`---new-version`, pkg.newVersion);
   }
 
-  if (await twoFactorState.isRequired) {
-    await getOtpCode(twoFactorState);
-  }
-
   if (dryRun && pm.cli !== 'yarn') {
     args.push('--dry-run');
   }
@@ -111,15 +105,7 @@ async function publishOnePackage(
     cli = 'yarn npm';
   }
 
-  const getArgs = () => {
-    const otp = twoFactorState.token;
-    if (otp) {
-      return [...args, '--otp', otp];
-    }
-    return [...args];
-  };
-
-  const cmd = [cli].concat(getArgs()).join(' ');
+  const cmd = [cli].concat(args).join(' ');
   logger.debug(cmd);
 
   if (dryRun && pm.cli === 'yarn') {
@@ -128,21 +114,13 @@ async function publishOnePackage(
   }
 
   try {
-    await runNpmPublish(cli, getArgs(), pkg);
-    twoFactorState.tryAgain = false;
+    await runNpmPublish(cli, args, pkg);
   }
   catch (e: any) {
     if (e && needOtp(e.message)) {
-      if (twoFactorState.token !== null) {
-        // the current otp code must be invalid since it errored
-        twoFactorState.token = null;
-      }
-      twoFactorState.tryAgain = true;
-      await publishOnePackage(pkg, opts, twoFactorState);
-    }
-    else {
-      throw e;
+      logger.error(chalk.red('Please use "Access Tokens -> Security settings" to bypass 2FA"'));
     }
+    ReleaseError.rollback(e.message);
   }
 }