Fix specifying a custom version via UI (sindresorhus#546)

dopecodez · web-flow · commit 6b68244c0f1b · 2020-07-06T00:19:45.000+08:00
diff --git a/source/ui.js b/source/ui.js
@@ -85,7 +85,7 @@ module.exports = async (options, pkg) => {
 		},
 		{
 			type: 'input',
-			name: 'version',
+			name: 'customVersion',
 			message: 'Version',
 			when: answers => !answers.version,
 			filter: input => version.isValidInput(input) ? version(pkg.version).getNewVersionFrom(input) : input,
@@ -105,7 +105,7 @@ module.exports = async (options, pkg) => {
 			type: 'list',
 			name: 'tag',
 			message: 'How should this pre-release version be tagged in npm?',
-			when: answers => options.runPublish && version.isPrereleaseOrIncrement(answers.version) && !options.tag,
+			when: answers => options.runPublish && (version.isPrereleaseOrIncrement(answers.customVersion) || version.isPrereleaseOrIncrement(answers.version)) && !options.tag,
 			choices: async () => {
 				const existingPrereleaseTags = await prereleaseTags(pkg.name);
 
@@ -121,9 +121,9 @@ module.exports = async (options, pkg) => {
 		},
 		{
 			type: 'input',
-			name: 'tag',
+			name: 'customTag',
 			message: 'Tag',
-			when: answers => options.runPublish && version.isPrereleaseOrIncrement(answers.version) && !options.tag && !answers.tag,
+			when: answers => options.runPublish && (version.isPrereleaseOrIncrement(answers.customVersion) || version.isPrereleaseOrIncrement(answers.version)) && !options.tag && !answers.tag,
 			validate: input => {
 				if (input.length === 0) {
 					return 'Please specify a tag, for example, `next`.';
@@ -193,7 +193,8 @@ module.exports = async (options, pkg) => {
 
 	return {
 		...options,
-		...answers,
+		version: answers.version || answers.customVersion,
+		tag: answers.tag || answers.customTag,
 		confirm: true,
 		repoUrl,
 		releaseNotes
