@varlet/release 2.2.1 → 2.2.3-alpha.1779709734936

package/README.md

@@ -20,6 +20,8 @@
 
 > `Varlet Release` requires `Node.js` ^20.19.0 || >=22.12.0 and `esm` only.
 
+If you are upgrading from `v1` to `v2`, read the [migration guide](./MIGRATION.md) first.
+
 ## Quick Start
 
 Install dependencies:
@@ -160,6 +162,7 @@ Usage: vr publish [flags...]
 Flags:
       --check-remote-version          Check remote version
       --npm-tag string                npm tag
+      --otp string                    npm one-time password
 ```
 
 _Example_:
@@ -172,6 +175,8 @@ pnpm exec vr publish
 pnpm exec vr publish --check-remote-version
 # Specify the npm dist-tag
 pnpm exec vr publish --npm-tag alpha
+# Publish with npm two-factor authentication
+pnpm exec vr publish --otp 123456
 ```
 
 **Node API**:
@@ -183,6 +188,7 @@ publish({
   preRelease?: boolean         // Pre-release indicator, will add the '--tag alpha' option
   checkRemoteVersion?: boolean // Check if the same version exists on the remote npm before publishing
   npmTag?: string              // NPM tag to publish
+  otp?: string                 // npm one-time password
   cwd?: string                 // Working directory, defaults to process.cwd()
 })
 ```

package/README.zh-CN.md

@@ -20,6 +20,8 @@
 
 > `Varlet Release` 需要 `Node.js` ^20.19.0 || >=22.12.0，并且仅支持 `esm`。
 
+从 `v1` 升级到 `v2` 时，请先阅读 [迁移指南](./MIGRATION.zh-CN.md)。
+
 ## 快速开始
 
 安装依赖：
@@ -160,6 +162,7 @@ _标志参考_：
 标志:
       --check-remote-version          检查远程版本
       --npm-tag string                npm tag
+      --otp string                    npm 一次性验证码
 ```
 
 _使用示例_：
@@ -172,6 +175,8 @@ pnpm exec vr publish
 pnpm exec vr publish --check-remote-version
 # 指定 npm 的 dist-tag
 pnpm exec vr publish --npm-tag alpha
+# 使用 npm 双因素认证验证码发布
+pnpm exec vr publish --otp 123456
 ```
 
 **Node 调用**：
@@ -183,6 +188,7 @@ publish({
   preRelease?: boolean         // 预发布标示，将添加 '--tag alpha' 选项
   checkRemoteVersion?: boolean // 发布前检查远程 npm 上是否已存在相同版本
   npmTag?: string              // 发布的 npm tag
+  otp?: string                 // npm 一次性验证码
   cwd?: string                 // 工作目录，默认为 process.cwd()
 })
 ```

package/dist/cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { c as release, i as lockfileCheck, p as commitLint, s as publish, u as changelog } from "./src-DwRUa0a2.js";
+import { c as release, i as lockfileCheck, p as commitLint, s as publish, u as changelog } from "./src-DR5i3Sn4.js";
 import { cli, command } from "cleye";
 //#endregion
 //#region src/cli.ts
 cli({
 	name: "vr",
-	version: "2.2.1",
+	version: "2.2.3-alpha.1779709734936",
 	commands: [
 		command({
 			name: "release",
@@ -53,6 +53,11 @@ cli({
 					type: String,
 					alias: "t",
 					description: "Npm tag"
+				},
+				otp: {
+					type: String,
+					alias: "o",
+					description: "Npm one-time password"
 				}
 			},
 			help: { description: "Publish to npm" }

package/dist/index.d.ts

@@ -15,12 +15,14 @@ interface PublishCommandOptions {
   preRelease?: boolean;
   checkRemoteVersion?: boolean;
   npmTag?: string;
+  otp?: string;
   cwd?: string;
 }
 declare function publish({
   preRelease,
   checkRemoteVersion,
   npmTag,
+  otp,
   cwd
 }: PublishCommandOptions): Promise<void>;
 declare function getPackageJsons(cwd?: string): PackageJsonEntry[];

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as getPackageJsons, c as release, d as COMMIT_HEADER_RE, f as COMMIT_MESSAGE_RE, h as isVersionCommitMessage, i as lockfileCheck, l as updateVersion, m as getCommitMessage, n as getLockfilePath, o as isSameVersion, p as commitLint, r as installDependencies, s as publish, t as checkLockfileSync, u as changelog } from "./src-DwRUa0a2.js";
+import { a as getPackageJsons, c as release, d as COMMIT_HEADER_RE, f as COMMIT_MESSAGE_RE, h as isVersionCommitMessage, i as lockfileCheck, l as updateVersion, m as getCommitMessage, n as getLockfilePath, o as isSameVersion, p as commitLint, r as installDependencies, s as publish, t as checkLockfileSync, u as changelog } from "./src-DR5i3Sn4.js";
 export { COMMIT_HEADER_RE, COMMIT_MESSAGE_RE, changelog, checkLockfileSync, commitLint, getCommitMessage, getLockfilePath, getPackageJsons, installDependencies, isSameVersion, isVersionCommitMessage, lockfileCheck, publish, release, updateVersion };

package/dist/{src-DwRUa0a2.js → src-DR5i3Sn4.js}

@@ -1,7 +1,7 @@
-import { createWriteStream, existsSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import { createWriteStream, globSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { styleText } from "node:util";
-import { cancel, confirm, isCancel, select, spinner } from "@clack/prompts";
+import { cancel, confirm, isCancel, select, spinner, text } from "@clack/prompts";
 import { logger } from "rslog";
 import semver from "semver";
 import { x } from "tinyexec";
@@ -261,7 +261,7 @@ async function isSameVersion(version, cwd = process.cwd()) {
 		}
 	}
 }
-async function publish({ preRelease, checkRemoteVersion, npmTag, cwd = process.cwd() }) {
+async function publish({ preRelease, checkRemoteVersion, npmTag, otp, cwd = process.cwd() }) {
 	const s = spinner();
 	s.start("Publishing all packages");
 	const args = [
@@ -277,13 +277,16 @@ async function publish({ preRelease, checkRemoteVersion, npmTag, cwd = process.c
 	}
 	if (preRelease) args.push("--tag", "alpha");
 	else if (npmTag) args.push("--tag", npmTag);
+	const normalizedOtp = otp?.trim();
+	if (normalizedOtp) args.push("--otp", normalizedOtp);
 	try {
+		console.log("pnpm", args);
 		const ret = await x("pnpm", args, { throwOnError: true });
 		s.stop("Publish all packages successfully");
 		logStdout(ret);
 	} catch (error) {
 		s.cancel("Publish all packages failed");
-		throw error?.output?.stderr ?? error;
+		throw error?.output?.stderr || error?.output?.stdout || error;
 	}
 }
 async function pushGit(version, remote = "origin", skipGitTag = false) {
@@ -300,13 +303,7 @@ async function pushGit(version, remote = "origin", skipGitTag = false) {
 	logStdout(ret);
 }
 function getPackageJsons(cwd = process.cwd()) {
-	const packageJsonPaths = [resolve(cwd, "package.json")];
-	const packagesDir = resolve(cwd, "packages");
-	if (existsSync(packagesDir)) for (const name of readdirSync(packagesDir)) {
-		const pkgPath = resolve(packagesDir, name, "package.json");
-		if (existsSync(pkgPath)) packageJsonPaths.push(pkgPath);
-	}
-	return packageJsonPaths.map((path) => ({
+	return ["package.json", "packages/*/package.json"].flatMap((pattern) => globSync(pattern, { cwd }).map((relativePath) => resolve(cwd, relativePath))).map((path) => ({
 		filePath: path,
 		config: readJSONSync(path)
 	}));
@@ -329,7 +326,7 @@ async function confirmVersion(currentVersion, expectVersion) {
 	return unwrapPromptResult(await select({
 		message: "Version confirm",
 		options: [{
-			label: `All packages version ${currentVersion} -> ${expectVersion}`,
+			label: `All packages version ${styleText("red", currentVersion)} -> ${styleText("green", expectVersion)}`,
 			value: "confirm"
 		}, {
 			label: "Back to previous step",
@@ -351,8 +348,12 @@ function computeExpectVersion(currentVersion, type) {
 }
 async function getReleaseType(currentVersion) {
 	return unwrapPromptResult(await select({
-		message: `Please select release type, current version ${currentVersion}`,
-		options: RELEASE_TYPES.map((type) => {
+		message: `Please select release type`,
+		options: (semver.prerelease(currentVersion) ? [
+			...RELEASE_TYPES.slice(0, 3),
+			"prerelease",
+			...RELEASE_TYPES.slice(3)
+		] : RELEASE_TYPES).map((type) => {
 			return {
 				label: `${type} (${computeExpectVersion(currentVersion, type)})`,
 				value: type
@@ -371,6 +372,12 @@ async function getReleaseVersion(currentVersion) {
 		};
 	}
 }
+async function getPublishOtp() {
+	return unwrapPromptResult(await text({
+		message: "Please input npm otp",
+		placeholder: "Press enter to skip"
+	})).trim();
+}
 async function restorePackageJsons(cwd = process.cwd()) {
 	const paths = getPackageJsons(cwd).map(({ filePath }) => filePath);
 	if (paths.length > 0) await execGit("restore", ...paths);
@@ -383,10 +390,7 @@ async function release(options) {
 			logger.error("Your package is missing the version field");
 			return;
 		}
-		if (!await isWorktreeEmpty()) {
-			logger.error("Git worktree is not empty, please commit changed");
-			return;
-		}
+		if (!await isWorktreeEmpty()) logger.error("Git worktree is not empty, please commit changed");
 		if (!await confirmRefs(options.remote)) return;
 		if (!options.skipNpmPublish && !await confirmRegistry()) return;
 		const { isPreRelease, expectVersion } = await getReleaseVersion(currentVersion);
@@ -396,11 +400,15 @@ async function release(options) {
 		}
 		updateVersion(expectVersion, cwd);
 		if (options.task) await options.task(expectVersion, currentVersion);
-		if (!options.skipNpmPublish) await publish({
-			preRelease: isPreRelease,
-			npmTag: options.npmTag,
-			cwd
-		});
+		if (!options.skipNpmPublish) {
+			const otp = await getPublishOtp();
+			await publish({
+				preRelease: isPreRelease,
+				npmTag: options.npmTag,
+				otp,
+				cwd
+			});
+		}
 		if (!isPreRelease) {
 			if (!options.skipChangelog) await changelog({ cwd });
 			await pushGit(expectVersion, options.remote, options.skipGitTag);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/release",
-  "version": "2.2.1",
+  "version": "2.2.3-alpha.1779709734936",
   "description": "publish all packages, generate changelogs and check commit messages",
   "keywords": [
     "changelog",
@@ -30,20 +30,19 @@
     }
   },
   "dependencies": {
-    "@clack/prompts": "^1.2.0",
-    "cleye": "^2.3.0",
+    "@clack/prompts": "^1.4.0",
+    "cleye": "^2.6.0",
     "rslog": "^2.1.1",
-    "semver": "^7.7.4",
+    "semver": "^7.8.1",
     "standard-changelog": "^7.0.1",
-    "tinyexec": "^1.1.1"
+    "tinyexec": "^1.2.2"
   },
   "devDependencies": {
-    "@configurajs/vite-plus": "^0.2.2",
+    "@configurajs/vite-plus": "^0.2.6",
     "@types/node": "^22.14.0",
     "@types/semver": "^7.7.1",
-    "@typescript/native-preview": "7.0.0-dev.20260410.1",
-    "@vitest/coverage-v8": "^4.1.4",
-    "conventional-changelog-angular": "^8.3.1",
+    "@typescript/native-preview": "7.0.0-dev.20260524.1",
+    "@vitest/coverage-v8": "^4.1.5",
     "vite-plus": "latest"
   },
   "engines": {