From ec7ff8b314dafe4d5b18b61b9114a229f71a548f Mon Sep 17 00:00:00 2001 From: Mozafar Haider Date: Tue, 4 Nov 2025 21:56:47 +0000 Subject: [PATCH 1/4] fix: update d2 utils release to support both pnpm and yarn --- packages/main/package.json | 1 - packages/main/src/index.js | 1 - packages/utils/src/cmds/release.js | 25 +++++++++++++++---------- pnpm-lock.yaml | 17 +---------------- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/packages/main/package.json b/packages/main/package.json index c079a3b2..c4bcdcb6 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -14,7 +14,6 @@ "dependencies": { "@dhis2/cli-app": "5.2.0", "@dhis2/cli-cluster": "5.2.0", - "@dhis2/cli-create": "5.2.0-alpha.14", "@dhis2/cli-helpers-engine": "^3.2.1", "@dhis2/cli-style": "^10.7.9", "@dhis2/cli-utils": "5.2.0", diff --git a/packages/main/src/index.js b/packages/main/src/index.js index 1305d1e7..060c62c4 100755 --- a/packages/main/src/index.js +++ b/packages/main/src/index.js @@ -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') diff --git a/packages/utils/src/cmds/release.js b/packages/utils/src/cmds/release.js index 448a3741..6dcf008c 100644 --- a/packages/utils/src/cmds/release.js +++ b/packages/utils/src/cmds/release.js @@ -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)), @@ -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) => @@ -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! @@ -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]', }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b89d2a4c..c504a493 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -62,9 +62,6 @@ importers: '@dhis2/cli-cluster': specifier: 5.2.0 version: 5.2.0 - '@dhis2/cli-create': - specifier: 5.2.0-alpha.14 - version: 5.2.0-alpha.14 '@dhis2/cli-helpers-engine': specifier: ^3.2.1 version: 3.2.2 @@ -1380,11 +1377,6 @@ packages: engines: {node: '>=12'} hasBin: true - '@dhis2/cli-create@5.2.0-alpha.14': - resolution: {integrity: sha512-xlECFeg/BFxgdVXvenTd8toZo0E2MH33yQLP+R1+lUd69y/nQuhxU+WM7iAMSbu0u4co/YwAxl+hKChmm/dIkw==} - engines: {node: '>=12'} - hasBin: true - '@dhis2/cli-helpers-engine@1.5.0': resolution: {integrity: sha512-g2gQlHRrEb1IUHR2SIgc6RDfe+s8LYpZ+2pHp9QBr5xzWlSCCoVXl0hDdRSn0L46HDlpKgwhfa2pq/YVLjcS1g==} @@ -5480,6 +5472,7 @@ packages: resolution: {integrity: sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==} engines: {node: '>=8.17.0'} hasBin: true + bundledDependencies: [] jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} @@ -10828,14 +10821,6 @@ snapshots: '@dhis2/cli-helpers-engine': 3.2.2 cli-table3: 0.6.5 - '@dhis2/cli-create@5.2.0-alpha.14': - dependencies: - '@dhis2/cli-helpers-engine': 3.2.2 - '@dhis2/cli-helpers-template': 3.0.0 - fs-extra: 9.1.0 - handlebars: 4.7.8 - inquirer: 7.3.3 - '@dhis2/cli-helpers-engine@1.5.0': dependencies: chalk: 3.0.0 From b7871d80e3fe2a35bf6af14c3188471ff7c9990d Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Tue, 4 Nov 2025 22:03:34 +0000 Subject: [PATCH 2/4] chore(release): cut 5.2.1-alpha.1 [skip ci] ## [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)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- packages/app/package.json | 2 +- packages/cluster/package.json | 2 +- packages/create-app/package.json | 2 +- packages/main/package.json | 8 ++++---- packages/utils/package.json | 2 +- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b0613f4..d312975f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/package.json b/package.json index b4db26fa..1585c6e0 100644 --- a/package.json +++ b/package.json @@ -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 ", diff --git a/packages/app/package.json b/packages/app/package.json index a79acb57..3710c06b 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -6,7 +6,7 @@ "engines": { "node": ">=12" }, - "version": "5.2.0", + "version": "5.2.1-alpha.1", "main": "src/index.js", "author": "Austin McGee ", "contributors": [ diff --git a/packages/cluster/package.json b/packages/cluster/package.json index ff7e59b9..fe506454 100644 --- a/packages/cluster/package.json +++ b/packages/cluster/package.json @@ -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", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 3ebb5334..366de143 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/create-app", - "version": "5.2.0", + "version": "5.2.1-alpha.1", "description": "", "main": "src/index.js", "bin": { diff --git a/packages/main/package.json b/packages/main/package.json index c4bcdcb6..24607edf 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -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 ", @@ -12,11 +12,11 @@ "node": ">=12" }, "dependencies": { - "@dhis2/cli-app": "5.2.0", - "@dhis2/cli-cluster": "5.2.0", + "@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" diff --git a/packages/utils/package.json b/packages/utils/package.json index c45d8d25..19fe79c2 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -6,7 +6,7 @@ "engines": { "node": ">=12" }, - "version": "5.2.0", + "version": "5.2.1-alpha.1", "main": "src/index.js", "author": "Viktor Varland ", "contributors": [ From 9c21a1e6f2270d678e380b5988a23163f429df57 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Tue, 4 Nov 2025 22:04:29 +0000 Subject: [PATCH 3/4] chore: bump pnpm-lock.yml 5.2.1-alpha.1 [skip ci] --- pnpm-lock.yaml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c504a493..00fca300 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,11 +57,11 @@ importers: packages/main: dependencies: '@dhis2/cli-app': - specifier: 5.2.0 - version: 5.2.0(typescript@5.8.3) + specifier: 5.2.1-alpha.1 + version: 5.2.1-alpha.1(typescript@5.8.3) '@dhis2/cli-cluster': - specifier: 5.2.0 - version: 5.2.0 + specifier: 5.2.1-alpha.1 + version: 5.2.1-alpha.1 '@dhis2/cli-helpers-engine': specifier: ^3.2.1 version: 3.2.2 @@ -69,8 +69,8 @@ importers: specifier: ^10.7.9 version: 10.7.9 '@dhis2/cli-utils': - specifier: 5.2.0 - version: 5.2.0(typescript@5.8.3) + specifier: 5.2.1-alpha.1 + version: 5.2.1-alpha.1(typescript@5.8.3) cli-table3: specifier: ^0.6.0 version: 0.6.5 @@ -1367,13 +1367,13 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} hasBin: true - '@dhis2/cli-app@5.2.0': - resolution: {integrity: sha512-eaSS6+8l0auQj5k67mMXEHe6sd1e7iFrtUeLZXPbp8Z6cPTvQO0o9N9MxZaSO+J8L1mNh02DtjJmiucnl4Ei+w==} + '@dhis2/cli-app@5.2.1-alpha.1': + resolution: {integrity: sha512-7scSGFlZC/QRhbaKbmjVo2ntGFcvTCFVfhQtHYaRChWW3AsC7Nnxzl5OEded8MGIt6KJwjAjcnPvtGhiSr5yMQ==} engines: {node: '>=12'} hasBin: true - '@dhis2/cli-cluster@5.2.0': - resolution: {integrity: sha512-2R71LXrnXPdQvi0Q5dGsb4xFhyToO2sw8Yu7i3Xunlv/ap/dY13BCuWsOtDqfgGBe0Oqwg57rZigwrw4tg6p0Q==} + '@dhis2/cli-cluster@5.2.1-alpha.1': + resolution: {integrity: sha512-5ZbKMxuMkiiI/hcPeYLj+mT0CD4J4n/2+13GlflmDwjzuR6BfXl6BLfU+pRwf16gOn8NQbUA0jGEElin87TOtQ==} engines: {node: '>=12'} hasBin: true @@ -1412,8 +1412,8 @@ packages: engines: {node: '>=12'} hasBin: true - '@dhis2/cli-utils@5.2.0': - resolution: {integrity: sha512-KZzF72OKzonQHB9ZhZWefafqQV7jZT4/pgz/o3JWw4civuFpLyclrwSBFe6ZHq7jCMLmqH3kkMCrGSX8TyUCqw==} + '@dhis2/cli-utils@5.2.1-alpha.1': + resolution: {integrity: sha512-99BcWtY4rmTEMsxdEKly8jXIbP0Dl92o/+ua22K5AGkjAOICXJtvdhDDo8f30NxGndRPAqPK3QXDfqn3RhTOwA==} engines: {node: '>=12'} hasBin: true @@ -5472,7 +5472,6 @@ packages: resolution: {integrity: sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==} engines: {node: '>=8.17.0'} hasBin: true - bundledDependencies: [] jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} @@ -10780,7 +10779,7 @@ snapshots: - webpack-hot-middleware - webpack-plugin-serve - '@dhis2/cli-app@5.2.0(typescript@5.8.3)': + '@dhis2/cli-app@5.2.1-alpha.1(typescript@5.8.3)': dependencies: '@dhis2/cli-app-scripts': 12.8.0-alpha.3(@types/babel__core@7.20.5)(@types/node@24.0.4)(react@18.3.1)(terser@5.43.1)(type-fest@4.41.0)(typescript@5.8.3)(webpack-dev-server@4.15.2(webpack@5.100.0)) '@dhis2/cli-helpers-engine': 3.2.2 @@ -10816,7 +10815,7 @@ snapshots: - webpack-hot-middleware - webpack-plugin-serve - '@dhis2/cli-cluster@5.2.0': + '@dhis2/cli-cluster@5.2.1-alpha.1': dependencies: '@dhis2/cli-helpers-engine': 3.2.2 cli-table3: 0.6.5 @@ -10936,7 +10935,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@dhis2/cli-utils@5.2.0(typescript@5.8.3)': + '@dhis2/cli-utils@5.2.1-alpha.1(typescript@5.8.3)': dependencies: '@dhis2/cli-helpers-engine': 3.2.2 '@dhis2/cli-utils-codemods': 3.0.0(@babel/preset-env@7.28.0(@babel/core@7.27.7)) From 77feeec863d5881ef61aebbb2077cdfc3a26f730 Mon Sep 17 00:00:00 2001 From: Mozafar Haider Date: Wed, 5 Nov 2025 09:14:58 +0000 Subject: [PATCH 4/4] chore: rerun pipeline