@dhis2/cli-utils 4.1.0-alpha.7 → 4.2.0

package/package.json

@@ -6,7 +6,7 @@
     "engines": {
         "node": ">=12"
     },
-    "version": "4.1.0-alpha.7",
+    "version": "4.2.0",
     "main": "src/index.js",
     "author": "Viktor Varland <viktor@dhis2.org>",
     "contributors": [
@@ -15,23 +15,22 @@
     "license": "BSD-3-Clause",
     "private": false,
     "dependencies": {
-        "@dhis2/cli-app-scripts": "^7.1.0-alpha.2",
-        "@dhis2/cli-helpers-engine": "^3.0.0",
+        "@dhis2/cli-helpers-engine": "^3.1.0",
         "@dhis2/cli-utils-codemods": "^3.0.0",
-        "@dhis2/cli-utils-cypress": "^8.0.0",
-        "@dhis2/cli-utils-docsite": "^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/exec": "^5.0.0",
         "@semantic-release/git": "^9.0.0",
-        "@semantic-release/github": "^7.0.5",
-        "@semantic-release/npm": "^7.0.5",
-        "@semantic-release/release-notes-generator": "^9.0.1",
+        "@semantic-release/github": "^7.2.3",
+        "@semantic-release/npm": "^7.1.3",
+        "@semantic-release/release-notes-generator": "^9.0.3",
         "dhis2-uid": "^0.1.2",
         "ejs": "^3.0.1",
         "inquirer": "^7.1.0",
         "jsondiffpatch": "^0.4.1",
-        "semantic-release": "^16.0.4"
+        "semantic-release": "^17.4.4",
+        "tape": "^4.13.2"
     },
     "publishConfig": {
         "access": "public"

package/src/cmds/release.js

@@ -14,8 +14,6 @@ const packageIsPublishable = pkgJsonPath => {
 }
 
 function publisher(target = '', packages) {
-    const appHubPlugin = require('../support/semantic-release-app-hub.js')
-
     switch (target.toLowerCase()) {
         case 'npm': {
             return packages.filter(packageIsPublishable).map(pkgJsonPath => {
@@ -28,35 +26,6 @@ function publisher(target = '', packages) {
             })
         }
 
-        case 'app-hub': {
-            return packages
-                .map(pkgJsonPath => {
-                    return [
-                        [
-                            '@semantic-release/npm',
-                            {
-                                pkgRoot: path.dirname(pkgJsonPath),
-                                npmPublish: false,
-                            },
-                        ],
-                        [
-                            '@semantic-release/exec',
-                            {
-                                prepareCmd:
-                                    'yarn install --frozen-lockfile && yarn d2-app-scripts build',
-                            },
-                        ],
-                        [
-                            appHubPlugin,
-                            {
-                                pkgRoot: path.dirname(pkgJsonPath),
-                            },
-                        ],
-                    ]
-                })
-                .reduce((a, b) => a.concat(b))
-        }
-
         default: {
             return packages.map(pkgJsonPath => {
                 return [

package/src/index.js

@@ -1,11 +1,15 @@
-const { namespace } = require('@dhis2/cli-helpers-engine')
+const { namespace, createModuleLoader } = require('@dhis2/cli-helpers-engine')
 
 const command = namespace('utils', {
     desc: 'Utils for miscellaneous operations',
     builder: yargs => {
-        yargs.command(require('@dhis2/cli-utils-cypress'))
-        yargs.command(require('@dhis2/cli-utils-codemods'))
-        yargs.command(require('@dhis2/cli-utils-docsite'))
+        const loader = createModuleLoader({
+            parentModule: __filename,
+        })
+
+        yargs.command(loader('@dhis2/cli-utils-cypress'))
+        yargs.command(loader('@dhis2/cli-utils-codemods'))
+        yargs.command(loader('@dhis2/cli-utils-docsite'))
         yargs.commandDir('cmds')
     },
 })

package/src/support/semantic-release-defer-release.js

@@ -2,7 +2,7 @@ const analyzeCommits = (config, context) => {
     const { logger, commits } = context
 
     const { message, commit } = commits[0]
-    const defer = /\[(defer|skip)[ -]release\]/gi
+    const defer = /\[defer[ -]release\]/gi
 
     if (message.match(defer)) {
         logger.warn(`This release has been deferred by commit ${commit.short}`)

package/src/support/semantic-release-app-hub.js

@@ -1,85 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const { publishCommand } = require('@dhis2/cli-app-scripts')
-const SemanticReleaseError = require('@semantic-release/error')
-
-const { handler: publishAppHub } = publishCommand
-
-exports.verifyConditions = (config, context) => {
-    const { env } = context
-    const { pkgRoot } = config
-
-    const configPath = path.join(pkgRoot, 'd2.config.js')
-
-    if (!fs.existsSync(configPath)) {
-        throw new SemanticReleaseError(
-            `Failed to locate d2.config.js file, does it exist in ${pkgRoot}?`,
-            'EMISSINGD2CONFIG',
-            'd2.config.js is necessary to automatically publish to the App Hub'
-        )
-    }
-
-    const d2Config = require(configPath)
-
-    if (d2Config.type === 'lib') {
-        throw new SemanticReleaseError(
-            'App Hub does not support publishing libraries.',
-            'EAPPHUBSUPPORT',
-            "The type in d2.config.js must not be 'lib'"
-        )
-    }
-
-    if (!d2Config.id) {
-        throw new SemanticReleaseError(
-            "'id' field missing from d2.config.js",
-            'EMISSINGAPPHUBID',
-            'The App Hub application id must be defined in d2.config.js'
-        )
-    }
-
-    if (!d2Config.minDHIS2Version) {
-        throw new SemanticReleaseError(
-            "'minDHIS2Version' field missing from d2.config.js",
-            'EMISSINGMINDHIS2VERSION',
-            'The minimum supported DHIS2 version must be defined in d2.config.js'
-        )
-    }
-
-    if (!env.APP_HUB_TOKEN) {
-        throw new SemanticReleaseError(
-            'APP_HUB_TOKEN is missing from the environment',
-            'EMISSINGAPPHUBTOKEN',
-            'You need to supply the API token to the APP_HUB_TOKEN env var.'
-        )
-    }
-}
-
-// maybe we can use this step for release channels
-// exports.addChannel = (config, context) => {}
-
-exports.publish = async (config, context) => {
-    const d2Config = require(path.join(config.pkgRoot, 'd2.config.js'))
-    const { pkgRoot } = config
-    const { env } = context
-
-    await publishAppHub({
-        cwd: pkgRoot,
-        apikey: env.APP_HUB_TOKEN,
-        id: d2Config.id,
-        minDHIS2Version: d2Config.minDHIS2Version,
-        baseUrl: 'https://apps.dhis2.org',
-        channel: 'stable',
-    })
-}
-
-exports.success = (config, context) => {
-    const { logger } = context
-
-    logger.log('Published successfully to the App Hub')
-}
-
-exports.fail = (config, context) => {
-    const { logger } = context
-
-    logger.log('Published to the App Hub failed')
-}