@dhis2/cli-utils 5.2.0-alpha.9 → 5.2.1-alpha.1

package/package.json

@@ -6,7 +6,7 @@
     "engines": {
         "node": ">=12"
     },
-    "version": "5.2.0-alpha.9",
+    "version": "5.2.1-alpha.1",
     "main": "src/index.js",
     "author": "Viktor Varland <viktor@dhis2.org>",
     "contributors": [

package/src/cmds/release.js

@@ -4,7 +4,7 @@ const { reporter } = require('@dhis2/cli-helpers-engine')
 const semanticRelease = require('semantic-release').default
 const getWorkspacePackages = require('../support/getWorkspacePackages')
 
-const packageIsPublishable = pkgJsonPath => {
+const packageIsPublishable = (pkgJsonPath) => {
     try {
         const pkgJson = require(pkgJsonPath)
         return !!pkgJson.name && !pkgJson.private
@@ -16,7 +16,7 @@ const packageIsPublishable = pkgJsonPath => {
 function publisher(target = '', packages) {
     switch (target.toLowerCase()) {
         case 'npm': {
-            return packages.filter(packageIsPublishable).map(pkgJsonPath => {
+            return packages.filter(packageIsPublishable).map((pkgJsonPath) => {
                 return [
                     '@semantic-release/npm',
                     {
@@ -27,7 +27,7 @@ function publisher(target = '', packages) {
         }
 
         default: {
-            return packages.map(pkgJsonPath => {
+            return packages.map((pkgJsonPath) => {
                 return [
                     '@semantic-release/npm',
                     {
@@ -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)),
@@ -71,15 +73,15 @@ const handler = async ({ publish }) => {
         {
             assets: [
                 'CHANGELOG.md',
-                packages.map(pkgJsonPath =>
+                packages.map((pkgJsonPath) =>
                     path.relative(process.cwd(), pkgJsonPath)
                 ),
                 packages
-                    .map(pkgJsonPath =>
-                        path.join(path.dirname(pkgJsonPath), 'pnpm-lock.yaml')
+                    .map((pkgJsonPath) =>
+                        path.join(path.dirname(pkgJsonPath), lockFile)
                     )
                     .filter(existsSync)
-                    .map(pkgJsonPath =>
+                    .map((pkgJsonPath) =>
                         path.relative(process.cwd(), pkgJsonPath)
                     ),
             ],
@@ -88,12 +90,16 @@ const handler = async ({ publish }) => {
         },
     ]
 
-    const updateLockFile = [
-        '@semantic-release/exec',
-        {
-            publishCmd: 'pnpm install --lockfile-only', // ToDo: make it independent of npm
-        },
-    ]
+    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!
@@ -110,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]',
             },
@@ -123,7 +129,7 @@ const handler = async ({ publish }) => {
      * https://github.com/semantic-release/semantic-release/blob/master/docs/usage/configuration.md
      */
     const options = {
-        plugins: plugins.filter(n => !!n),
+        plugins: plugins.filter((n) => !!n),
     }
 
     const config = {
@@ -134,7 +140,6 @@ const handler = async ({ publish }) => {
     }
 
     try {
-        console.log(semanticRelease)
         const result = await semanticRelease(options, config)
 
         if (result) {
@@ -176,5 +181,3 @@ module.exports = {
         },
     },
 }
-
-// handler({ publish: 'npm' })

package/src/cmds/schema/diff/index.js

@@ -16,11 +16,11 @@ const DHIS2HtmlFormatter = require('./schemaHtmlFormatter')
 let cache
 // We use the singular property as an unique identifier for schemas
 // name and type are used for other nested properties
-const objectHash = obj =>
+const objectHash = (obj) =>
     obj.singular || obj.name || obj.fieldName || obj.type || obj
 const Differ = jsondiffpatch.create({
     objectHash,
-    propertyFilter: name => name !== 'href' && name !== 'apiEndpoint',
+    propertyFilter: (name) => name !== 'href' && name !== 'apiEndpoint',
     arrays: {
         detectMove: true,
         includeValueOnMove: true,
@@ -73,7 +73,7 @@ function sortSchemaObject(a, b) {
 }
 
 function sortArrayProps(obj) {
-    Object.keys(obj).forEach(key => {
+    Object.keys(obj).forEach((key) => {
         const val = obj[key]
         if (Array.isArray(val)) {
             const sorted = val.sort(sortSchemaObject)
@@ -210,7 +210,7 @@ async function run(args) {
     })
 }
 
-const builder = yargs => {
+const builder = (yargs) => {
     yargs
         .positional('leftUrl', {
             type: 'string',
@@ -224,7 +224,7 @@ const builder = yargs => {
         })
         .option('base-url', {
             alias: 'b',
-            coerce: opt => utils.prependHttpsProtocol(opt),
+            coerce: (opt) => utils.prependHttpsProtocol(opt),
             describe: `BaseUrl to use for downloading schemas. If this is set leftServer and rightServer should be relative to this url, eg. /dev.`,
             type: 'string',
         })

package/src/cmds/schema/fetch.js

@@ -55,7 +55,7 @@ const command = {
         },
         'base-url': {
             alias: 'b',
-            coerce: opt => prependHttpsProtocol(opt),
+            coerce: (opt) => prependHttpsProtocol(opt),
             describe: `BaseUrl to use for downloading schemas. If this is set, urls that are relative (starts with /) will be appended to this url. eg. /dev.`,
             type: 'string',
         },

package/src/cmds/schema/index.js

@@ -19,12 +19,12 @@ const defaultRequestOpts = {
 
 const prompt = inquirer.createPromptModule({ output: process.stderr })
 
-const schemaIdentifier = info => `${info.version}_${info.revision}`
+const schemaIdentifier = (info) => `${info.version}_${info.revision}`
 const schemaDiffIdentifier = (info1, info2) =>
     `${schemaIdentifier(info1)}__${schemaIdentifier(info2)}`
 
 function asyncRequest(url, opts) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
         request.get(url, opts, (err, res, body) => {
             if (err || res.statusCode > 299) {
                 reporter.error('Request', url, 'failed to fetch')

package/src/cmds/schema.js

@@ -2,7 +2,7 @@ const { namespace } = require('@dhis2/cli-helpers-engine')
 
 const command = namespace('schema', {
     desc: 'Utils for schema operations',
-    builder: yargs =>
+    builder: (yargs) =>
         yargs
             .option('force', {
                 type: 'boolean',

package/src/cmds/uid.js

@@ -17,7 +17,7 @@ const generateCmd = {
             type: 'boolean',
         },
     },
-    handler: argv => {
+    handler: (argv) => {
         const { limit } = argv
 
         const codes = generateCodes(limit || 10)
@@ -44,7 +44,7 @@ const generateCmd = {
 module.exports = namespace('uid', {
     desc: 'DHIS2 UID tools',
     aliases: 'u',
-    builder: yargs => {
+    builder: (yargs) => {
         return yargs.command(generateCmd)
     },
 })

package/src/index.js

@@ -2,7 +2,7 @@ const { namespace, createModuleLoader } = require('@dhis2/cli-helpers-engine')
 
 const command = namespace('utils', {
     desc: 'Utils for miscellaneous operations',
-    builder: yargs => {
+    builder: (yargs) => {
         const loader = createModuleLoader({
             parentModule: __filename,
         })

package/src/support/getWorkspacePackages.js

@@ -3,14 +3,14 @@ const { reporter } = require('@dhis2/cli-helpers-engine')
 const glob = require('glob')
 
 // Simplified from https://github.com/yarnpkg/yarn/blob/bb9741af4d1fe00adb15e4a7596c7a3472d0bda3/src/config.js#L814
-const globPackageFilePattern = pattern =>
+const globPackageFilePattern = (pattern) =>
     glob.sync(
         path.join(process.cwd(), pattern.replace(/\/?$/, '/package.json')),
         {
             ignore: pattern.replace(/\/?$/, '/node_modules/**/package.json'),
         }
     )
-const getWorkspacePackages = async packageFile => {
+const getWorkspacePackages = async (packageFile) => {
     try {
         const rootPackage = require(packageFile)
         if (rootPackage.workspaces) {

package/src/support/normalizeAndValidatePackages.js

@@ -1,11 +1,11 @@
 const fs = require('fs')
 const path = require('path')
 
-const normalizeAndValidatePackages = packages => {
+const normalizeAndValidatePackages = (packages) => {
     const errors = []
     const validPackages = []
 
-    packages.forEach(packagePath => {
+    packages.forEach((packagePath) => {
         let pkgJsonPath
         if (!fs.existsSync(packagePath)) {
             errors.push(`Path ${packagePath} does not exist`)

package/src/support/semantic-release-update-deps.js

@@ -21,7 +21,7 @@ const verifyConditions = (config = {}, context) => {
         throw new AggregateError(errors)
     }
 
-    validPackages.forEach(pkg => {
+    validPackages.forEach((pkg) => {
         pkg.label = pkg.json.name || '<unnamed>'
         if (!silent) {
             logger.log(`Package ${pkg.label} found at ${pkg.path}`)
@@ -33,8 +33,8 @@ const verifyConditions = (config = {}, context) => {
 
 const replaceDependencies = ({ pkg, listNames, packageNames, version }) => {
     const dependencies = []
-    packageNames.forEach(packageName => {
-        listNames.forEach(listName => {
+    packageNames.forEach((packageName) => {
+        listNames.forEach((listName) => {
             if (pkg[listName] && pkg[listName][packageName]) {
                 pkg[listName][packageName] = version
                 dependencies.push(`${packageName} (${listName})`)
@@ -55,8 +55,8 @@ const prepare = (config, context) => {
         ? nextRelease.version
         : `^${nextRelease.version}`
 
-    const names = packages.map(pkg => pkg.json.name).filter(n => n)
-    packages.forEach(pkg => {
+    const names = packages.map((pkg) => pkg.json.name).filter((n) => n)
+    packages.forEach((pkg) => {
         const pkgJson = pkg.json
         const relativePath = path.relative(context.cwd, pkg.path)
 
@@ -75,7 +75,7 @@ const prepare = (config, context) => {
             packageNames: names,
             version: targetVersion,
         }).forEach(
-            dep =>
+            (dep) =>
                 !silent &&
                 logger.log(
                     `Upgraded dependency ${dep}@${targetVersion} for ${pkg.label} at ${relativePath}`