Skip to content

Commit 85ca58e

Browse files
committed
fix(changelog): adjust end-ref to not skip last PR
1 parent 59f8880 commit 85ca58e

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

resources/gen-changelog.ts

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,29 @@ function parseFromRevArg(rawArgs: ReadonlyArray<string>): string | null {
7373
async function genChangeLog(): Promise<string> {
7474
const { version } = packageJSON;
7575
const releaseTag = `v${version}`;
76+
const fromRev = parseFromRevArg(process.argv.slice(2));
7677
const releaseTagExists = git().tagExists(releaseTag);
77-
const tag = releaseTagExists ? null : releaseTag;
78-
let baseRef = parseFromRevArg(process.argv.slice(2));
78+
79+
let tag: string | null;
80+
let baseRef: string;
81+
let endRef: string;
7982
if (releaseTagExists) {
80-
baseRef ??= releaseTag;
81-
} else if (baseRef == null) {
82-
const parentPackageJSON = git().catFile('blob', 'HEAD~1:package.json');
83-
const parentVersion = JSON.parse(parentPackageJSON).version;
84-
baseRef = `v${parentVersion}`;
83+
tag = null;
84+
baseRef = fromRev ?? releaseTag;
85+
endRef = 'HEAD';
86+
} else {
87+
tag = releaseTag;
88+
if (fromRev != null) {
89+
baseRef = fromRev;
90+
} else {
91+
const parentPackageJSON = git().catFile('blob', 'HEAD~1:package.json');
92+
const parentVersion = JSON.parse(parentPackageJSON).version;
93+
baseRef = `v${parentVersion}`;
94+
}
95+
endRef = 'HEAD~1';
8596
}
86-
const commitsRange = releaseTagExists ? `${baseRef}..` : `${baseRef}..HEAD~1`;
97+
98+
const commitsRange = `${baseRef}..${endRef}`;
8799
const commitsList = git().revList('--reverse', commitsRange);
88100

89101
const allPRs = await getPRsInfo(commitsList);

0 commit comments

Comments
 (0)