feat: first attempt using pnpm

kabaros · kabaros · commit 7189ed511520 · 2025-07-10T21:07:48.000+01:00
diff --git a/.github/workflows/dhis2-deploy-netlify.yml b/.github/workflows/dhis2-deploy-netlify.yml
@@ -24,14 +24,14 @@ jobs:
         if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
         steps:
             - uses: actions/checkout@v2
+            - uses: pnpm/action-setup@v4
             - uses: actions/setup-node@v3
               with:
                   node-version: 20.x
-                  cache: 'yarn'
+                  cache: 'pnpm'
+            - run: pnpm install --frozen-lockfile
 
-            - run: yarn install --frozen-lockfile
-
-            - run: yarn build:docs
+            - run: pnpm build:docs
 
             - uses: nwtgck/actions-netlify@v1.1
               with:
diff --git a/.github/workflows/dhis2-verify-commits.yml b/.github/workflows/dhis2-verify-commits.yml
@@ -12,8 +12,8 @@ jobs:
             - uses: actions/setup-node@v3
               with:
                   node-version: 20.x
-                  cache: 'yarn'
-            - run: yarn install --frozen-lockfile
+                  cache: 'pnpm'
+            - run: pnpm install --frozen-lockfile
             - id: commitlint
               run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
             - uses: JulienKode/pull-request-name-linter-action@v0.5.0
@@ -26,11 +26,12 @@ jobs:
             - uses: actions/checkout@v2
               with:
                   fetch-depth: 0
+            - uses: pnpm/action-setup@v4
             - uses: actions/setup-node@v3
               with:
                   node-version: 20.x
-                  cache: 'yarn'
-            - run: yarn install --frozen-lockfile
+                  cache: 'pnpm'
+            - run: pnpm install --frozen-lockfile
             - id: commitlint
               run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
             - uses: wagoid/commitlint-github-action@v5
diff --git a/.github/workflows/dhis2-verify-node.yml b/.github/workflows/dhis2-verify-node.yml
@@ -22,32 +22,34 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
+            - uses: pnpm/action-setup@v4
             - uses: actions/setup-node@v3
               with:
                   node-version: 20.x
-                  cache: 'yarn'
+                  cache: 'pnpm'
 
-            - run: yarn install --frozen-lockfile
+            - run: pnpm install --frozen-lockfile
 
             - name: Lint
-              run: yarn d2-style check
+              run: pnpm d2-style check
 
     test:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
+            - uses: pnpm/action-setup@v4
             - uses: actions/setup-node@v3
               with:
                   node-version: 20.x
-                  cache: 'yarn'
+                  cache: 'pnpm'
 
-            - run: yarn install --frozen-lockfile
+            - run: pnpm install --frozen-lockfile
 
             - name: Smoke
               run: ./packages/main/bin/d2 debug system
 
             - name: Test
-              run: yarn test
+              run: pnpm test
 
     publish:
         runs-on: ubuntu-latest
@@ -57,12 +59,13 @@ jobs:
             - uses: actions/checkout@v2
               with:
                   token: ${{env.GH_TOKEN}}
+            - uses: pnpm/action-setup@v4
             - uses: actions/setup-node@v3
               with:
                   node-version: 20.x
-                  cache: 'yarn'
+                  cache: 'pnpm'
 
-            - run: yarn install --frozen-lockfile
+            - run: pnpm install --frozen-lockfile
 
             - name: Publish to NPM
               run: ./packages/main/bin/d2 utils release --publish npm
diff --git a/package.json b/package.json
@@ -1,25 +1,23 @@
 {
     "version": "5.1.1-alpha.1",
     "private": true,
-    "workspaces": [
-        "packages/*"
-    ],
     "repository": "https://github.com/dhis2/cli",
     "author": "Austin McGee <austin@dhis2.org>",
     "contributors": [
         "Viktor Varland <viktor@dhis2.org>"
     ],
     "license": "BSD-3-Clause",
     "devDependencies": {
-        "@dhis2/cli-style": "^9.0.1",
+        "@dhis2/cli-style": "^9.3.1",
         "@dhis2/cli-utils-docsite": "^3.2.0",
-        "tape": "^4.13.2",
+        "tape": "^4.17.0",
         "tape-await": "^0.1.2"
     },
     "scripts": {
         "build:docs": "mkdir -p dist && cp docs/index.html dist/",
         "start": "d2-utils-docsite serve ./docs -o ./dist",
-        "test": "tape packages/**/tests/*.js"
+        "test": "tape packages/**/tests/*.js",
+        "format": "d2-style apply"
     },
     "d2": {
         "docsite": {
@@ -29,5 +27,6 @@
     },
     "resolutions": {
         "@ls-lint/ls-lint": "2.0.1"
-    }
+    },
+    "packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184"
 }
diff --git a/packages/cluster/src/common.js b/packages/cluster/src/common.js
@@ -235,7 +235,9 @@ module.exports.listClusters = async argv => {
     const cache = argv.getCache()
 
     const exists = await cache.exists(clusterDir)
-    if (!exists) return []
+    if (!exists) {
+        return []
+    }
 
     const stat = await cache.stat(clusterDir)
     const promises = Object.keys(stat.children)
diff --git a/packages/init/bin/index.js b/packages/init/bin/index.js
@@ -0,0 +1 @@
+console.log('creating sds ...')
diff --git a/packages/init/package.json b/packages/init/package.json
@@ -0,0 +1,16 @@
+{
+    "name": "@dhis2/create",
+    "version": "1.0.1",
+    "description": "",
+    "main": "index.js",
+    "bin": {
+        "create-d2": "bin/index.js"
+    },
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "ISC",
+    "packageManager": "pnpm@10.12.4"
+}
diff --git a/packages/utils/src/cmds/release.js b/packages/utils/src/cmds/release.js
@@ -77,7 +77,7 @@ const handler = async ({ publish }) => {
                 ),
                 packages
                     .map(pkgJsonPath =>
-                        path.join(path.dirname(pkgJsonPath), 'yarn.lock')
+                        path.join(path.dirname(pkgJsonPath), 'pnpm-lock.yaml')
                     )
                     .filter(existsSync)
                     .map(pkgJsonPath =>
diff --git a/packages/utils/src/cmds/schema/diff/index.js b/packages/utils/src/cmds/schema/diff/index.js
@@ -63,8 +63,12 @@ async function getSchemas(urlLike, { baseUrl, auth, force }) {
 function sortSchemaObject(a, b) {
     const aHash = objectHash(a)
     const bHash = objectHash(b)
-    if (aHash < bHash) return -1
-    if (aHash > bHash) return 1
+    if (aHash < bHash) {
+        return -1
+    }
+    if (aHash > bHash) {
+        return 1
+    }
     return 0
 }
 
diff --git a/packages/utils/src/cmds/schema/index.js b/packages/utils/src/cmds/schema/index.js
@@ -61,7 +61,9 @@ function authFromConf(conf = {}, serverConfig = {}) {
         username: serverConfig.username || conf.username,
         password: serverConfig.password || conf.password,
     }
-    if (auth.username && auth.password) return auth
+    if (auth.username && auth.password) {
+        return auth
+    }
     return true
 }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ const handler = async ({ publish }) => {`
`77`	`77`	`),`
`78`	`78`	`packages`
`79`	`79`	`.map(pkgJsonPath =>`
`80`		`- path.join(path.dirname(pkgJsonPath), 'yarn.lock')`
	`80`	`+ path.join(path.dirname(pkgJsonPath), 'pnpm-lock.yaml')`
`81`	`81`	`)`
`82`	`82`	`.filter(existsSync)`
`83`	`83`	`.map(pkgJsonPath =>`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ function authFromConf(conf = {}, serverConfig = {}) {`
`61`	`61`	`username: serverConfig.username \|\| conf.username,`
`62`	`62`	`password: serverConfig.password \|\| conf.password,`
`63`	`63`	`}`
`64`		`- if (auth.username && auth.password) return auth`
	`64`	`+ if (auth.username && auth.password) {`
	`65`	`+ return auth`
	`66`	`+ }`
`65`	`67`	`return true`
`66`	`68`	`}`
`67`	`69`