@dhis2/cli-utils 5.1.1-beta.1 → 5.2.0-alpha.3

package/package.json

@@ -6,7 +6,7 @@
     "engines": {
         "node": ">=12"
     },
-    "version": "5.1.1-beta.1",
+    "version": "5.2.0-alpha.3",
     "main": "src/index.js",
     "author": "Viktor Varland <viktor@dhis2.org>",
     "contributors": [
@@ -19,17 +19,21 @@
         "@dhis2/cli-utils-codemods": "^3.0.0",
         "@dhis2/cli-utils-cypress": "^9.0.1",
         "@dhis2/cli-utils-docsite": "^3.1.2",
-        "@semantic-release/changelog": "^5.0.1",
-        "@semantic-release/commit-analyzer": "^8.0.1",
-        "@semantic-release/git": "^9.0.0",
-        "@semantic-release/github": "^7.2.3",
-        "@semantic-release/npm": "^7.1.3",
-        "@semantic-release/release-notes-generator": "^9.0.3",
+        "@semantic-release/changelog": "^6.0.3",
+        "@semantic-release/commit-analyzer": "^13.0.1",
+        "@semantic-release/error": "^4.0.0",
+        "@semantic-release/exec": "^7.1.0",
+        "@semantic-release/git": "^10.0.1",
+        "@semantic-release/github": "^11.0.3",
+        "@semantic-release/npm": "^12.0.2",
+        "@semantic-release/release-notes-generator": "^14.0.3",
+        "aggregate-error": "^5.0.0",
         "dhis2-uid": "^0.1.2",
         "ejs": "^3.0.1",
+        "glob": "^11.0.3",
         "inquirer": "^7.1.0",
         "jsondiffpatch": "^0.4.1",
-        "semantic-release": "^17.4.4",
+        "semantic-release": "^24.2.7",
         "tape": "^4.13.2"
     },
     "publishConfig": {

package/src/cmds/release.js

@@ -1,7 +1,7 @@
 const { existsSync } = require('fs')
 const path = require('path')
 const { reporter } = require('@dhis2/cli-helpers-engine')
-const semanticRelease = require('semantic-release')
+const semanticRelease = require('semantic-release').default
 const getWorkspacePackages = require('../support/getWorkspacePackages')
 
 const packageIsPublishable = pkgJsonPath => {
@@ -32,7 +32,6 @@ function publisher(target = '', packages) {
                     '@semantic-release/npm',
                     {
                         pkgRoot: path.dirname(pkgJsonPath),
-                        npmPublish: false,
                     },
                 ]
             })
@@ -77,7 +76,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 =>
@@ -89,6 +88,12 @@ const handler = async ({ publish }) => {
         },
     ]
 
+    const updateLockFile = [
+        '@semantic-release/exec',
+        {
+            verifyCOnditionsCmd: 'pnpm install', // ToDo: make it independent of npm
+        },
+    ]
     const deferPlugin = require('../support/semantic-release-defer-release')
 
     // Order matters here!
@@ -97,6 +102,7 @@ const handler = async ({ publish }) => {
         '@semantic-release/commit-analyzer',
         '@semantic-release/release-notes-generator',
         updateDepsPlugin,
+        updateLockFile,
         changelogPlugin,
         ...publisher(publish, packages),
         gitPlugin,
@@ -120,6 +126,7 @@ const handler = async ({ publish }) => {
     }
 
     try {
+        console.log(semanticRelease)
         const result = await semanticRelease(options, config)
 
         if (result) {
@@ -161,3 +168,5 @@ module.exports = {
         },
     },
 }
+
+// handler({ publish: 'npm' })

package/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
 }
 

package/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
 }