@oneblink/release-cli 2.0.0-beta.1 → 2.0.1

package/dist/bin.js

@@ -4,6 +4,7 @@ import updateNotifier from 'update-notifier';
 import meow from 'meow';
 import enquirer from 'enquirer';
 import startReleaseProcess from './startReleaseProcess.js';
+import semver from 'semver';
 const cli = meow(`
 oneblink-release [next-version] [--no-git] [--name] [--no-name] [--cwd path]
 
@@ -56,7 +57,10 @@ Examples
         },
     },
 });
-async function getReleaseName(name) {
+async function getReleaseName({ name, preRelease, }) {
+    if (preRelease) {
+        return;
+    }
     if (typeof name === 'string' && name) {
         return name;
     }
@@ -88,12 +92,28 @@ async function run() {
                 type: 'input',
                 message: 'Next version? e.g. "1.2.3" or "1.2.3-beta.1"',
                 name: 'nextVersion',
+                required: true,
+                validate: (value) => {
+                    const nextSemverVersion = semver.valid(value);
+                    if (!nextSemverVersion) {
+                        return 'Next version must be valid semver';
+                    }
+                    return true;
+                },
             },
         ]);
         input = nextVersion;
     }
-    const releaseName = await getReleaseName(cli.flags.name);
+    const preReleaseComponents = semver.prerelease(input);
+    const preRelease = typeof preReleaseComponents?.[0] === 'string'
+        ? preReleaseComponents[0]
+        : undefined;
+    const releaseName = await getReleaseName({
+        name: cli.flags.name,
+        preRelease,
+    });
     await startReleaseProcess({
+        preRelease,
         nextVersion: input,
         git: cli.flags.git,
         releaseName,

package/dist/startReleaseProcess.js

@@ -82,9 +82,14 @@ ${dependenciesChangelogHeading}
 ${dependenciesChangelogEntries}
 `;
     });
-    const nextReleaseTitle = `[${nextSemverVersion}] (${new Date()
+    const nextReleaseTitle = `[${nextSemverVersion}] - ${new Date()
         .toISOString()
-        .substring(0, 10)})${releaseName ? ` ${releaseName}` : ''}`;
+        .substring(0, 10)}`;
+    const releaseNameSubtitle = releaseName
+        ? `
+
+##### Release Name: ${releaseName}`
+        : '';
     await wrapWithLoading({
         startText: `Updating CHANGELOG.md with next release (${nextReleaseTitle})`,
         failText: `Failed to update CHANGELOG.md with next release (${nextReleaseTitle})`,
@@ -108,7 +113,7 @@ ${parsedChangelog.versions
                 return `
 ## ${title}
 
-## ${nextReleaseTitle}
+## ${nextReleaseTitle}${releaseNameSubtitle}
 
 ${body}
 
@@ -146,15 +151,14 @@ async function executeCommand(command, args, cwd) {
         spinner.succeed(`Ran "${command} ${args.join(' ')}"`);
     });
 }
-export default async function startReleaseProcess({ nextVersion, cwd, git, releaseName, }) {
+export default async function startReleaseProcess({ nextVersion, preRelease, cwd, git, releaseName, }) {
     const nextSemverVersion = semver.valid(nextVersion);
     if (!nextSemverVersion) {
         throw new Error('Next version is not valid semver');
     }
     const npm = await checkIfNPMPackageVersionShouldBeUpdated(cwd);
-    const preReleaseComponents = semver.prerelease(nextSemverVersion);
-    if (preReleaseComponents && preReleaseComponents[0]) {
-        const text = `Skipping changelog updates for "${preReleaseComponents[0]}" release`;
+    if (preRelease) {
+        const text = `Skipping changelog updates for "${preRelease}" release`;
         ora(text).start().info(text);
     }
     else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oneblink/release-cli",
   "description": "Used internally by OneBlink to release code bases quickly and consistently",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.1",
   "author": "OneBlink <developers@oneblink> (https://github.com/oneblink)",
   "bin": {
     "oneblink-release": "dist/bin.js"