Merge pull request #445 from dhis2/update-engines-node12

chore: remove node 10 support

.github/workflows/dhis2-verify-node.yml

@@ -4,6 +4,10 @@ on:
     push:
         branches:
 
+concurrency:
+    group: ${{ github.workflow}}-${{ github.ref }}
+    cancel-in-progress: true
+
 env:
     GIT_AUTHOR_NAME: '@dhis2-bot'
     GIT_AUTHOR_EMAIL: 'apps@dhis2.org'
@@ -14,62 +18,30 @@ env:
     CI: true
 
 jobs:
-    install:
-        runs-on: ubuntu-latest
-        if: "!contains(github.event.head_commit.message, '[skip ci]')"
-
-        steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
-              with:
-                  node-version: 12.x
-
-            - uses: actions/cache@v2
-              id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-              with:
-                  path: '**/node_modules'
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-
-            - name: Install
-              if: steps.yarn-cache.outputs.cache-hit != 'true'
-              run: yarn install --frozen-lockfile
-
     lint:
         runs-on: ubuntu-latest
-        needs: install
-        if: "!contains(github.event.head_commit.message, '[skip ci]')"
         steps:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v1
               with:
                   node-version: 12.x
 
-            - uses: actions/cache@v2
-              id: yarn-cache
-              with:
-                  path: '**/node_modules'
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+            - uses: c-hive/gha-yarn-cache@v1
+            - run: yarn install --frozen-lockfile
 
             - name: Lint
-              run: |
-                  yarn d2-style js check
-                  yarn d2-style text check
+              run: yarn d2-style check
 
     test:
         runs-on: ubuntu-latest
-        needs: install
-        if: "!contains(github.event.head_commit.message, '[skip ci]')"
         steps:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v1
               with:
                   node-version: 12.x
 
-            - uses: actions/cache@v2
-              id: yarn-cache
-              with:
-                  path: '**/node_modules'
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+            - uses: c-hive/gha-yarn-cache@v1
+            - run: yarn install --frozen-lockfile
 
             - name: Smoke
               run: ./packages/main/bin/d2 debug system
@@ -79,22 +51,18 @@ jobs:
 
     publish:
         runs-on: ubuntu-latest
-        needs: [install, lint, test]
-        if: "!contains(github.event.head_commit.message, '[skip ci]')"
+        needs: [lint, test]
+        if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
         steps:
             - uses: actions/checkout@v2
               with:
                   token: ${{env.GH_TOKEN}}
-
             - uses: actions/setup-node@v1
               with:
                   node-version: 12.x
 
-            - uses: actions/cache@v2
-              id: yarn-cache
-              with:
-                  path: '**/node_modules'
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+            - uses: c-hive/gha-yarn-cache@v1
+            - run: yarn install --frozen-lockfile
 
             - name: Publish to NPM
               run: ./packages/main/bin/d2 utils release --publish npm

.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

@@ -3,6 +3,9 @@
     "bin": {
         "d2-app": "./bin/d2-app"
     },
+    "engines": {
+        "node": ">=12"
+    },
     "version": "3.1.0",
     "main": "src/index.js",
     "author": "Austin McGee <austin@dhis2.org>",
@@ -12,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,12 +7,15 @@
     "author": "Austin McGee <austin@dhis2.org>",
     "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": {
         "d2-cluster": "./bin/d2-cluster"
     },
+    "engines": {
+        "node": ">=12"
+    },
     "publishConfig": {
         "access": "public"
     }

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,9 +8,12 @@
     "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": {
+        "node": ">=12"
+    },
     "publishConfig": {
         "access": "public"
     }

packages/create/package.json

@@ -3,14 +3,17 @@
     "bin": {
         "d2-create": "./bin/d2-create"
     },
+    "engines": {
+        "node": ">=12"
+    },
     "version": "3.1.0",
     "main": "src/index.js",
     "author": "Austin McGee <austin@dhis2.org>",
     "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

@@ -9,14 +9,14 @@
     ],
     "license": "BSD-3-Clause",
     "engines": {
-        "node": ">=10"
+        "node": ">=12"
     },
     "dependencies": {
         "@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",