feat: first attempt using pnpm

Author: kabaros

.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:

.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

.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

.hooks/commit-msg

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn d2-style check commit "$1"
+pnpm d2-style check commit "$1"

.hooks/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn d2-style check --staged
+pnpm d2-style check --staged

.npmrc

@@ -0,0 +1 @@
+workspaces-update = false

docs/getting-started.md

@@ -5,7 +5,7 @@
 # Install the CLI
 
 ```bash
-yarn global add @dhis2/cli
+pnpm add -g @dhis2/cli
 ```
 
 or through npm

package.json

@@ -1,25 +1,26 @@
 {
     "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>"
     ],
+    "workspaces": [
+        "packages/*"
+    ],
     "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 +30,6 @@
     },
     "resolutions": {
         "@ls-lint/ls-lint": "2.0.1"
-    }
+    },
+    "packageManager": "pnpm@10.12.4+sha512.5ea8b0deed94ed68691c9bad4c955492705c5eeb8a87ef86bc62c74a26b037b08ff9570f108b2e4dbd1dd1a9186fea925e527f141c648e85af45631074680184"
 }

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)

packages/init/bin/index.js

@@ -0,0 +1 @@
+console.log('creating sds ...')