@edifice.io/cli 1.6.0-develop.10 → 1.6.0-develop.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edifice.io/cli",
-  "version": "1.6.0-develop.10",
+  "version": "1.6.0-develop.8",
   "description": "Edifice Frontend CLI",
   "keywords": [
     "frontend",

package/src/publish/index.js

@@ -44,13 +44,7 @@ export const publish = async (options) => {
     // Filter tags based on whether the branch is a release or pre-release
     .filter((t) => {
       const isPrereleaseTag = semver.prerelease(t) !== null;
-      const prereleaseBranch = semver.prerelease(t)?.[0];
-      // For prerelease branches, only include tags for that branch
-      if (branchConfig.prerelease) {
-        return isPrereleaseTag && prereleaseBranch === branchName;
-      }
-      // For main branch, exclude all prereleases
-      return !isPrereleaseTag;
+      return branchConfig.prerelease ? isPrereleaseTag : !isPrereleaseTag;
     })
     // sort by latest
     // @ts-ignore
@@ -105,7 +99,6 @@ export const publish = async (options) => {
   ).all.filter((c) => {
     const exclude = [
       c.message.startsWith("Merge branch "), // No merge commits
-      c.message.includes("version & publish"), // No version bump commits
       c.message.startsWith(releaseCommitMsg("")), // No example update commits
     ].some(Boolean);
 
@@ -162,6 +155,7 @@ export const publish = async (options) => {
           RELEASE_ALL = true;
         }
       }
+
       return releaseLevel;
     },
     -1,
@@ -397,6 +391,7 @@ export const publish = async (options) => {
 
   console.info();
   console.info("Committing changes...");
+  //execSync(`git add -A && git commit -m "${releaseCommitMsg(version)}"`);
   execSync(
     `git add -A && git reset -- ${changedPackages
       .map((pkg) => path.resolve(rootDir, pkg.packageDir, "package.json"))
@@ -407,12 +402,12 @@ export const publish = async (options) => {
       .map((pkg) => path.resolve(rootDir, pkg.packageDir, "package.json"))
       .join(" ")}`,
   );
-  execSync(`git commit -m "${releaseCommitMsg(version)}" --allow-empty -n`);
+  execSync(`git commit -m "${releaseCommitMsg(version)}" --allow-empty`);
   console.info("  Committed Changes.");
 
   console.info();
   console.info("Pushing changes...");
-  execSync(`git push origin ${currentGitBranch()}`);
+  execSync("git push");
   console.info("  Changes pushed.");
 
   console.info();