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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [5.2.1-alpha.1](https://github.com/dhis2/cli/compare/v5.2.0...v5.2.1-alpha.1) (2025-11-04)


### Bug Fixes

* update d2 utils release to support both pnpm and yarn ([ec7ff8b](https://github.com/dhis2/cli/commit/ec7ff8b314dafe4d5b18b61b9114a229f71a548f))

# [5.2.0](https://github.com/dhis2/cli/compare/v5.1.0...v5.2.0) (2025-10-30)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "5.2.0",
"version": "5.2.1-alpha.1",
"private": true,
"repository": "https://github.com/dhis2/cli",
"author": "Austin McGee <austin@dhis2.org>",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"engines": {
"node": ">=12"
},
"version": "5.2.0",
"version": "5.2.1-alpha.1",
"main": "src/index.js",
"author": "Austin McGee <austin@dhis2.org>",
"contributors": [
Expand Down
2 changes: 1 addition & 1 deletion packages/cluster/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/cli-cluster",
"version": "5.2.0",
"version": "5.2.1-alpha.1",
"description": "D2 CLI module for managing DHIS2 development clusters",
"main": "src/index.js",
"repository": "https://github.com/dhis2/cli",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/create-app",
"version": "5.2.0",
"version": "5.2.1-alpha.1",
"description": "",
"main": "src/index.js",
"bin": {
Expand Down
9 changes: 4 additions & 5 deletions packages/main/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/cli",
"version": "5.2.0",
"version": "5.2.1-alpha.1",
"description": "A command line interface for DHIS2 development workflows",
"main": "src/index.js",
"author": "Austin McGee <austin@dhis2.org>",
Expand All @@ -12,12 +12,11 @@
"node": ">=12"
},
"dependencies": {
"@dhis2/cli-app": "5.2.0",
"@dhis2/cli-cluster": "5.2.0",
"@dhis2/cli-create": "5.2.0-alpha.14",
"@dhis2/cli-app": "5.2.1-alpha.1",
"@dhis2/cli-cluster": "5.2.1-alpha.1",
"@dhis2/cli-helpers-engine": "^3.2.1",
"@dhis2/cli-style": "^10.7.9",
"@dhis2/cli-utils": "5.2.0",
"@dhis2/cli-utils": "5.2.1-alpha.1",
"cli-table3": "^0.6.0",
"envinfo": "^7.5.0",
"inquirer": "^7.1.0"
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const command = namespace('d2', {

yargs.command(loader('@dhis2/cli-app'))
yargs.command(loader('@dhis2/cli-cluster'))
yargs.command(loader('@dhis2/cli-create'))
yargs.command(loader('@dhis2/cli-style').command)
yargs.command(loader('@dhis2/cli-utils'))
yargs.commandDir('commands')
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"engines": {
"node": ">=12"
},
"version": "5.2.0",
"version": "5.2.1-alpha.1",
"main": "src/index.js",
"author": "Viktor Varland <viktor@dhis2.org>",
"contributors": [
Expand Down
25 changes: 15 additions & 10 deletions packages/utils/src/cmds/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ function publisher(target = '', packages) {

const handler = async ({ publish }) => {
// set up the plugins and filter out any undefined elements

const rootPackageFile = path.join(process.cwd(), 'package.json')
const isPnpm = existsSync(path.join(process.cwd(), 'pnpm-lock.yaml'))
const lockFile = isPnpm ? 'pnpm-lock.yaml' : 'yarn.lock'

const packages = [
rootPackageFile,
...(await getWorkspacePackages(rootPackageFile)),
Expand Down Expand Up @@ -76,7 +78,7 @@ const handler = async ({ publish }) => {
),
packages
.map((pkgJsonPath) =>
path.join(path.dirname(pkgJsonPath), 'pnpm-lock.yaml')
path.join(path.dirname(pkgJsonPath), lockFile)
)
.filter(existsSync)
.map((pkgJsonPath) =>
Expand All @@ -88,13 +90,16 @@ const handler = async ({ publish }) => {
},
]

const updateLockFile = [
'@semantic-release/exec',
{
publishCmd:
'pnpm install --lockfile-only && git commit -am "chore: bump pnpm-lock.yml ${nextRelease.version} [skip ci]" && git push',
},
]
const updateLockFile = isPnpm
? [
'@semantic-release/exec',
{
publishCmd:
'pnpm install --lockfile-only && git commit -am "chore: bump pnpm-lock.yml ${nextRelease.version} [skip ci]" && git push',
},
]
: undefined

const deferPlugin = require('../support/semantic-release-defer-release')

// Order matters here!
Expand All @@ -111,7 +116,7 @@ const handler = async ({ publish }) => {
[
'@semantic-release/git',
{
assets: ['pnpm-lock.yaml'],
assets: [lockFile],
message:
'chore: bump pnpm-lock.yml ${nextRelease.version} [skip ci]',
},
Expand Down
46 changes: 15 additions & 31 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading