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

package/package.json

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

package/src/publish/index.js

@@ -23,8 +23,6 @@ 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;
@@ -40,23 +38,16 @@ export const publish = async (options) => {
   /** @type {string[]} */
   const allTags = execSync("git tag").toString().split("\n");
 
-  const semverTags = allTags.filter((t) => semver.valid(t)).reverse();
-
-  const filteredTags = semverTags
+  // TODO: Keep this code for now, but it's not used
+  const filteredTags = allTags
+    // Ensure tag is valid
+    .filter((t) => semver.valid(t))
     // 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
@@ -66,8 +57,32 @@ export const publish = async (options) => {
     // @ts-ignore
     .sort(semver.compare);
 
+  /* const filteredTags = allTags
+    // Ensure tag is valid
+    .filter((t) => semver.valid(t))
+    // 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;
+    })
+    // sort by latest
+    // @ts-ignore
+    .sort(semver.compare); */
+
   // Get the latest tag
   let latestTag = filteredTags.at(-1);
+
+  // TODO: Keep this code for now, but it's not used
+  /* if (branchConfig.prerelease) {
+    const mainTags = execSync("git tag --merged main").toString().split("\n");
+    const validMainTags = mainTags
+      .filter((t) => semver.valid(t))
+      .sort((a, b) => semver.compare(a, b));
+
+    latestTag = validMainTags.at(-1) || latestTag; // Use the latest tag from main if available
+  } */
+
+  // console.log({ filteredTags: filteredTags.reverse() });
   let rangeFrom = latestTag;
 
   // If RELEASE_ALL is set via a commit subject or body, all packages will be
@@ -122,10 +137,10 @@ export const publish = async (options) => {
     return !exclude;
   });
 
-  //   /**
-  //    * Get the commits since the latest tag
-  //    * @type {import('./index.js').Commit[]}
-  //    */
+  /**
+   * Get the commits since the latest tag
+   * @type {import('./index.js').Commit[]}
+   */
   const commitsSinceLatestTag = await Promise.all(
     rawCommitsLog.map(async (c) => {
       const parsed = await parseCommit(c.message);
@@ -177,13 +192,6 @@ export const publish = async (options) => {
     -1,
   );
 
-  // If there is a breaking change and no manual tag is set, do not release
-  /* if (recommendedReleaseLevel === 2 && !tag) {
-    throw new Error(
-      'Major versions releases must be tagged and released manually.'
-    );
-  } */
-
   // If no release is semantically necessary and no manual tag is set, do not release
   if (recommendedReleaseLevel === -1 && !tag) {
     console.info(
@@ -197,17 +205,11 @@ export const publish = async (options) => {
     recommendedReleaseLevel = 0;
   }
 
-  // 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];
+  const releaseType = branchConfig.prerelease
+    ? "prerelease"
+    : /** @type {const} */ ({ 0: "patch", 1: "minor", 2: "major" })[
+        recommendedReleaseLevel
+      ];
 
   if (!releaseType) {
     throw new Error(`Invalid release level: ${recommendedReleaseLevel}`);
@@ -215,11 +217,7 @@ export const publish = async (options) => {
 
   const version = tag
     ? semver.parse(tag)?.version
-    : semver.inc(
-        latestTag,
-        branchConfig.prerelease ? `pre${releaseType}` : releaseType,
-        npmTag,
-      );
+    : semver.inc(latestTag, releaseType, npmTag);
 
   if (!version) {
     throw new Error(
@@ -418,25 +416,33 @@ export const publish = async (options) => {
   }
 
   console.info();
-  console.info("Committing changes...");
-  execSync(
+  console.info("Resetting changes...");
+  /* execSync(
     `git add -A && git reset -- ${changedPackages
       .map((pkg) => path.resolve(rootDir, pkg.packageDir, "package.json"))
       .join(" ")}`,
+  ); */
+  execSync(
+    `git reset -- ${changedPackages
+      .map((pkg) => path.resolve(rootDir, pkg.packageDir, "package.json"))
+      .join(" ")}`,
   );
   execSync(
     `git checkout -- ${changedPackages
       .map((pkg) => path.resolve(rootDir, pkg.packageDir, "package.json"))
       .join(" ")}`,
   );
-  execSync(`git commit -m "${releaseCommitMsg(version)}" --allow-empty -n`);
-  console.info("  Committed Changes.");
+  // execSync(`git commit -m "${releaseCommitMsg(version)}" --allow-empty -n`);
+  console.info("  Reset changes.");
 
-  console.info();
+  /* console.info();
   console.info("Pushing changes...");
   execSync(`git push origin ${currentGitBranch()}`);
-  console.info("  Changes pushed.");
+  console.info("  Changes pushed."); */
 
+  /**
+   * We tag the latest commit as we want to keep the history clean without any release commits
+   */
   console.info();
   console.info(`Creating new git tag v${version}`);
   execSync(`git tag -a -m "v${version}" v${version}`);