Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 29 additions & 0 deletions packages/core/src/project/monorepo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import type {
} from './monorepo.types.js'
import {
type ProjectOptions,
type ProjectMaintenanceBranch,
type ProjectReleaseOptions,
type ProjectRevertOptions,
Project,
bumpDefaultOptions
Expand Down Expand Up @@ -196,6 +198,33 @@ export abstract class MonorepoProject extends Project {
return this.getIndependentReleaseData()
}

private async getIndependentMaintenanceBranches() {
const branches: ProjectMaintenanceBranch[] = []

for await (const project of this.getProjects()) {
const { manifest } = project
const name = await manifest.getName()
const scope = await this.getScope(name)
const tagPrefix = await this.getTagPrefix(scope)

branches.push(...await project.getMaintenanceBranches({
tagPrefix
}))
}

return branches
}

override async getMaintenanceBranches(options: ProjectReleaseOptions = {}) {
const { mode } = this

if (mode === 'fixed') {
return super.getMaintenanceBranches(options)
}

return this.getIndependentMaintenanceBranches()
}

private async getBumpOptions(
project: Project,
options: MonorepoProjectBumpOptions,
Expand Down
27 changes: 27 additions & 0 deletions packages/core/src/project/packageJson.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,33 @@ describe('core', () => {
expect(release).toEqual([])
})

it('should get maintenance branch refs', async () => {
const { cwd } = await packageJsonProject({
version: '3.0.0'
})
const project = new PackageJsonProject({
path: join(cwd, 'package.json')
})

expect(await project.getMaintenanceBranches()).toEqual([
{
from: 'v2.0.0',
to: 'v2'
}
])
})

it('should not get maintenance branch refs for non-major releases', async () => {
const { cwd } = await packageJsonProject({
version: '2.1.0'
})
const project = new PackageJsonProject({
path: join(cwd, 'package.json')
})

expect(await project.getMaintenanceBranches()).toEqual([])
})

it('should get next version', async () => {
const { cwd } = await packageJsonProject()
const project = new PackageJsonProject({
Expand Down
54 changes: 54 additions & 0 deletions packages/core/src/project/packageJsonMonorepo.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,40 @@ describe('core', () => {
])
})

it('should get maintenance branch refs', async () => {
const { cwd } = await packageJsonIndependentMonorepoProject({
1: {
version: '3.0.0'
},
2: {
version: '3.0.0'
},
3: {
version: '3.0.0'
}
})
const project = new PackageJsonMonorepoProject({
mode: 'independent',
root: cwd,
getProjects
})

expect(await project.getMaintenanceBranches()).toEqual([
{
from: 'subproject-1@2.0.0',
to: 'subproject-1@2'
},
{
from: 'subproject-2@2.0.0',
to: 'subproject-2@2'
},
{
from: 'subproject-3@2.0.0',
to: 'subproject-3@2'
}
])
})

it('should bump version', async () => {
const { cwd } = await forkProject('bump', packageJsonIndependentMonorepoProject())
const project = new PackageJsonMonorepoProject({
Expand Down Expand Up @@ -272,6 +306,26 @@ describe('core', () => {
expect(release).toEqual([])
})

it('should get maintenance branch refs', async () => {
const { cwd } = await packageJsonFixedMonorepoProject({
0: {
version: '3.0.0'
}
})
const project = new PackageJsonMonorepoProject({
mode: 'fixed',
root: cwd,
getProjects
})

expect(await project.getMaintenanceBranches()).toEqual([
{
from: 'v2.0.0',
to: 'v2'
}
])
})

it('should bump version', async () => {
const { cwd } = await forkProject('bump', packageJsonFixedMonorepoProject())
const project = new PackageJsonMonorepoProject({
Expand Down
46 changes: 46 additions & 0 deletions packages/core/src/project/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import type {
ProjectVersionUpdate,
ProjectTagsOptions,
ProjectReleaseOptions,
ProjectMaintenanceBranch,
ProjectPublishOptions,
ProjectRevertOptions
} from './project.types.js'
Expand Down Expand Up @@ -174,6 +175,51 @@ export abstract class Project {
]
}

/**
* Get maintenance branch refs to create after a major version release.
* @param options - The options to use for detecting tags and formatting branches.
* @returns Maintenance branch refs.
*/
async getMaintenanceBranches(options: ProjectReleaseOptions = {}): Promise<ProjectMaintenanceBranch[]> {
const {
gitClient,
manifest
} = this
const { tagPrefix = 'v' } = options
const { projectPath } = manifest
const version = await manifest.getVersion()
const currentVersion = semver.valid(version)

if (!currentVersion) {
return []
}

const [release] = await this.getReleaseData(options)
const previousTag = release?.previousTag || await gitClient.getLastSemverTag({
path: projectPath,
prefix: tagPrefix
})

if (previousTag) {
const previousVersion = semver.valid(
previousTag.startsWith(tagPrefix)
? previousTag.slice(tagPrefix.length)
: previousTag
)

if (previousVersion && semver.major(currentVersion) > semver.major(previousVersion)) {
return [
{
from: previousTag,
to: `${tagPrefix}${semver.major(previousVersion)}`
}
]
}
}

return []
}

/**
* Get the next version for the project.
* @param options - The options to use for getting the next version.
Expand Down
11 changes: 11 additions & 0 deletions packages/core/src/project/project.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,17 @@ export interface ProjectReleaseOptions {
tagPrefix?: string
}

export interface ProjectMaintenanceBranch {
/**
* Source tag to create the branch from.
*/
from: string
/**
* Target branch name to create.
*/
to: string
}

export interface ProjectPublishOptions {
dryRun?: boolean
logger?: ChildLogger
Expand Down
76 changes: 76 additions & 0 deletions packages/core/src/releaser.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import {
it,
expect
} from 'vitest'
import { GitClient } from '@conventional-changelog/git-client'
import { firstFromStream } from '@simple-libs/stream-utils'
import {
createDirectory,
forkProject,
packageJsonProject
} from 'test'
Expand Down Expand Up @@ -72,5 +74,79 @@ describe('core', () => {
expect(project.changedFiles).toEqual([])
expect(project.versionUpdates).toEqual([])
})

it('should create maintenance branches', async () => {
const { cwd } = await forkProject('maintenance-branch', packageJsonProject({
version: '3.0.0'
}))
const remote = await createDirectory('maintenance-branch-remote')
const remoteGit = new GitClient(remote)
const project = new PackageJsonProject({
path: join(cwd, 'package.json')
})
const releaser = new Releaser({
project,
silent: true
})
.maintenanceBranch({
enabled: true
})

await remoteGit.exec('init', '--bare')
await project.gitClient.exec('remote', 'set-url', 'origin', remote)
await releaser.run()

expect(await project.gitClient.verify('refs/heads/v2', true)).not.toBe('')
expect(await project.gitClient.exec('ls-remote', '--heads', 'origin', 'v2')).toContain('refs/heads/v2')
})

it('should skip existing remote maintenance branches', async () => {
const { cwd } = await forkProject('maintenance-branch-remote', packageJsonProject({
version: '3.0.0'
}))
const remote = await createDirectory('maintenance-branch-existing-remote')
const remoteGit = new GitClient(remote)
const project = new PackageJsonProject({
path: join(cwd, 'package.json')
})
const releaser = new Releaser({
project,
silent: true
})
.maintenanceBranch({
enabled: true
})

await remoteGit.exec('init', '--bare')
await project.gitClient.exec('remote', 'set-url', 'origin', remote)
await project.gitClient.exec('branch', '--', 'v2', 'v2.0.0')
await project.gitClient.push('v2', {
verify: false
})
await project.gitClient.deleteBranch('v2')

await releaser.run()

expect(await project.gitClient.verify('refs/heads/v2', true)).toBe('')
expect(await project.gitClient.exec('ls-remote', '--heads', 'origin', 'v2')).toContain('refs/heads/v2')
})

it('should not create maintenance branches by default', async () => {
const { cwd } = await forkProject('maintenance-branch-disabled', packageJsonProject({
version: '3.0.0'
}))
const project = new PackageJsonProject({
path: join(cwd, 'package.json')
})
const releaser = new Releaser({
project,
silent: true
})
.maintenanceBranch()

await releaser.run()

expect(await project.gitClient.verify('refs/heads/v2', true)).toBe('')
})
})
})
Loading