@oorabona/release-it-preset 0.11.0 → 0.13.0

package/README.md

@@ -661,6 +661,7 @@ Customize behavior with environment variables:
 ### Changelog
 - `CHANGELOG_FILE` - Changelog file path (default: `CHANGELOG.md`)
 - `GIT_CHANGELOG_PATH` - Optional. When set to a repository-relative path (e.g. `packages/tar-xz`), restrict changelog generation to commits touching that path. Useful for monorepo per-package CHANGELOG files. Empty / unset = repository-wide (default).
+- `GIT_CHANGELOG_SINCE` - Optional. Override the `since` baseline for changelog generation (any git ref: SHA, tag, branch). When set, bypasses both the per-package release-commit detection and the `git describe --tags` fallback. Useful for monorepo workspaces with non-standard release commit patterns. Empty / unset = use auto-detection.
 
 ### Git
 - `GIT_COMMIT_MESSAGE` - Commit message template (default: `release: bump v${version}`)

package/dist/scripts/populate-unreleased-changelog.js

@@ -95,7 +95,41 @@ export function parseCommitsWithMultiplePrefixes(gitOutput, repoUrl) {
         }
         if (sha && body) {
             const shortSha = sha.trim().substring(0, 7);
-            const parts = extractConventionalCommitParts(body, shortSha);
+            // Compute the header block: first contiguous run of non-empty lines.
+            // This prevents paragraph-separated footer tokens like "Refs: #42" or
+            // "Co-authored-by: ..." from matching the conventional-commit regex
+            // via the 'gm' flag in extractConventionalCommitParts. AC#5 (consecutive
+            // multi-prefix lines) is preserved because those lines share no blank line.
+            const headerBlock = body.split('\n').reduce((acc, line) => {
+                if (!acc.done) {
+                    if (line.trim() === '') {
+                        acc.done = true;
+                    }
+                    else {
+                        acc.lines.push(line);
+                    }
+                }
+                return acc;
+            }, { lines: [], done: false }).lines.join('\n');
+            const parts = extractConventionalCommitParts(headerBlock, shortSha);
+            // Detect "BREAKING CHANGE:" trailer in the full body (not just header).
+            // This handles the footer-style breaking annotation per Conventional Commits spec.
+            const breakingFooterMatch = /^BREAKING[- ]CHANGE:\s*(.+)/m.exec(body);
+            if (breakingFooterMatch) {
+                if (parts.length > 0) {
+                    // Promote the first emitted part to breaking.
+                    parts[0] = { ...parts[0], breaking: true };
+                }
+                else {
+                    // No leading conventional prefix found; emit a standalone breaking entry.
+                    parts.push({
+                        type: 'misc',
+                        description: breakingFooterMatch[1].trim(),
+                        sha: shortSha,
+                        breaking: true,
+                    });
+                }
+            }
             if (parts.length === 0) {
                 const firstLine = body.split('\n')[0].trim();
                 if (firstLine) {
@@ -167,20 +201,67 @@ export function parseCommitsWithMultiplePrefixes(gitOutput, repoUrl) {
     return sections.length > 0 ? sections.join('\n').trim() : 'No changes yet.';
 }
 /**
- * Main function to populate changelog with dependency injection
+ * Resolve the `since` baseline for changelog generation.
+ *
+ * Priority:
+ * 1. GIT_CHANGELOG_SINCE env var (any git ref — trust the user)
+ * 2. Per-package detection via `chore(<pkg>): release v` commit when GIT_CHANGELOG_PATH is set
+ * 3. Fallback: `git describe --tags --abbrev=0`
  */
-export function populateChangelog(deps) {
-    const changelogPath = deps.getEnv('CHANGELOG_FILE') || 'CHANGELOG.md';
-    deps.log('📝 Populating [Unreleased] section...');
-    let latestTag;
+export function resolveSinceBaseline(deps) {
+    // 1. Explicit override wins
+    const sinceOverride = deps.getEnv('GIT_CHANGELOG_SINCE');
+    if (sinceOverride && sinceOverride.trim()) {
+        deps.log(`ℹ️  Using GIT_CHANGELOG_SINCE override: ${sinceOverride.trim()}`);
+        return sinceOverride.trim();
+    }
+    // 2. Per-package detection: only when running scoped to a subdir
+    const path = deps.getEnv('GIT_CHANGELOG_PATH');
+    if (path && path.trim()) {
+        let pkgName = '';
+        try {
+            const pkgJsonRaw = deps.readFileSync('package.json', 'utf8');
+            const pkgNameFull = JSON.parse(pkgJsonRaw).name;
+            if (pkgNameFull) {
+                pkgName = pkgNameFull.startsWith('@')
+                    ? (pkgNameFull.split('/').pop() ?? '')
+                    : pkgNameFull;
+            }
+        }
+        catch {
+            // package.json missing or unreadable — skip per-package detection
+        }
+        if (pkgName) {
+            try {
+                const sha = deps.execSync(`git log --grep="^chore(${pkgName}): release v" -n 1 --pretty=format:"%H"`, { encoding: 'utf8' }).trim();
+                if (sha) {
+                    deps.log(`ℹ️  Per-package baseline (chore(${pkgName}): release …): ${sha.substring(0, 7)}`);
+                    return sha;
+                }
+            }
+            catch {
+                // fall through to tag fallback
+            }
+        }
+    }
+    // 3. Fallback: existing git describe behavior
     try {
-        latestTag = deps.execSync('git describe --tags --abbrev=0 2>/dev/null', { encoding: 'utf8' }).trim();
-        deps.log(`ℹ️  Latest tag: ${latestTag}`);
+        const tag = deps.execSync('git describe --tags --abbrev=0 2>/dev/null', { encoding: 'utf8' }).trim();
+        deps.log(`ℹ️  Latest tag: ${tag}`);
+        return tag;
     }
     catch {
         deps.log('ℹ️  No tags found, using all commits');
-        latestTag = '';
+        return '';
     }
+}
+/**
+ * Main function to populate changelog with dependency injection
+ */
+export function populateChangelog(deps) {
+    const changelogPath = deps.getEnv('CHANGELOG_FILE') || 'CHANGELOG.md';
+    deps.log('📝 Populating [Unreleased] section...');
+    const since = resolveSinceBaseline(deps);
     const gitChangelogPath = deps.getEnv('GIT_CHANGELOG_PATH');
     let pathFilter = '';
     if (gitChangelogPath !== undefined && gitChangelogPath !== '') {
@@ -192,8 +273,8 @@ export function populateChangelog(deps) {
         }
         pathFilter = ` -- ${gitChangelogPath}`;
     }
-    const gitLogCommand = latestTag
-        ? `git log --pretty=format:"%H|%B|||END|||" ${latestTag}..HEAD${pathFilter}`
+    const gitLogCommand = since
+        ? `git log --pretty=format:"%H|%B|||END|||" ${since}..HEAD${pathFilter}`
         : `git log --pretty=format:"%H|%B|||END|||"${pathFilter}`;
     let gitOutput;
     try {

package/dist/types/populate-unreleased-changelog.d.ts

@@ -50,6 +50,15 @@ export declare function normalizeCommitType(type: string): string | false;
  * Parse git log output and extract all conventional commit parts
  */
 export declare function parseCommitsWithMultiplePrefixes(gitOutput: string, repoUrl: string): string;
+/**
+ * Resolve the `since` baseline for changelog generation.
+ *
+ * Priority:
+ * 1. GIT_CHANGELOG_SINCE env var (any git ref — trust the user)
+ * 2. Per-package detection via `chore(<pkg>): release v` commit when GIT_CHANGELOG_PATH is set
+ * 3. Fallback: `git describe --tags --abbrev=0`
+ */
+export declare function resolveSinceBaseline(deps: PopulateChangelogDeps): string;
 /**
  * Main function to populate changelog with dependency injection
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oorabona/release-it-preset",
-  "version": "0.11.0",
-  "description": "Shared release-it configuration and scripts for the organisation",
+  "version": "0.13.0",
+  "description": "Shared release-it preset with OIDC trusted publishing, smart npm dist-tag selection, and monorepo per-package changelog support",
   "type": "module",
   "keywords": [
     "release-it",
@@ -9,7 +9,16 @@
     "version",
     "changelog",
     "conventional-commits",
-    "keep-a-changelog"
+    "keep-a-changelog",
+    "monorepo",
+    "npm-publish",
+    "provenance",
+    "oidc",
+    "trusted-publishing",
+    "github-actions",
+    "automation",
+    "typescript",
+    "semver"
   ],
   "author": "Olivier Orabona",
   "license": "MIT",