Simplify release workflow - remove complex flags

baelter · baelter · commit d352b0588fdb · 2025-09-12T13:48:01.000+02:00
- Remove --update-changelog-only and --get-changelog-content flags
- Simplify version script to just update VERSION and format
- Keep create-tag as simple manual script for changelog + tag creation
- Clean separation: npm version handles commits, create-tag handles tags
diff --git a/package.json b/package.json
@@ -36,13 +36,14 @@
     "test": "vitest run --coverage",
     "test:local": "vitest run --coverage test/test.ts",
     "test-browser": "vitest --config ./vitest.config.browser.ts",
+    "create-tag": "node scripts/release-tag.js",
     "prebuild": "rm -rf dist lib types",
     "build": "tsc && tsc --module commonjs --outDir lib/cjs && tsc --emitDeclarationOnly --removeComments false && rollup -c",
     "postbuild": "echo '{\"type\": \"commonjs\"}' > lib/cjs/package.json",
     "prepare": "npm run build",
     "preversion": "npm run test:local",
-    "version": "sed -i'' \"s/VERSION = .*/VERSION = \\\"$npm_package_version\\\"/\" src/amqp-base-client.ts && npm run format && node scripts/release-tag.js && git add src/amqp-base-client.ts CHANGELOG.md",
-    "postversion": "git push && git push --tags",
+    "version": "sed -i'' \"s/VERSION = .*/VERSION = \\\"$npm_package_version\\\"/\" src/amqp-base-client.ts && npm run format && node scripts/release-tag.js --update-changelog-only && git add src/amqp-base-client.ts CHANGELOG.md",
+    "postversion": "git tag v$npm_package_version -m \"$(node scripts/release-tag.js --get-changelog-content)\" && git push && git push --tags",
     "release": "npm version patch",
     "release:minor": "npm version minor",
     "release:major": "npm version major"
diff --git a/scripts/release-tag.js b/scripts/release-tag.js
@@ -4,11 +4,21 @@ import fs from "fs"
 import { execSync } from "child_process"
 
 function main() {
+  // Check command line flags
+  const updateChangelogOnly = process.argv.includes("--update-changelog-only")
+  const getChangelogContent = process.argv.includes("--get-changelog-content")
+  
   // Read package.json to get current version
   const pkg = JSON.parse(fs.readFileSync("package.json", "utf8"))
   const version = pkg.version
 
-  console.log(`Creating tag for version ${version}...`)
+  if (updateChangelogOnly) {
+    console.log(`Updating changelog for version ${version}...`)
+  } else if (getChangelogContent) {
+    // Just get the changelog content for this version and exit
+  } else {
+    console.log(`Updating changelog and creating tag for version ${version}...`)
+  }
 
   // Read changelog
   let changelog = fs.readFileSync("CHANGELOG.md", "utf8")
@@ -22,7 +32,7 @@ function main() {
   // Check if version already exists in changelog
   if (changelog.includes(newVersionHeader) || changelog.includes(versionHeader)) {
     console.log(`Version ${version} already exists in changelog. Skipping update.`)
-  } else if (changelog.includes(unreleasedHeader)) {
+  } else if (changelog.includes(unreleasedHeader) && !getChangelogContent) {
     console.log("Updating [Unreleased] section to current version...")
     changelog = changelog.replace(unreleasedHeader, newVersionHeader)
 
@@ -36,7 +46,15 @@ function main() {
 
     // Write updated changelog back to file
     fs.writeFileSync("CHANGELOG.md", changelog, "utf8")
-    console.log("✅ Updated CHANGELOG.md")
+
+    // Stage the changelog file for commit
+    execSync("git add CHANGELOG.md", { stdio: "inherit" })
+    console.log("✅ Updated CHANGELOG.md and staged for commit")
+  }
+
+  // If only updating changelog, exit here
+  if (updateChangelogOnly) {
+    return
   }
 
   // Find the section for this version
@@ -54,6 +72,12 @@ function main() {
   // Extract the content for this version
   const content = changelog.substring(startIdx, nextVersionIdx === -1 ? undefined : nextVersionIdx).trim()
 
+  // If only getting changelog content, just output it and exit
+  if (getChangelogContent) {
+    console.log(content)
+    return
+  }
+
   console.log("Changelog content:")
   console.log(content)
   console.log()
