fix: Release workflow to allow canary releases on develop branch

Author: Horia Iacos

scripts/release

@@ -191,7 +191,7 @@ const build = () => {
  */
 const test = () => {
   const workers = os.cpus().length || 1;
-  log(chalk.magenta(`--- STEP 4: TEST ---`));
+  log(chalk.magenta(`--- STEP 5: TEST ---`));
   runCmd(`${binary('jest')} -w ${workers}`);
 };
 
@@ -208,16 +208,23 @@ const test = () => {
  * - If the `argv.loglevel` flag is provided, the specified log level will be included in the publishing command.
  */
 const release = () => {
-  log(chalk.magenta('--- STEP 5: VERSION PACKAGES ---'));
+  if (argv.next) {
+    log(chalk.magenta('--- STEP 6: NEXT/CANARY RELEASE ---'));
+    let releaseCmd = 'npx lerna publish --canary --preid next --dist-tag next --include-merged-tags --yes';
+    if (argv.loglevel) releaseCmd += ` --loglevel ${argv.loglevel}`;
+    runCmd(releaseCmd);
+    return;
+  }
+
+  log(chalk.magenta('--- STEP 6: VERSION PACKAGES ---'));
   runCmd('npx lerna version --conventional-commits --yes');
 
-  log(chalk.magenta('--- STEP 6: PUBLISH PACKAGES ---'));
+  log(chalk.magenta('--- STEP 7: PUBLISH PACKAGES ---'));
   let releaseCmd = 'npx lerna publish from-git --yes';
-  if (argv.next) releaseCmd += ' --canary --preid next --dist-tag next';
   if (argv.loglevel) releaseCmd += ` --loglevel ${argv.loglevel}`;
   runCmd(releaseCmd);
 
-  log(chalk.magenta('--- STEP 7: PUSH TAGS ---'));
+  log(chalk.magenta('--- STEP 8: PUSH TAGS ---'));
   runCmd(`git push origin ${getCurrentBranch()} --follow-tags`);
 };