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

package/package.json

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

package/src/publish/index.js

@@ -44,7 +44,13 @@ 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;
-      return branchConfig.prerelease ? isPrereleaseTag : !isPrereleaseTag;
+      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;
     })
     // sort by latest
     // @ts-ignore
@@ -99,6 +105,7 @@ 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);
 
@@ -155,7 +162,6 @@ export const publish = async (options) => {
           RELEASE_ALL = true;
         }
       }
-
       return releaseLevel;
     },
     -1,
@@ -226,6 +232,8 @@ export const publish = async (options) => {
         const changed = changedFiles.some(
           (file) =>
             file.startsWith(path.join(pkg.packageDir, "src")) ||
+            // check if any files in the assets directory were modified
+            file.startsWith(path.join(pkg.packageDir, "assets")) ||
             file.startsWith(path.join(pkg.packageDir, "package.json")),
         );
         return changed;
@@ -391,7 +399,6 @@ 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"))
@@ -402,12 +409,12 @@ export const publish = async (options) => {
       .map((pkg) => path.resolve(rootDir, pkg.packageDir, "package.json"))
       .join(" ")}`,
   );
-  execSync(`git commit -m "${releaseCommitMsg(version)}" --allow-empty`);
+  execSync(`git commit -m "${releaseCommitMsg(version)}" --allow-empty -n`);
   console.info("  Committed Changes.");
 
   console.info();
   console.info("Pushing changes...");
-  execSync("git push");
+  execSync(`git push origin ${currentGitBranch()}`);
   console.info("  Changes pushed.");
 
   console.info();