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

package/package.json

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

package/src/publish/index.js

@@ -2,7 +2,6 @@
 // Originally ported to TS from https://github.com/remix-run/react-router/tree/main/scripts/{version,publish}.js
 
 import { parse as parseCommit } from "@commitlint/parse";
-import currentGitBranch from "current-git-branch";
 import { execSync } from "node:child_process";
 import path from "node:path";
 import * as semver from "semver";
@@ -23,7 +22,9 @@ import {
 export const publish = async (options) => {
   const { branchConfigs, packages, rootDir, branch, tag, ghToken } = options;
 
-  const branchName = /** @type {string} */ (branch ?? currentGitBranch());
+  console.log({ branch, ghToken });
+
+  const branchName = /** @type {string} */ (branch);
   const isMainBranch = branchName === "main";
   const npmTag = isMainBranch ? "latest" : branchName;
 
@@ -38,51 +39,21 @@ 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))
-    // Filter tags based on whether the branch is a release or pre-release
+    // Only include non-prerelease tags from main branch
     .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;
+      // Exclude any prerelease tags
+      return semver.prerelease(t) === null;
     })
     // sort by latest
     // @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
@@ -217,7 +188,9 @@ export const publish = async (options) => {
 
   const version = tag
     ? semver.parse(tag)?.version
-    : semver.inc(latestTag, releaseType, npmTag);
+    : branchConfig.prerelease
+      ? `${semver.inc(latestTag, releaseType, npmTag, false)}.${Date.now()}`
+      : semver.inc(latestTag, releaseType, npmTag);
 
   if (!version) {
     throw new Error(
@@ -288,6 +261,10 @@ export const publish = async (options) => {
   const changelogCommitsMd = await Promise.all(
     Object.entries(
       commitsSinceLatestTag.reduce((prev, curr) => {
+        // Only include fix, feat, and chore commits
+        if (!["docs", "fix", "feat", "chore"].includes(curr.type)) {
+          return prev;
+        }
         return {
           ...prev,
           [curr.type]: [...(prev[curr.type] ?? []), curr],
@@ -295,20 +272,7 @@ export const publish = async (options) => {
       }, /** @type {Record<string, import('./index').Commit[]>} */ ({})),
     )
       .sort(
-        getSorterFn(([type]) =>
-          [
-            "other",
-            "examples",
-            "docs",
-            "ci",
-            "test",
-            "chore",
-            "refactor",
-            "perf",
-            "fix",
-            "feat",
-          ].indexOf(type),
-        ),
+        getSorterFn(([type]) => ["docs", "chore", "fix", "feat"].indexOf(type)),
       )
       .reverse()
       .map(async ([type, commits]) => {
@@ -352,7 +316,15 @@ export const publish = async (options) => {
   ).then((groups) => {
     return groups
       .map(([type, commits]) => {
-        return [`### ${capitalize(type)}`, commits.join("\n")].join("\n\n");
+        const typeTitle =
+          {
+            fix: "Bug fixes",
+            feat: "Features",
+            chore: "Chores",
+            docs: "Documentation",
+          }[type] || capitalize(type);
+
+        return [`### ${typeTitle}`, commits.join("\n")].join("\n\n");
       })
       .join("\n\n");
   });
@@ -400,11 +372,11 @@ export const publish = async (options) => {
     );
   }
 
-  console.info();
-  console.info(`Publishing all packages to npm with tag "${npmTag}"`);
+  /* console.info();
+  console.info(`Publishing all packages to npm with tag "${npmTag}"`); */
 
   // Publish each package
-  for (const pkg of changedPackages) {
+  /* for (const pkg of changedPackages) {
     const packageDir = path.join(rootDir, pkg.packageDir);
 
     const cmd = `cd ${packageDir} && pnpm publish --tag ${npmTag} --access=public --no-git-checks`;
@@ -413,59 +385,70 @@ export const publish = async (options) => {
       // @ts-ignore
       stdio: [process.stdin, process.stdout, process.stderr],
     });
-  }
+  } */
 
   console.info();
-  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("  Reset changes.");
+  console.info("Committing changes...");
 
-  /* console.info();
-  console.info("Pushing changes...");
-  execSync(`git push origin ${currentGitBranch()}`);
-  console.info("  Changes pushed."); */
+  // Split the git operations into smaller chunks and add maxBuffer option
+  try {
+    execSync(`git checkout --track origin/${branch}`);
+    execSync("git config user.name 'jenkinsEdificePublic'");
+    execSync("git config user.email 'sre@edifice.io'");
 
-  /**
-   * 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}`);
+    // Add files in smaller batches if needed
+    execSync("git add -A", { maxBuffer: 1024 * 1024 * 10 }); // 10MB buffer
 
-  console.info();
-  console.info("Pushing tags...");
-  execSync("git push --tags");
-  console.info("  Tags pushed.");
+    // Separate commit command
+    execSync(`git commit -m "${releaseCommitMsg(version)}" -n`, {
+      maxBuffer: 1024 * 1024 * 10,
+    });
+
+    console.info("  Committed Changes.");
 
-  if (ghToken && isMainBranch) {
     console.info();
-    console.info("Creating github release...");
-
-    // Stringify the markdown to escape any quotes
-    execSync(
-      `gh release create v${version} ${
-        branchConfig.prerelease ? "--prerelease" : ""
-      } --notes '${changelogMd.replace(/'/g, '"')}'`,
-      { env: { ...process.env, GH_TOKEN: ghToken } },
-    );
-    console.info("  Github release created.");
-  }
+    console.info("Pushing changes...");
 
-  console.info();
-  console.info("All done!");
+    // Push with increased buffer
+    execSync(`git push`, {
+      maxBuffer: 1024 * 1024 * 10,
+    });
+
+    console.info("  Changes pushed.");
+
+    console.info();
+    console.info(`Creating new git tag v${version}`);
+    /**
+     * Create a new git tag for the release.
+     */
+    execSync(`git tag -a -m "v${version}" v${version}`);
+
+    console.info();
+    console.info("Pushing tags...");
+    /**
+     * Push the tags to the main branch.
+     */
+    execSync("git push --tags");
+    console.info("  Tags pushed.");
+
+    if (ghToken && isMainBranch) {
+      console.info();
+      console.info("Creating github release...");
+
+      // Stringify the markdown to escape any quotes
+      execSync(
+        `gh release create v${version} ${
+          branchConfig.prerelease ? "--prerelease" : ""
+        } --notes '${changelogMd.replace(/'/g, '"')}'`,
+        { env: { ...process.env, GH_TOKEN: ghToken } },
+      );
+      console.info("  Github release created.");
+    }
+
+    console.info();
+    console.info("All done!");
+  } catch (error) {
+    console.error("Error during git operations:", error);
+    throw error;
+  }
 };