Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve preReleaseBase option for version increment #111

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve preReleaseBase option for version increment #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,24 @@ class ConventionalChangelog extends Plugin {
if (!this.config.isIncrement) {
this.setContext({ version: latestVersion });
} else {
const { increment, isPreRelease, preReleaseId } = this.config.getContext('version');
const version = await this.getRecommendedVersion({ increment, latestVersion, isPreRelease, preReleaseId });
const { increment, isPreRelease, preReleaseId, preReleaseBase } = this.config.getContext('version');
const version = await this.getRecommendedVersion({
increment,
latestVersion,
isPreRelease,
preReleaseId,
preReleaseBase
});
this.setContext({ version });
}
return this.generateChangelog();
}

async getRecommendedVersion({ increment, latestVersion, isPreRelease, preReleaseId }) {
async getRecommendedVersion({ increment, latestVersion, isPreRelease, preReleaseId, preReleaseBase }) {
const { version } = this.getContext();
if (version) return version;
const { options } = this;
this.debug({ increment, latestVersion, isPreRelease, preReleaseId });
this.debug({ increment, latestVersion, isPreRelease, preReleaseId, preReleaseBase });
this.debug('conventionalRecommendedBump', { options });
try {
const bumper = new Bumper();
Expand Down Expand Up @@ -75,7 +81,7 @@ class ConventionalChangelog extends Plugin {

if (isPreRelease) {
if (releaseType && (options.strictSemVer || !semver.prerelease(latestVersion))) {
return semver.inc(latestVersion, `pre${releaseType}`, preReleaseId);
return semver.inc(latestVersion, `pre${releaseType}`, preReleaseId, preReleaseBase);
}

const tags = await getSemverTags({
Expand All @@ -102,15 +108,15 @@ class ConventionalChangelog extends Plugin {
semver[releaseTypeToLastNonPrerelease](lastStableTag) ==
semver[releaseTypeToLastNonPrerelease](latestVersion)
) {
return semver.inc(latestVersion, `pre${releaseTypeToLastNonPrerelease}`, preReleaseId);
return semver.inc(latestVersion, `pre${releaseTypeToLastNonPrerelease}`, preReleaseId, preReleaseBase);
}
}

return semver.inc(latestVersion, 'prerelease', preReleaseId);
return semver.inc(latestVersion, 'prerelease', preReleaseId, preReleaseBase);
}

if (releaseType) {
return semver.inc(latestVersion, releaseType, preReleaseId);
return semver.inc(latestVersion, releaseType, preReleaseId, preReleaseBase);
}

return null;
Expand Down
12 changes: 12 additions & 0 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,18 @@ test('should use provided pre-release id', async t => {
assert.equal(version, '1.1.0-alpha.0');
});

test('should use provided pre-release base', async t => {
setup();
sh.exec(`git tag 1.0.0`);
add('feat', 'baz');

const [config, container] = getOptions({ preset });
config.preRelease = 'alpha';
config.preReleaseBase = '1';
const { version } = await runTasks(config, container);
assert.equal(version, '1.1.0-alpha.1');
});

test('should follow conventional commit strategy with prereleaase', async t => {
setup();
sh.exec(`git tag 1.2.1`);
Expand Down