feat: upgrade @dhis2/cli-style to 5.0.2, don't auto-format code in pr…

…e-commit hook (#208) * fix: upgrade @dhis2/cli-helpers-engine to 1.5 and remove chalk * chore: upgrade utils-docsite * chore(deps): upgrade @dhis2/cli-app-scripts * chore(deps): upgrade @dhis2/cli-helpers-template * feat: upgrade cli-style to support non-js codebases
dhis2 · Nov 26, 2019 · c2f8eea · c2f8eea
1 parent 45ae53d
commit c2f8eea
Show file tree

Hide file tree

Showing 23 changed files with 776 additions and 662 deletions.
diff --git a/.browserslistrc b/.browserslistrc
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -1,7 +1,16 @@
 version: 1
 
 update_configs:
-  - package_manager: "javascript"
-    directory: "/"
-    update_schedule: "live"
-    version_requirement_updates: "increase_versions"
+    - package_manager: 'javascript'
+      directory: '/'
+      update_schedule: 'daily'
+      version_requirement_updates: 'increase_versions'
+      target_branch: 'master'
+      automerged_updates:
+          - match:
+                dependency_name: '@dhis2/*'
+                dependency_type: 'all'
+                update_type: 'semver:minor'
+          - match:
+                dependency_type: 'all'
+                update_type: 'security:patch'
diff --git a/.huskyrc.js b/.huskyrc.js
@@ -1,6 +1,13 @@
+const { config } = require('@dhis2/cli-style')
+
+const tasks = arr => arr.join(' && ')
+
 module.exports = {
     hooks: {
-        'commit-msg': 'd2-style commit check',
-        'pre-commit': 'd2-style validate',
+        ...config.husky.hooks,
+        'pre-commit': tasks([
+            'd2-style js check --staged',
+            'd2-style text check --staged',
+        ]),
     },
 }
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     ],
     "license": "BSD-3-Clause",
     "devDependencies": {
-        "@dhis2/cli-style": "4.2.0",
+        "@dhis2/cli-style": "^5.0.2",
         "tape": "^4.11.0",
         "tape-await": "^0.1.2"
     },

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,21 +1,21 @@
 {
-    "name": "@dhis2/cli-app",
-    "bin": {
-        "d2-app": "./bin/d2-app"
-    },
-    "version": "2.6.1",
-    "main": "src/index.js",
-    "author": "Austin McGee <austin@dhis2.org>",
-    "contributors": [
-        "Viktor Varland <viktor@dhis2.org>"
-    ],
-    "license": "BSD-3-Clause",
-    "private": false,
-    "dependencies": {
-        "@dhis2/cli-app-scripts": "^1.5.9",
-        "@dhis2/cli-helpers-engine": "1.4.2"
-    },
-    "publishConfig": {
-        "access": "public"
-    }
+  "name": "@dhis2/cli-app",
+  "bin": {
+    "d2-app": "./bin/d2-app"
+  },
+  "version": "2.6.1",
+  "main": "src/index.js",
+  "author": "Austin McGee <austin@dhis2.org>",
+  "contributors": [
+    "Viktor Varland <viktor@dhis2.org>"
+  ],
+  "license": "BSD-3-Clause",
+  "private": false,
+  "dependencies": {
+    "@dhis2/cli-app-scripts": "^1.5.10",
+    "@dhis2/cli-helpers-engine": "1.5.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }
diff --git a/packages/app/src/commands/i18n/modernize.js b/packages/app/src/commands/i18n/modernize.js
@@ -98,7 +98,9 @@ const handler = ({
 }) => {
     const languagesToTransform = languages ? languages.split(/,\s*/) : []
 
-    reporter.info('Checking requirements and getting legacy translation file names')
+    reporter.info(
+        'Checking requirements and getting legacy translation file names'
+    )
     const translationFiles = getTranslationFileNames({
         inDir,
         outDir,

diff --git a/packages/cluster/package.json b/packages/cluster/package.json
@@ -1,19 +1,18 @@
 {
-    "name": "@dhis2/cli-cluster",
-    "version": "2.6.1",
-    "description": "D2 CLI module for managing DHIS2 development clusters",
-    "main": "src/index.js",
-    "repository": "https://github.com/dhis2/cli",
-    "author": "Austin McGee <austin@dhis2.org>",
-    "license": "BSD-3-Clause",
-    "dependencies": {
-        "@dhis2/cli-helpers-engine": "1.4.2",
-        "chalk": "^3.0.0"
-    },
-    "bin": {
-        "d2-cluster": "./bin/d2-cluster"
-    },
-    "publishConfig": {
-        "access": "public"
-    }
+  "name": "@dhis2/cli-cluster",
+  "version": "2.6.1",
+  "description": "D2 CLI module for managing DHIS2 development clusters",
+  "main": "src/index.js",
+  "repository": "https://github.com/dhis2/cli",
+  "author": "Austin McGee <austin@dhis2.org>",
+  "license": "BSD-3-Clause",
+  "dependencies": {
+    "@dhis2/cli-helpers-engine": "^1.5.0"
+  },
+  "bin": {
+    "d2-cluster": "./bin/d2-cluster"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }
diff --git a/packages/cluster/src/commands/down.js b/packages/cluster/src/commands/down.js
@@ -1,6 +1,5 @@
-const chalk = require('chalk')
 const path = require('path')
-const { exec, reporter } = require('@dhis2/cli-helpers-engine')
+const { exec, reporter, chalk } = require('@dhis2/cli-helpers-engine')
 const {
     initDockerComposeCache,
     resolveConfiguration,

diff --git a/packages/cluster/src/commands/list.js b/packages/cluster/src/commands/list.js
@@ -1,6 +1,4 @@
-const chalk = require('chalk')
-const path = require('path')
-const { reporter, exec, tryCatchAsync } = require('@dhis2/cli-helpers-engine')
+const { reporter, exec, chalk } = require('@dhis2/cli-helpers-engine')
 const { makeComposeProject, listClusters } = require('../common')
 const Table = require('cli-table3')
 

diff --git a/packages/cluster/src/commands/logs.js b/packages/cluster/src/commands/logs.js
@@ -1,6 +1,10 @@
-const chalk = require('chalk')
 const path = require('path')
-const { reporter, exec, tryCatchAsync } = require('@dhis2/cli-helpers-engine')
+const {
+    reporter,
+    exec,
+    tryCatchAsync,
+    chalk,
+} = require('@dhis2/cli-helpers-engine')
 const {
     initDockerComposeCache,
     makeComposeProject,

diff --git a/packages/cluster/src/commands/restart.js b/packages/cluster/src/commands/restart.js
@@ -1,6 +1,10 @@
-const chalk = require('chalk')
 const path = require('path')
-const { reporter, exec, tryCatchAsync } = require('@dhis2/cli-helpers-engine')
+const {
+    reporter,
+    exec,
+    tryCatchAsync,
+    chalk,
+} = require('@dhis2/cli-helpers-engine')
 const {
     initDockerComposeCache,
     makeComposeProject,

diff --git a/packages/cluster/src/commands/up.js b/packages/cluster/src/commands/up.js
@@ -1,6 +1,10 @@
-const chalk = require('chalk')
 const path = require('path')
-const { reporter, exec, tryCatchAsync } = require('@dhis2/cli-helpers-engine')
+const {
+    reporter,
+    exec,
+    tryCatchAsync,
+    chalk,
+} = require('@dhis2/cli-helpers-engine')
 const {
     initDockerComposeCache,
     makeEnvironment,

diff --git a/packages/cluster/src/helpers/db/backup.js b/packages/cluster/src/helpers/db/backup.js
@@ -1,7 +1,6 @@
 const { makeComposeProject } = require('../../common')
-const chalk = require('chalk')
 const path = require('path')
-const { reporter, exec } = require('@dhis2/cli-helpers-engine')
+const { reporter, exec, chalk } = require('@dhis2/cli-helpers-engine')
 
 module.exports = async ({ cacheLocation, name, path: dbPath, fat }) => {
     const destinationFile = path.resolve(dbPath)

diff --git a/packages/cluster/src/helpers/db/restore.js b/packages/cluster/src/helpers/db/restore.js
@@ -1,7 +1,6 @@
 const { makeComposeProject, substituteVersion } = require('../../common')
-const chalk = require('chalk')
 const path = require('path')
-const { reporter, exec } = require('@dhis2/cli-helpers-engine')
+const { reporter, exec, chalk } = require('@dhis2/cli-helpers-engine')
 
 const downloadDatabase = async ({ cache, dbVersion, update, url }) => {
     const ext = '.sql.gz' //dbUrl.endsWith('.gz') ? '.gz' : '.sql'

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,17 +1,17 @@
 {
-    "name": "@dhis2/create-app",
-    "version": "2.6.1",
-    "description": "D2 frontend application bootstrapping inspired by create-react-app",
-    "main": "index.js",
-    "repository": "https://github.com/dhis2/cli",
-    "author": "Austin McGee <austin@dhis2.org>",
-    "license": "BSD-3-Clause",
-    "dependencies": {
-        "@dhis2/cli-create": "2.6.1",
-        "@dhis2/cli-helpers-engine": "1.4.2"
-    },
-    "bin": "./bin/d2-create-app",
-    "publishConfig": {
-        "access": "public"
-    }
+  "name": "@dhis2/create-app",
+  "version": "2.6.1",
+  "description": "D2 frontend application bootstrapping inspired by create-react-app",
+  "main": "index.js",
+  "repository": "https://github.com/dhis2/cli",
+  "author": "Austin McGee <austin@dhis2.org>",
+  "license": "BSD-3-Clause",
+  "dependencies": {
+    "@dhis2/cli-create": "2.6.1",
+    "@dhis2/cli-helpers-engine": "1.5.0"
+  },
+  "bin": "./bin/d2-create-app",
+  "publishConfig": {
+    "access": "public"
+  }
 }
diff --git a/packages/create/package.json b/packages/create/package.json
@@ -1,22 +1,21 @@
 {
-    "name": "@dhis2/cli-create",
-    "bin": {
-        "d2-create": "./bin/d2-create"
-    },
-    "version": "2.6.1",
-    "main": "src/index.js",
-    "author": "Austin McGee <austin@dhis2.org>",
-    "license": "BSD-3-Clause",
-    "private": false,
-    "dependencies": {
-        "@dhis2/cli-helpers-engine": "1.4.2",
-        "@dhis2/cli-helpers-template": "^1.0.1",
-        "chalk": "^3.0.0",
-        "fs-extra": "^8.1.0",
-        "handlebars": "^4.5.3",
-        "inquirer": "^7.0.0"
-    },
-    "publishConfig": {
-        "access": "public"
-    }
+  "name": "@dhis2/cli-create",
+  "bin": {
+    "d2-create": "./bin/d2-create"
+  },
+  "version": "2.6.1",
+  "main": "src/index.js",
+  "author": "Austin McGee <austin@dhis2.org>",
+  "license": "BSD-3-Clause",
+  "private": false,
+  "dependencies": {
+    "@dhis2/cli-helpers-engine": "^1.5.0",
+    "@dhis2/cli-helpers-template": "^1.0.2",
+    "fs-extra": "^8.1.0",
+    "handlebars": "^4.5.3",
+    "inquirer": "^7.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }
diff --git a/packages/create/src/builders/app.js b/packages/create/src/builders/app.js
@@ -1,5 +1,4 @@
-const { reporter } = require('@dhis2/cli-helpers-engine')
-const chalk = require('chalk')
+const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
 
 const buildApp = async ({ name, ...argv }) => {
     reporter.info(

diff --git a/packages/create/src/index.js b/packages/create/src/index.js
@@ -1,6 +1,5 @@
 const path = require('path')
-const chalk = require('chalk')
-const { reporter } = require('@dhis2/cli-helpers-engine')
+const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
 const { installTemplate } = require('@dhis2/cli-helpers-template')
 
 const cliBuilder = require('./builders/cliBuilder')

diff --git a/packages/create/templates/cli/package.json b/packages/create/templates/cli/package.json
@@ -9,7 +9,7 @@
     "license": "BSD-3-Clause",
     "private": false,
     "dependencies": {
-        "@dhis2/cli-helpers-engine": "1.4.1"
+        "@dhis2/cli-helpers-engine": "^1.5.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/packages/main/package.json b/packages/main/package.json
@@ -15,8 +15,8 @@
         "@dhis2/cli-app": "2.6.1",
         "@dhis2/cli-cluster": "2.6.1",
         "@dhis2/cli-create": "2.6.1",
-        "@dhis2/cli-helpers-engine": "1.4.2",
-        "@dhis2/cli-style": "4.2.0",
+        "@dhis2/cli-helpers-engine": "1.5.0",
+        "@dhis2/cli-style": "^5.0.2",
         "@dhis2/cli-utils": "2.6.1",
         "cli-table3": "^0.5.1",
         "envinfo": "^7.5.0",

diff --git a/packages/main/src/commands/debug/cache.js b/packages/main/src/commands/debug/cache.js
@@ -1,6 +1,4 @@
-const fs = require('fs')
-const chalk = require('chalk')
-const { reporter } = require('@dhis2/cli-helpers-engine')
+const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
 const inquirer = require('inquirer')
 const Table = require('cli-table3')
 

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -12,8 +12,8 @@
     "license": "BSD-3-Clause",
     "private": false,
     "dependencies": {
-        "@dhis2/cli-helpers-engine": "1.4.2",
-        "@dhis2/cli-utils-docsite": "^1.1.1",
+        "@dhis2/cli-helpers-engine": "^1.5.0",
+        "@dhis2/cli-utils-docsite": "^1.1.2",
         "@semantic-release/changelog": "^3.0.6",
         "@semantic-release/commit-analyzer": "^6.3.3",
         "@semantic-release/git": "^7.0.18",