fix(lerna): --setid in prerelease

Author: Novout

src/commands/log.ts

@@ -2,7 +2,7 @@ import { createChangelog } from '../changelog';
 import { GitNewTag, LogOptions } from '../types';
 import { lastTag, setVersion, setTag, newCommits, isValidTag, pushCommits } from '../git';
 import { success, error, getHeader } from '../console';
-import { existsConfig, getFile, getLernaRoot } from '../utils';
+import { existsConfig, getFile, getLernaRoot, isPrerelease } from '../utils';
 import { getGeneriConfig } from '../generi';
 import { publish } from '../npm';
 import { nextTag } from '../tag';
@@ -46,12 +46,14 @@ export const setup = (tag: GitNewTag, options: LogOptions) => {
 
 	const last = lerna ? 'v' + JSON.parse(lerna).version : lastTag();
 
+	const prerelease = isPrerelease(tag)
+		? options?.git?.prerelease ?? config.prerelease ?? 'beta'
+		: undefined;
+
 	const next = nextTag({
 		last,
 		tag,
-		prerelease: tag.startsWith('pre')
-			? options?.git?.prerelease ?? config.prerelease
-			: undefined,
+		prerelease,
 	});
 
 	if (!next) {
@@ -62,7 +64,7 @@ export const setup = (tag: GitNewTag, options: LogOptions) => {
 	if (config.version) {
 		success(`${last} to ${next} (${tag.toUpperCase()})`);
 
-		setVersion(next, tag);
+		setVersion(next, tag, prerelease);
 	}
 
 	createChangelog(!config.version ? lastTag() : next);

src/git.ts

@@ -1,5 +1,5 @@
 import { success, error, info } from './console';
-import { Commit, GitNewTag } from './types';
+import { Commit, GitNewTag, GitPrerelease } from './types';
 import { getRoot, setFile, getFile, getPackageRoot, getLernaRoot } from './utils';
 import fs from 'fs';
 import path from 'path';
@@ -79,7 +79,11 @@ export const getTagCommit = (commit: Commit) => {
 	return commit.refName.filter((ref) => ref.includes('tag'))[0].replace('tag: ', '');
 };
 
-export const setVersion = (target: string, tag: GitNewTag) => {
+export const setVersion = (
+	target: string,
+	tag: GitNewTag,
+	prerelease?: GitPrerelease
+) => {
 	const normalize = target.substring(1);
 	let lerna = getFile(getLernaRoot());
 
@@ -88,9 +92,12 @@ export const setVersion = (target: string, tag: GitNewTag) => {
 		info(`Executing <lerna version ${tag}> command...`);
 
 		try {
+			const asPrerelease = prerelease ? ['--preid', prerelease] : [];
+
 			execa.sync('lerna', [
 				'version',
 				tag,
+				...asPrerelease,
 				'--no-private',
 				'--no-changelog',
 				'--no-git-tag-version',

src/utils.ts

@@ -3,6 +3,7 @@ import execa from 'execa';
 import path from 'path';
 import { error } from './console';
 import { isCleanChanges } from './git';
+import { GitNewTag } from './types';
 
 export const getRoot = () => {
 	return process.cwd();
@@ -78,3 +79,5 @@ export const isChangesForCommit = (git: boolean) => {
 			'There are existing changes in project for commit. Commit first before using this command.'
 		);
 };
+
+export const isPrerelease = (tag: GitNewTag) => tag.startsWith('pre');