@edifice.io/cli 1.6.0-develop-b2school.7 → 1.6.0-develop-docker.0

package/package.json

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

package/src/publish/index.js

@@ -23,6 +23,8 @@ import {
 export const publish = async (options) => {
   const { branchConfigs, packages, rootDir, branch, tag, ghToken } = options;
 
+  console.log({ branchConfigs, packages, rootDir, branch, tag, ghToken });
+
   const branchName = /** @type {string} */ (branch ?? currentGitBranch());
   const isMainBranch = branchName === "main";
   const npmTag = isMainBranch ? "latest" : branchName;
@@ -38,15 +40,23 @@ export const publish = async (options) => {
   /** @type {string[]} */
   const allTags = execSync("git tag").toString().split("\n");
 
-  const filteredTags = allTags
-    // Ensure tag is valid
-    .filter((t) => semver.valid(t))
+  const semverTags = allTags.filter((t) => semver.valid(t)).reverse();
+
+  const filteredTags = semverTags
     // 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) {
+        // If no tags exist for this prerelease branch, use main branch tags
+        const branchTags = semverTags.filter((t) => {
+          const tagPrerelease = semver.prerelease(t)?.[0];
+          return tagPrerelease === branchName;
+        });
+        if (branchTags.length === 0) {
+          return !isPrereleaseTag; // Use main branch tags
+        }
         return isPrereleaseTag && prereleaseBranch === branchName;
       }
       // For main branch, exclude all prereleases
@@ -187,11 +197,17 @@ export const publish = async (options) => {
     recommendedReleaseLevel = 0;
   }
 
-  const releaseType = branchConfig.prerelease
-    ? "prerelease"
-    : /** @type {const} */ ({ 0: "patch", 1: "minor", 2: "major" })[
-        recommendedReleaseLevel
-      ];
+  // const releaseType = branchConfig.prerelease
+  //   ? "prerelease"
+  //   : /** @type {const} */ ({ 0: "patch", 1: "minor", 2: "major" })[
+  //       recommendedReleaseLevel
+  //     ];
+
+  const releaseType = /** @type {const} */ ({
+    0: "patch",
+    1: "minor",
+    2: "major",
+  })[recommendedReleaseLevel];
 
   if (!releaseType) {
     throw new Error(`Invalid release level: ${recommendedReleaseLevel}`);
@@ -199,7 +215,11 @@ export const publish = async (options) => {
 
   const version = tag
     ? semver.parse(tag)?.version
-    : semver.inc(latestTag, releaseType, npmTag);
+    : semver.inc(
+        latestTag,
+        branchConfig.prerelease ? `pre${releaseType}` : releaseType,
+        npmTag,
+      );
 
   if (!version) {
     throw new Error(
@@ -232,6 +252,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;