Merge pull request #45 from intuit/bug

Fix Single new project

Author: hipstersmoothie

src/__tests__/github-release.test.ts

@@ -218,14 +218,18 @@ describe('GithubRelease', () => {
   describe('addToChangelog', async () => {
     test("creates new changelog if one didn't exist", async () => {
       const gh = new GithubRelease();
-      await gh.addToChangelog('# My new Notes', 'v0.0.0');
+      await gh.addToChangelog(
+        '# My new Notes',
+        'klajsdlfk4lj51l43k5hj234l',
+        'v0.0.0'
+      );
 
       expect(writeSpy.mock.calls[0][1].includes(`# My new Notes`)).toBe(true);
     });
 
     test("creates new changelog if one didn't exist", async () => {
       const gh = new GithubRelease();
-      await gh.addToChangelog('# My new Notes', 'v1.0.0', false);
+      await gh.addToChangelog('# My new Notes', 'v1.0.0', 'v1.0.0', false);
 
       expect(writeSpy.mock.calls[0][1].includes(`v1.0.1`)).toBe(true);
     });
@@ -236,7 +240,11 @@ describe('GithubRelease', () => {
       existsSync.mockReturnValueOnce(true);
       readResult = '# My old Notes';
 
-      await gh.addToChangelog('# My new Notes', 'v0.0.0');
+      await gh.addToChangelog(
+        '# My new Notes',
+        'asdfasdlkfjlkj435l2j',
+        'v0.0.0'
+      );
       expect(writeSpy.mock.calls[0][1].includes(readResult)).toBe(true);
     });
 
@@ -247,7 +255,13 @@ describe('GithubRelease', () => {
       existsSync.mockReturnValueOnce(true);
       readResult = '# My old Notes';
 
-      await gh.addToChangelog('# My new Notes', 'v0.0.0', false, message);
+      await gh.addToChangelog(
+        '# My new Notes',
+        'asdklfhlkh24387513',
+        'v0.0.0',
+        false,
+        message
+      );
       expect(execSpy.mock.calls[1][0].includes(message)).toBe(true);
     });
   });

src/github-release.ts

@@ -159,17 +159,28 @@ export default class GithubRelease {
   public async addToChangelog(
     releaseNotes: string,
     lastRelease: string,
+    currentVersion: string,
     noVersionPrefix = true,
     message = 'Update CHANGELOG.md [skip ci]'
   ) {
     this.logger.verbose.info('Adding new changes to changelog.');
 
-    const version = await this.calcNextVersion(lastRelease);
+    let version;
+
+    if (lastRelease.match(/\d+\.\d+\.\d+/)) {
+      version = await this.calcNextVersion(lastRelease);
+    } else {
+      const bump = await this.getSemverBump(lastRelease);
+      version = inc(currentVersion, bump as ReleaseType);
+    }
 
     this.logger.verbose.info('Calculated next version to be:', version);
 
     const date = new Date().toDateString();
-    const prefixed = noVersionPrefix ? version : `v${version}`;
+    const prefixed =
+      noVersionPrefix || (version && version.startsWith('v'))
+        ? version
+        : `v${version}`;
 
     let newChangelog = `# ${prefixed} (${date})\n\n${releaseNotes}`;
 

src/main.ts

@@ -134,6 +134,7 @@ async function makeChangelog(
 
     await githubRelease.addToChangelog(
       releaseNotes,
+      lastRelease,
       currentVersion,
       args.no_version_prefix,
       args.message || undefined
@@ -201,7 +202,7 @@ export async function run(args: ArgsType) {
   let rawConfig = {};
 
   const prefixRelease = (release: string) =>
-    args.no_version_prefix || release.includes('v') ? release : `v${release}`;
+    args.no_version_prefix || release.startsWith('v') ? release : `v${release}`;
 
   if (result && result.config) {
     rawConfig = result.config;