@vc-shell/release-config 1.1.97 → 1.1.98-rc.0

package/dist/release-config.js

@@ -1,98 +1,105 @@
-import u from "prompts";
-import { inc as y, valid as S, parse as R } from "semver";
-import { readFileSync as C, writeFileSync as D } from "node:fs";
-import k from "node:path";
-import s from "chalk";
-import I from "mri";
-import { argv as M } from "node:process";
-import { sync as U } from "cross-spawn";
-const e = I(M.slice(2)), b = !!e.dry;
-b && (console.log(s.inverse(s.yellow(" DRY RUN "))), console.log());
-function w(t) {
-  const n = k.resolve(t), l = k.resolve(n, "package.json");
-  return { pkg: JSON.parse(C(l, "utf-8")), pkgDir: n, pkgPath: l };
+import v from "prompts";
+import { parse as P, valid as V } from "semver";
+import { readFileSync as b, writeFileSync as k, existsSync as S } from "node:fs";
+import C from "node:path";
+import n from "chalk";
+import T from "mri";
+import { argv as j } from "node:process";
+import { sync as y } from "cross-spawn";
+const r = T(j.slice(2)), R = !!r.dry;
+R && (console.log(n.inverse(n.yellow(" DRY RUN "))), console.log());
+function w(a) {
+  const g = C.resolve(a), f = C.resolve(g, "package.json");
+  return { pkg: JSON.parse(b(f, "utf-8")), pkgDir: g, pkgPath: f };
 }
-async function T(t, n) {
-  if (b) {
-    console.log(s.blue(`[dryrun] Writing package.json to ${t}`));
+async function G(a, g) {
+  if (R) {
+    console.log(n.blue(`[dryrun] Writing package.json to ${a}`));
     return;
   }
-  D(t, JSON.stringify(n, null, 2) + `
+  k(a, JSON.stringify(g, null, 2) + `
 `, "utf-8");
 }
-async function P(t, n, l) {
-  return U(t, n, { stdio: "inherit", ...l });
-}
-async function A(t, n, l) {
-  return console.log(s.blue(`[dryrun] ${t} ${n.join(" ")}`), l || "");
-}
-const f = b ? A : P;
-function d(t) {
-  return console.log(s.cyan(t));
-}
-function E(t) {
-  function n(r, o) {
-    if (r === "prerelease" && o === "alpha") {
-      if (t.includes("-alpha")) {
-        const [h, p] = t.split("-alpha."), $ = parseInt(p) + 1;
-        return `${h}-alpha.${$}`;
-      }
-      return `${y(t, "patch")}-alpha.0`;
-    }
-    return y(t, r);
-  }
-  return [
-    {
-      title: "next",
-      value: n("patch")
-    },
-    {
-      title: "alpha",
-      value: n("prerelease", "alpha")
-    },
-    {
-      title: "minor",
-      value: n("minor")
-    },
-    {
-      title: "major",
-      value: n("major")
-    },
-    {
-      value: "custom",
-      title: "custom"
-    }
-  ].map((r) => (r.title = `${r.title} (${r.value})`, r));
-}
-const W = async ({
-  packages: t,
-  bumpVersion: n,
-  generateChangelog: l,
-  toTag: r
+const M = async ({
+  packages: a,
+  bumpVersion: g,
+  generateChangelog: f,
+  toTag: t,
+  customHooks: u
 }) => {
-  let o;
-  if (t.length === 0)
+  if (a.length === 0)
     throw new Error("No packages to release");
-  const { pkg: v } = w(t[0]);
-  if (!o) {
-    const { release: a } = await u({
+  const c = !!r.dry;
+  c && console.log(n.yellow(`
+⚠️  DRY RUN MODE - No git operations will be performed
+`));
+  const { releaseType: d } = await v({
+    type: "select",
+    name: "releaseType",
+    message: "Select release type",
+    choices: [
+      { title: "Automatic (based on commits)", value: "auto" },
+      { title: "Prerelease (alpha/beta/rc)", value: "prerelease" },
+      { title: "Graduate prerelease to stable", value: "graduate" },
+      { title: "Custom version", value: "custom" }
+    ]
+  });
+  if (!d) {
+    console.log(n.yellow(`
+Release cancelled
+`));
+    return;
+  }
+  const l = ["lerna", "version", "--conventional-commits"];
+  if (d === "prerelease") {
+    const { pkg: p } = w(a[0]), o = P(p.version), e = o && o.prerelease.length > 0, s = e ? o.prerelease[0] : null, { preid: i } = await v({
       type: "select",
-      name: "release",
-      message: "Select release type",
-      choices: E(v.version)
+      name: "preid",
+      message: "Select prerelease identifier",
+      choices: [
+        {
+          title: e && s === "alpha" ? "alpha (continue)" : "alpha",
+          value: "alpha"
+        },
+        {
+          title: e && s === "beta" ? "beta (continue)" : "beta",
+          value: "beta"
+        },
+        { title: e && s === "rc" ? "rc (continue)" : "rc", value: "rc" }
+      ]
     });
-    a === "custom" ? o = (await u({
+    if (!i) {
+      console.log(n.yellow(`
+Release cancelled
+`));
+      return;
+    }
+    e && s === i ? l.push("prerelease") : l.push("prerelease", "--preid", i), r.tag || (r.tag = i);
+  } else if (d === "graduate")
+    l.push("--conventional-graduate");
+  else if (d === "custom") {
+    const { pkg: p } = w(a[0]), { customVersion: o } = await v({
       type: "text",
-      name: "version",
-      message: "Input custom version",
-      initial: v.version
-    })).version : o = a;
+      name: "customVersion",
+      message: "Enter custom version",
+      initial: p.version,
+      validate: (s) => V(s) ? !0 : "Invalid semver version"
+    });
+    if (!o) {
+      console.log(n.yellow(`
+Release cancelled
+`));
+      return;
+    }
+    l.push(o);
+    const e = P(o);
+    if (e && e.prerelease.length > 0 && !r.tag) {
+      const s = e.prerelease[0];
+      typeof s == "string" && (r.tag = s);
+    }
   }
-  if (!S(o))
-    throw new Error(`invalid target version: ${o}`);
-  const h = o.match(/-([a-zA-Z]+)(?:\.(\d+))?$/);
-  if (h && !e.tag && (e.tag = h[1]), !e.tag) {
-    const { npmTag: a } = await u({
+  if (!r.tag) {
+    const { npmTag: p } = await v({
       type: "select",
       name: "npmTag",
       message: "Select npm distribution tag",
@@ -104,59 +111,172 @@ const W = async ({
         { title: "custom", value: "custom" }
       ]
     });
-    if (a === "custom") {
-      const g = await u({
+    if (p === "custom") {
+      const o = await v({
         type: "text",
         name: "customTag",
         message: "Input custom npm tag",
         initial: "latest"
       });
-      e.tag = g.customTag;
-    } else a !== "latest" && (e.tag = a);
-  }
-  if (e.tag && e.tag !== "latest") {
-    const a = R(o);
-    if (a && !o.includes(`-${e.tag}`)) {
-      let i, c = 0;
-      a.prerelease.length > 0 ? (a.prerelease.length > 1 && typeof a.prerelease[1] == "number" && (c = a.prerelease[1]), i = `${`${a.major}.${a.minor}.${a.patch}`}-${e.tag}`) : i = `${y(o, "minor")}-${e.tag}`;
-      const { usePreNum: m } = await u({
-        type: "confirm",
-        name: "usePreNum",
-        message: `Add prerelease number to version? (e.g. ${i}.${c})`,
-        initial: !0
-      });
-      m && (i = `${i}.${c}`);
-    }
+      r.tag = o.customTag;
+    } else p !== "latest" && (r.tag = p);
   }
-  const p = r(o);
-  let $ = `release: ${p}`;
-  e.tag && e.tag !== "latest" && ($ += ` with npm tag ${e.tag}`);
-  const { yes: N } = await u({
+  const { yes: h } = await v({
     type: "confirm",
     name: "yes",
-    message: `Releasing ${s.yellow(p)}${e.tag && e.tag !== "latest" ? ` with npm tag ${s.blue(e.tag)}` : ""} Confirm?`
+    message: `Ready to release${r.tag && r.tag !== "latest" ? ` with npm tag ${n.blue(r.tag)}` : ""}. Continue?`
   });
-  if (!N) return;
-  for (let a = 0; a < t.length; a++) {
-    const g = t[a], { pkg: i } = w(g);
-    d(`
-Updating ${s.green(i.name)} package version to ${s.green(o)}...`), await n(i.name, o);
-    const c = w(g), m = { ...c.pkg };
-    e.tag && e.tag !== "latest" ? (m.npmTag = e.tag, await T(c.pkgPath, m), console.log(`Set npmTag: ${s.blue(e.tag)} to ${s.green(i.name)}`)) : m.npmTag && (delete m.npmTag, await T(c.pkgPath, m), console.log(`Removed npmTag from ${s.green(i.name)} for latest release.`)), d(`
-Generating ${s.green(i.name)} changelog...`), await l(i.name, o, g);
-  }
-  const { stdout: j } = await P("git", ["diff"], { stdio: "pipe" });
-  if (j)
-    d(`
-Committing changes...`), await f("git", ["add", "-A"]), await f("git", ["commit", "-m", $, "--no-verify"]), await f("git", ["tag", p]);
-  else {
-    console.log("No changes to commit.");
+  if (!h) {
+    console.log(n.yellow(`
+Release cancelled
+`));
     return;
   }
-  d(`
-Pushing to GitHub...`), await f("git", ["push", "origin", `refs/tags/${p}`]), await f("git", ["push"]), e.tag && e.tag !== "latest" && console.log(`
-NOTE: This release will be published to npm with tag ${s.blue(e.tag)}`), console.log();
+  c ? l.push("--no-git-tag-version", "--no-push") : l.push("--no-push"), console.log(n.cyan(`
+Running: npx ${l.join(" ")}
+`));
+  const m = y("npx", l, { stdio: "inherit" });
+  if (m.status !== 0 && (console.error(n.red(`
+❌ Release process failed
+`)), process.exit(m.status || 1)), await E(a), u) {
+    console.log(n.cyan(`
+Running post-version hooks...
+`));
+    const { pkg: p } = w(a[0] === "." ? a[1] : a[0]);
+    await u(p.version);
+  }
+  if (await O(a), await H(a), await $(a), !c && y("git", ["status", "--porcelain"], { stdio: "pipe" }).stdout?.toString().trim()) {
+    const e = y("git", ["describe", "--tags", "--abbrev=0"], { stdio: "pipe" }).stdout?.toString().trim() || "HEAD";
+    y("git", ["add", "-A"], { stdio: "inherit" }), y("git", ["commit", "--amend", "--no-edit", "--no-verify"], { stdio: "inherit" }), y("git", ["tag", "-f", e], { stdio: "inherit" }), console.log(n.cyan(`
+Pushing changes to remote...
+`)), y("git", ["push", "origin", "HEAD", "--force-with-lease"], { stdio: "inherit" }), y("git", ["push", "origin", e, "--force"], { stdio: "inherit" }), console.log(n.green(`
+✅ Updated changelogs, package.json, and pushed to remote
+`));
+  }
+  c ? (console.log(n.yellow(`
+✅ Dry run completed successfully!
+`)), console.log(n.cyan("Changes made:")), console.log(n.cyan("  - Updated package versions")), console.log(n.cyan("  - Generated/updated CHANGELOG.md files")), console.log(n.cyan(`  - Updated npmTag fields in package.json
+`)), console.log(n.yellow("No git operations performed. Review changes with:")), console.log(n.cyan(`  git diff
+`)), console.log(n.yellow("To revert all changes:")), console.log(n.cyan(`  git checkout -- .
+`))) : (console.log(n.green(`
+✅ Release completed successfully!
+`)), r.tag && r.tag !== "latest" && (console.log(n.cyan(`
+ℹ️  Package files updated with npmTag: ${n.blue(r.tag)}`)), console.log(n.cyan(`   GitHub Actions will automatically publish with this tag
+`))));
 };
+async function O(a) {
+  console.log(n.cyan(`
+Enhancing changelogs...
+`));
+  for (const g of a) {
+    if (g === ".") continue;
+    const f = C.join(g, "CHANGELOG.md");
+    if (!S(f)) continue;
+    let t = b(f, "utf-8");
+    t = t.replace(/^# CHANGELOG\s*\n/gm, ""), t = t.replace(/^# Change Log\s*\n/gm, ""), t = t.replace(/^All notable changes to this (project|package) will be documented in this file\.\s*\n/gm, ""), t = t.replace(
+      /^See \[Conventional Commits\]\(https:\/\/conventionalcommits\.org\) for commit guidelines\.\s*\n/gm,
+      ""
+    ), t = t.replace(/\n{3,}/g, `
+
+`), t = t.replace(
+      /^(##\s+\[[^\]]+\][^\n]*\n)\n(##\s+\[|$)/gm,
+      `$1
+**Note:** Version bump only for package
+
+$2`
+    ), t = t.trim() + `
+`, k(f, t, "utf-8");
+  }
+}
+async function E(a) {
+  const g = a.find((d) => d !== ".");
+  if (!g) return;
+  const { pkg: f } = w(g), t = f.version, u = "package.json", c = JSON.parse(b(u, "utf-8"));
+  c.version !== t && (c.version = t, k(u, JSON.stringify(c, null, 2) + `
+`, "utf-8"), console.log(n.gray(`  Updated root package.json version: ${t}`)));
+}
+async function H(a) {
+  console.log(n.cyan(`
+Generating root CHANGELOG with package grouping...
+`));
+  const g = "CHANGELOG.md", f = {
+    framework: "VC-Shell Framework (@vc-shell/framework)",
+    "cli/api-client": "API Client Generator (@vc-shell/api-client-generator)",
+    "cli/create-vc-app": "Create VC App (@vc-shell/create-vc-app)",
+    "configs/release-config": "Release Config (@vc-shell/release-config)",
+    "configs/vite-config": "Vite Config (@vc-shell/config-generator)",
+    "configs/ts-config": "TypeScript Config (@vc-shell/ts-config)"
+  }, t = {}, u = {};
+  for (const l of a) {
+    if (l === ".") continue;
+    const h = C.join(l, "CHANGELOG.md"), m = f[l] || l;
+    if (!S(h)) continue;
+    const o = b(h, "utf-8").split(`
+`);
+    let e = null, s = [];
+    for (const i of o) {
+      const N = i.match(/^##\s+(?:\[)?([\d.a-z-]+)(?:\])?(?:\s+\([^)]+\))?/i);
+      if (N) {
+        if (e && s.length > 0) {
+          const A = s.join(`
+`).trim();
+          t[e] || (t[e] = {}), t[e][m] = A;
+        }
+        e = N[1], s = [], u[e] || (u[e] = i.replace(/^##\s+/, ""));
+      } else e && i.trim() !== "" && !i.startsWith("# CHANGELOG") && !i.startsWith("# Change Log") && !i.startsWith("All notable changes") && !i.startsWith("See [Conventional Commits]") && s.push(i);
+    }
+    if (e && s.length > 0) {
+      const i = s.join(`
+`).trim();
+      t[e] || (t[e] = {}), t[e][m] = i;
+    }
+  }
+  let c = "";
+  const d = Object.keys(t).sort((l, h) => {
+    const m = l.split(/[.-]/).map((o) => isNaN(parseInt(o)) ? o : parseInt(o)), p = h.split(/[.-]/).map((o) => isNaN(parseInt(o)) ? o : parseInt(o));
+    for (let o = 0; o < Math.max(m.length, p.length); o++) {
+      const e = m[o] ?? 0, s = p[o] ?? 0;
+      if (e !== s)
+        return typeof e == "number" && typeof s == "number" ? s - e : String(s).localeCompare(String(e));
+    }
+    return 0;
+  });
+  for (const l of d) {
+    const h = t[l], m = Object.values(h).some((e) => !e || !e.trim() ? !1 : e.replace(/\*\*Note:\*\*\s+Version bump only[^\n]*/gi, "").trim().length > 0), p = u[l] || l;
+    if (c += `## ${p}
+
+`, !m) {
+      c += `**Note:** Version bump only for package
+
+`;
+      continue;
+    }
+    let o = !1;
+    for (const e of a) {
+      if (e === ".") continue;
+      const s = f[e] || e, i = h[s];
+      i && i.trim() && i.replace(/\*\*Note:\*\*\s+Version bump only[^\n]*/gi, "").trim().length > 0 && (o = !0, c += `### ${s}
+
+`, c += `${i}
+
+`);
+    }
+    o || (c += `**Note:** Version bump only for package
+
+`);
+  }
+  c = c.replace(/\n{3,}/g, `
+
+`), k(g, c, "utf-8"), console.log(n.green("  ✓ Generated root CHANGELOG.md with package grouping"));
+}
+async function $(a) {
+  if (r.tag)
+    for (const g of a) {
+      if (g === ".") continue;
+      const { pkg: f, pkgPath: t } = w(g), u = { ...f };
+      r.tag !== "latest" ? (u.npmTag = r.tag, await G(t, u)) : u.npmTag && (delete u.npmTag, await G(t, u));
+    }
+}
 export {
-  W as release
+  M as release
 };

package/dist/release.d.ts

@@ -1,16 +1,28 @@
 /**
- * Release function that prompts the user to select a release type and version, generates changelogs, commits changes, and pushes to GitHub.
+ * Release function that uses Lerna for versioning and changelog generation
  * @param packages - An array of package names to release.
- * @param bumpVersion - A function that takes a package name and version and updates the package.json file with the new version.
+ * @param bumpVersion - A function that takes a package name and version (deprecated, Lerna handles this).
  * @param generateChangelog - A function that generates a changelog for a package with a given version.
  * @param toTag - A function that takes a version and returns a tag name.
+ * @param customHooks - A function that takes a package name, version, and workspace name and returns a void or Promise<void>.
  * @returns void
  * @throws Error if there are no packages to release or if the target version is invalid.
  */
-export declare const release: ({ packages, bumpVersion, generateChangelog, toTag, }: {
+export declare const release: ({ packages, bumpVersion, generateChangelog, toTag, customHooks, }: {
     packages: string[];
-    bumpVersion: (pkgName: string, version: string) => void | Promise<void>;
-    generateChangelog: (pkgName: string, version: string, workspaceName?: string) => void | Promise<void>;
-    toTag: (version: string) => string;
+    /**
+     *
+     * @param pkgName
+     * @param version
+     * @param workspaceName
+     * @returns
+     */
+    customHooks: (version: string) => void | Promise<void>;
+    /** @deprecated Lerna handles version bumping automatically */
+    bumpVersion?: (pkgName: string, version: string) => void | Promise<void>;
+    /** @deprecated Lerna generates changelogs automatically */
+    generateChangelog?: (pkgName: string, version: string, workspaceName?: string) => void | Promise<void>;
+    /** @deprecated Lerna handles version bumping automatically */
+    toTag?: (version: string) => string;
 }) => Promise<void>;
 //# sourceMappingURL=release.d.ts.map

package/dist/release.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AACH,eAAO,MAAM,OAAO,GAAU,sDAK3B;IACD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtG,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CACpC,kBA+KA,CAAC"}
+{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":"AASA;;;;;;;;;GASG;AACH,eAAO,MAAM,OAAO,GAAU,mEAM3B;IACD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB;;;;;;OAMG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,8DAA8D;IAC9D,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzE,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvG,8DAA8D;IAC9D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CACrC,kBAwNA,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/release-config",
-  "version": "1.1.97",
+  "version": "1.1.98-rc.0",
   "type": "module",
   "main": "dist/release-config.js",
   "types": "./dist/index.d.ts",
@@ -13,6 +13,7 @@
   "dependencies": {
     "chalk": "^2.4.2",
     "cross-spawn": "^7.0.3",
+    "lerna": "^9.0.0",
     "mri": "^1.2.0",
     "prompts": "^2.4.2",
     "semver": "^7.5.4",
@@ -22,12 +23,14 @@
     "@types/cross-spawn": "^6.0.6",
     "@types/prompts": "^2.4.7",
     "@types/semver": "^7.5.4",
-    "@vc-shell/ts-config": "^1.1.97",
+    "@vc-shell/ts-config": "1.1.98-rc.0",
     "typescript": "^5.8.3",
     "vite-plugin-dts": "^3.6.4"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
-  }
-}
+  },
+  "npmTag": "rc",
+  "gitHead": "6f0696dfa3fd8d8e3a47eb130bb2a5adda0418ec"
+}