chore(deps): update cli submodules

.hooks/.gitignore

@@ -0,0 +1 @@
+_

.hooks/commit-msg

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

.hooks/pre-commit

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

package.json

@@ -11,8 +11,8 @@
     ],
     "license": "BSD-3-Clause",
     "devDependencies": {
-        "@dhis2/cli-style": "^7.2.2",
-        "@dhis2/cli-utils-docsite": "^2.0.2",
+        "@dhis2/cli-style": "^9.0.0",
+        "@dhis2/cli-utils-docsite": "^3.0.0",
         "tape": "^4.13.2",
         "tape-await": "^0.1.2"
     },

packages/app/package.json

@@ -15,8 +15,8 @@
     "license": "BSD-3-Clause",
     "private": false,
     "dependencies": {
-        "@dhis2/cli-app-scripts": "^5.2.0",
-        "@dhis2/cli-helpers-engine": "^2.0.0"
+        "@dhis2/cli-app-scripts": "^7.0.0",
+        "@dhis2/cli-helpers-engine": "^3.0.0"
     },
     "publishConfig": {
         "access": "public"

packages/app/src/commands/i18n/modernize.js

@@ -11,21 +11,19 @@
  *   --log-missing-keys
  */
 const path = require('path')
-
 const { reporter } = require('@dhis2/cli-helpers-engine')
-
 const {
-    getTranslationFileNames,
-} = require('../../helpers/modernize/getTranslationFileNames.js')
+    createNewTranslationFiles,
+} = require('../../helpers/modernize/createNewTranslationFiles.js')
 const {
     deleteLegacyFiles,
 } = require('../../helpers/modernize/deleteLegacyFiles.js')
 const {
     generateTranslationMappings,
 } = require('../../helpers/modernize/generateTranslationMappings.js')
 const {
-    createNewTranslationFiles,
-} = require('../../helpers/modernize/createNewTranslationFiles.js')
+    getTranslationFileNames,
+} = require('../../helpers/modernize/getTranslationFileNames.js')
 
 const CONSUMING_ROOT = path.join(process.cwd())
 const TRANSLATION_IN_DIR = path.join(CONSUMING_ROOT, 'src/i18n')

packages/app/src/helpers/modernize/checkRequirements.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
-const chalk = require('chalk')
 const { reporter } = require('@dhis2/cli-helpers-engine')
+const chalk = require('chalk')
 
 /**
  * @param {string} inDir

packages/app/src/helpers/modernize/createNewTranslationFiles.js

@@ -1,7 +1,6 @@
-const path = require('path')
 const fs = require('fs')
+const path = require('path')
 const { reporter } = require('@dhis2/cli-helpers-engine')
-
 const {
     getTemplateMainLanguage,
     getTemplateAlternativeLanguage,

packages/app/src/helpers/modernize/deleteLegacyFiles.js

@@ -1,5 +1,4 @@
 const fs = require('fs')
-
 const { reporter } = require('@dhis2/cli-helpers-engine')
 
 /**

packages/cluster/package.json

@@ -7,7 +7,7 @@
     "author": "Austin McGee <[email protected]>",
     "license": "BSD-3-Clause",
     "dependencies": {
-        "@dhis2/cli-helpers-engine": "^2.0.0",
+        "@dhis2/cli-helpers-engine": "^3.0.0",
         "cli-table3": "^0.6.0"
     },
     "bin": {

packages/cluster/src/commands/compose.js

@@ -1,5 +1,5 @@
-const path = require('path')
 const { spawn } = require('child_process')
+const path = require('path')
 const { reporter, tryCatchAsync } = require('@dhis2/cli-helpers-engine')
 const {
     initDockerComposeCache,
@@ -54,8 +54,7 @@ const run = async function (argv) {
 
 module.exports = {
     command: 'compose <name>',
-    desc:
-        'Run arbitrary docker-compose commands against a DHIS2 cluster.\nNOTE: pass -- after <name>',
+    desc: 'Run arbitrary docker-compose commands against a DHIS2 cluster.\nNOTE: pass -- after <name>',
     aliases: 'c',
     handler: run,
 }

packages/cluster/src/commands/list.js

@@ -1,6 +1,6 @@
 const { reporter, exec, chalk } = require('@dhis2/cli-helpers-engine')
-const { makeComposeProject, listClusters } = require('../common')
 const Table = require('cli-table3')
+const { makeComposeProject, listClusters } = require('../common')
 
 const getStatus = async cluster =>
     // TODO: check the status of the other services, not just `core`

packages/cluster/src/commands/restart.js

@@ -11,7 +11,6 @@ const {
     makeEnvironment,
     resolveConfiguration,
 } = require('../common')
-
 const defaults = require('../defaults')
 
 const run = async function (argv) {

packages/cluster/src/commands/up.js

@@ -11,7 +11,6 @@ const {
     makeComposeProject,
     resolveConfiguration,
 } = require('../common')
-
 const defaults = require('../defaults')
 const { restore } = require('../helpers/db')
 
@@ -108,8 +107,7 @@ module.exports = {
             type: 'boolean',
         },
         seedFile: {
-            desc:
-                'The location of the sql dump to use when seeding that database',
+            desc: 'The location of the sql dump to use when seeding that database',
             type: 'string',
         },
         update: {
@@ -127,8 +125,7 @@ module.exports = {
             type: 'string',
         },
         dhis2Config: {
-            desc:
-                'Path to a custom DHIS2 configuration file to use (dhis.conf)',
+            desc: 'Path to a custom DHIS2 configuration file to use (dhis.conf)',
             type: 'string',
         },
         dbVersion: {

packages/cluster/src/common.js

@@ -1,7 +1,5 @@
 const path = require('path')
-
 const { reporter } = require('@dhis2/cli-helpers-engine')
-
 const defaults = require('./defaults')
 
 const clusterDir = 'clusters'

packages/cluster/src/helpers/db/backup.js

@@ -1,6 +1,6 @@
-const { makeComposeProject } = require('../../common')
 const path = require('path')
 const { reporter, exec, chalk } = require('@dhis2/cli-helpers-engine')
+const { makeComposeProject } = require('../../common')
 
 module.exports = async ({ cacheLocation, name, path: dbPath, fat }) => {
     const destinationFile = path.resolve(dbPath)

packages/cluster/src/helpers/db/restore.js

@@ -1,6 +1,6 @@
-const { makeComposeProject, substituteVersion } = require('../../common')
 const path = require('path')
 const { reporter, exec, chalk } = require('@dhis2/cli-helpers-engine')
+const { makeComposeProject, substituteVersion } = require('../../common')
 
 const downloadDatabase = async ({ cache, dbVersion, update, url }) => {
     const ext = '.sql.gz' //dbUrl.endsWith('.gz') ? '.gz' : '.sql'

packages/cluster/tests/setup-environment.js

@@ -1,7 +1,5 @@
 const test = require('tape-await')
-
 const { makeEnvironment, resolveConfiguration } = require('../src/common.js')
-
 const defaults = require('../src/defaults.js')
 
 const cache = obj => ({

packages/cluster/tests/substitute-string-keys.js

@@ -1,7 +1,5 @@
 const test = require('tape')
-
 const { makeDockerImage, substituteVersion } = require('../src/common.js')
-
 const defaults = require('../src/defaults')
 
 const template = defaults.image

packages/create-app/index.js

@@ -1,5 +1,5 @@
-const { groupGlobalOptions } = require('@dhis2/cli-helpers-engine')
 const create = require('@dhis2/cli-create')
+const { groupGlobalOptions } = require('@dhis2/cli-helpers-engine')
 
 module.exports = {
     command: 'create [type]',

packages/create-app/package.json

@@ -8,7 +8,7 @@
     "license": "BSD-3-Clause",
     "dependencies": {
         "@dhis2/cli-create": "3.1.0",
-        "@dhis2/cli-helpers-engine": "^2.0.0"
+        "@dhis2/cli-helpers-engine": "^3.0.0"
     },
     "bin": "./bin/d2-create-app",
     "engines": {

packages/create/package.json

@@ -12,8 +12,8 @@
     "license": "BSD-3-Clause",
     "private": false,
     "dependencies": {
-        "@dhis2/cli-helpers-engine": "^2.0.0",
-        "@dhis2/cli-helpers-template": "^2.0.0",
+        "@dhis2/cli-helpers-engine": "^3.0.0",
+        "@dhis2/cli-helpers-template": "^3.0.0",
         "fs-extra": "^9.0.0",
         "handlebars": "^4.7.3",
         "inquirer": "^7.1.0"

packages/create/src/index.js

@@ -1,7 +1,6 @@
 const path = require('path')
 const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
 const { installTemplate } = require('@dhis2/cli-helpers-template')
-
 const cliBuilder = require('./builders/cliBuilder')
 
 const handler = async ({ type, name, ...argv }) => {

packages/main/package.json

@@ -15,8 +15,8 @@
         "@dhis2/cli-app": "3.1.0",
         "@dhis2/cli-cluster": "3.1.0",
         "@dhis2/cli-create": "3.1.0",
-        "@dhis2/cli-helpers-engine": "^2.0.0",
-        "@dhis2/cli-style": "^7.0.0",
+        "@dhis2/cli-helpers-engine": "^3.0.0",
+        "@dhis2/cli-style": "^9.0.0",
         "@dhis2/cli-utils": "3.1.0",
         "cli-table3": "^0.6.0",
         "envinfo": "^7.5.0",

packages/main/src/commands/debug/cache.js

@@ -1,6 +1,6 @@
 const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
-const inquirer = require('inquirer')
 const Table = require('cli-table3')
+const inquirer = require('inquirer')
 
 const printStats = (table, name, stats) => {
     const nameColor = stats.isDirectory() ? chalk.blue : chalk.green

packages/main/src/commands/debug/system.js

@@ -1,5 +1,5 @@
-const envInfo = require('envinfo')
 const { reporter } = require('@dhis2/cli-helpers-engine')
+const envInfo = require('envinfo')
 
 const run = async () => {
     const info = await envInfo.run(

packages/utils/package.json

@@ -15,10 +15,10 @@
     "license": "BSD-3-Clause",
     "private": false,
     "dependencies": {
-        "@dhis2/cli-helpers-engine": "^2.0.0",
-        "@dhis2/cli-utils-codemods": "^1.0.0",
+        "@dhis2/cli-helpers-engine": "^3.0.0",
+        "@dhis2/cli-utils-codemods": "^3.0.0",
         "@dhis2/cli-utils-cypress": "^2.0.0",
-        "@dhis2/cli-utils-docsite": "^2.0.2",
+        "@dhis2/cli-utils-docsite": "^3.0.0",
         "@semantic-release/changelog": "^5.0.1",
         "@semantic-release/commit-analyzer": "^8.0.1",
         "@semantic-release/git": "^9.0.0",

packages/utils/src/cmds/release.js

@@ -1,6 +1,6 @@
-const { reporter } = require('@dhis2/cli-helpers-engine')
 const { existsSync } = require('fs')
 const path = require('path')
+const { reporter } = require('@dhis2/cli-helpers-engine')
 const semanticRelease = require('semantic-release')
 const getWorkspacePackages = require('../support/getWorkspacePackages')
 

packages/utils/src/cmds/schema/diff/index.js

@@ -1,18 +1,17 @@
-const path = require('path')
-const jsondiffpatch = require('jsondiffpatch')
 const fs = require('fs')
-const utils = require('../../../support/utils')
-const ejs = require('ejs')
+const path = require('path')
 const { reporter } = require('@dhis2/cli-helpers-engine')
-const DHIS2HtmlFormatter = require('./schemaHtmlFormatter')
-
+const ejs = require('ejs')
+const jsondiffpatch = require('jsondiffpatch')
 const {
     schemasFromUrl,
     writeOutput,
     schemaDiffIdentifier,
     defaultOpts,
     resolveConfig,
 } = require('../')
+const utils = require('../../../support/utils')
+const DHIS2HtmlFormatter = require('./schemaHtmlFormatter')
 
 let cache
 // We use the singular property as an unique identifier for schemas

packages/utils/src/cmds/schema/fetch.js

@@ -1,12 +1,12 @@
+const path = require('path')
+const { reporter } = require('@dhis2/cli-helpers-engine')
+const { prependHttpsProtocol, isRelativeUrl } = require('../../support/utils')
 const {
     schemasFromUrl,
     writeOutput,
     schemaIdentifier,
     resolveConfig,
 } = require('./index.js')
-const { reporter } = require('@dhis2/cli-helpers-engine')
-const { prependHttpsProtocol, isRelativeUrl } = require('../../support/utils')
-const path = require('path')
 
 const handler = async ({ urls, output = false, force, ...rest }) => {
     const cache = rest.getCache()

packages/utils/src/cmds/schema/index.js

@@ -1,9 +1,9 @@
 const fs = require('fs')
 const path = require('path')
-const utils = require('../../support/utils')
-const request = require('request')
-const inquirer = require('inquirer')
 const { reporter } = require('@dhis2/cli-helpers-engine')
+const inquirer = require('inquirer')
+const request = require('request')
+const utils = require('../../support/utils')
 
 const defaultOpts = {
     schemasEndpoint: '/api/schemas.json',

packages/utils/src/cmds/uid.js

@@ -1,6 +1,6 @@
-const { generateCode, generateCodes } = require('dhis2-uid')
 const log = require('@dhis2/cli-helpers-engine').reporter
 const namespace = require('@dhis2/cli-helpers-engine').namespace
+const { generateCode, generateCodes } = require('dhis2-uid')
 
 const generateCmd = {
     command: 'generate [limit]',

packages/utils/src/support/getWorkspacePackages.js

@@ -1,6 +1,6 @@
-const glob = require('glob')
 const path = require('path')
 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 =>

packages/utils/src/support/utils.js

@@ -1,5 +1,5 @@
-const URL = require('url').URL
 const fs = require('fs')
+const URL = require('url').URL
 
 function isUrl(url) {
     try {