@thisismanta/semantic-version 2.0.0-7 → 2.0.0-9

package/lib/auto-npm-version.js

@@ -37,7 +37,7 @@ async function main() {
         JSON.parse(await run('npm pkg get version')));
     (0, debug_1.debug)('lastVersion »', JSON.stringify(lastVersion));
     if (!lastVersion) {
-        throw new Error('Expect to have a valid "version" field in package.json.');
+        throw new Error('Could not find last version.');
     }
     const commits = (await run(`git log v${lastVersion}..HEAD --format=%H%s`))
         .split('\n')
@@ -48,7 +48,7 @@ async function main() {
     }))
         .filter(({ message }) => semver_1.default.valid(message) === null)
         .map(({ hash, message }) => {
-        const { type, breaking, subject } = (0, index_1.checkConventionalMessage)(message, { debug: debug_1.debug });
+        const { type, breaking, subject } = (0, index_1.checkConventionalMessage)(message, { debug: () => { } });
         return {
             hash,
             type,
@@ -75,13 +75,13 @@ async function main() {
         console.log('Exited without releasing a new version');
         return;
     }
-    const nextVersion = await run(`npm version --json --no-commit-hooks ${releaseType}`);
-    (0, debug_1.debug)('nextVersion »', nextVersion);
-    console.log(`Created version ${releaseType}`);
-    await run(`git push --follow-tags origin master`);
+    const nextVersion = semver_1.default.valid(await run(`npm version --json --no-commit-hooks ${releaseType}`));
+    (0, debug_1.debug)('nextVersion »', JSON.stringify(nextVersion));
+    console.log(`Created tag ${releaseType}`);
+    await run(`git push --follow-tags origin`);
     console.log(`Pushed Git tags`);
-    if (semver_1.default.valid(nextVersion) && process.env.GITHUB_TOKEN) {
-        const commitGroups = {
+    if (nextVersion && process.env.GITHUB_TOKEN) {
+        const groups = {
             'BREAKING CHANGES': [],
             'Features': [],
             'Bug Fixes': [],
@@ -89,19 +89,19 @@ async function main() {
         };
         for (const commit of commits) {
             if (commit.breaking) {
-                commitGroups['BREAKING CHANGES'].push(commit);
+                groups['BREAKING CHANGES'].push(commit);
             }
             else if (commit.type === 'feat') {
-                commitGroups['Features'].push(commit);
+                groups['Features'].push(commit);
             }
             else if (commit.type === 'bug') {
-                commitGroups['Bug Fixes'].push(commit);
+                groups['Bug Fixes'].push(commit);
             }
             else {
-                commitGroups['Others'].push(commit);
+                groups['Others'].push(commit);
             }
         }
-        const releaseNote = Object.entries(commitGroups)
+        const releaseNote = Object.entries(groups)
             .filter(([title, commits]) => commits.length > 0)
             .map(([title, commits]) => `### ${title}\n\n` +
             commits.map(({ subject, hash }) => `- ${subject} (${hash})`).join('\n'))
@@ -111,8 +111,9 @@ async function main() {
         // See https://octokit.github.io/rest.js/v19#repos-create-release
         const releaseRespond = await octokit.rest.repos.createRelease({
             ...github.context.repo,
-            tag_name: nextVersion,
+            tag_name: 'v' + nextVersion,
             body: releaseNote,
+            make_latest: true, // TODO: compare with the latest release
         });
         (0, debug_1.debug)('releaseRespond »', JSON.stringify(releaseRespond, null, 2));
         console.log('Created a new release on GitHub');

package/lib/index.js

@@ -9,7 +9,7 @@ function checkConventionalMessage(message, { debug }) {
     debug('type »', type);
     debug('scope »', scope);
     debug('breaking »', breaking);
-    debug('subject »', subject);
+    debug('subject »', subject?.trim());
     const errors = [
         !type &&
             'The pull request title must match the pattern of "<type>[!]: <subject>" which is a reduced set of https://www.conventionalcommits.org/en/v1.0.0/',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@thisismanta/semantic-version",
-	"version": "2.0.0-7",
+	"version": "2.0.0-9",
 	"author": "Anantachai Saothong <thisismanta@gmail.com>",
 	"license": "ISC",
 	"engines": {