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

package/package.json

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

package/src/publish/index.js

@@ -38,6 +38,7 @@ export const publish = async (options) => {
   /** @type {string[]} */
   const allTags = execSync("git tag").toString().split("\n");
 
+  // TODO: Keep this code for now, but it's not used
   const filteredTags = allTags
     // Ensure tag is valid
     .filter((t) => semver.valid(t))
@@ -56,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
@@ -112,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);
@@ -167,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(
@@ -232,6 +250,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;
@@ -396,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}`);