Merge pull request #439 from dhis2/next

chore(release): release next on latest

CHANGELOG.md

@@ -1,6 +1,38 @@
+# [10.1.0](https://github.com/dhis2/cli-style/compare/v10.0.0...v10.1.0) (2021-10-29)
+
+
+### Bug Fixes
+
+* **add:** add project config for dhis2-artifacts workflow ([469c542](https://github.com/dhis2/cli-style/commit/469c5425d6a5ac9edffdd20020dbd4178e6c40c4))
+* **ls-lint:** improve configuration template to fit most projects ([bd7ced7](https://github.com/dhis2/cli-style/commit/bd7ced78b78d004b1cf31b3d83ffdfe48668f378))
+* **ls-lint:** improve ls-lint.yml so it works for normal and mono-repos ([d31e854](https://github.com/dhis2/cli-style/commit/d31e854d6aa22da74dd630e68d4698dc0251d8be))
+
+
+### Features
+
+* **renovate:** add renovate configuration setup ([89c9cc9](https://github.com/dhis2/cli-style/commit/89c9cc9178e2b98c949b016ee67c63b7e23393ce))
+
+# [10.0.0](https://github.com/dhis2/cli-style/compare/v9.2.1...v10.0.0) (2021-09-20)
+
+
+### Bug Fixes
+
+* **prettier:** update configuration to latest ([b40f6e7](https://github.com/dhis2/cli-style/commit/b40f6e7922f5cdfd895af4950a56bbab9f51694d))
+
+### Features
+
+* **eslint:** enforce file extensions within the import path ([8f38ad1](https://github.com/dhis2/cli-style/commit/8f38ad1361f03863a4de089bd55f2e3edcdccd7e))
+
+
+### BREAKING CHANGES
+
+* **eslint:** import statements must specify the extension and will
+now throw an error. The only exception is package imports.
+
 ## [9.3.1](https://github.com/dhis2/cli-style/compare/v9.3.0...v9.3.1) (2021-09-29)
 
 
+
 ### Bug Fixes
 
 * **add:** add project config for dhis2-artifacts workflow ([469c542](https://github.com/dhis2/cli-style/commit/469c5425d6a5ac9edffdd20020dbd4178e6c40c4))

config/eslint.config.js

@@ -51,5 +51,6 @@ module.exports = {
  },
  ],
  curly: ['error'],
+ 'import/extensions': ['error', 'ignorePackages'],
  },
 }

config/prettier.config.js

@@ -4,15 +4,18 @@ module.exports = {
  useTabs: false,
  semi: false,
  singleQuote: true,
+ quoteProps: 'as-needed',
+ jsxSingleQuote: false,
  trailingComma: 'es5',
  bracketSpacing: true,
- jsxBracketSameLine: false,
- jsxSingleQuote: false,
- arrowParens: 'avoid',
+ bracketSameLine: false,
+ arrowParens: 'always',
  rangeStart: 0,
  rangeEnd: Infinity,
- proseWrap: 'preserve',
  requirePragma: false,
  insertPragma: false,
+ proseWrap: 'preserve',
+ htmlWhitespaceSensitivity: 'css',
  endOfLine: 'lf',
+ embeddedLanguageFormatting: 'auto',
 }

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@dhis2/cli-style",
- "version": "9.3.1",
+ "version": "10.1.0",
  "description": "The code and commit style for DHIS2.",
  "repository": {
  "type": "git",
@@ -40,7 +40,7 @@
  "husky": "^7.0.2",
  "micromatch": "^4.0.4",
  "perfy": "^1.1.5",
- "prettier": "^2.3.1",
+ "prettier": "^2.4.1",
  "semver": "^7.3.5",
  "yargs": "^16.2.0"
  },

src/commands.js

@@ -1,6 +1,6 @@
 const { packageConfigs, styleConfig } = require('./utils/config.js')
 
-module.exports = yargs =>
+module.exports = (yargs) =>
  yargs
  .config({
  config: {

src/commands/actions/editorconfig.js

@@ -5,7 +5,7 @@ exports.command = 'editorconfig [type]'
 
 exports.desc = 'Add the editorconfig configuration to the project.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .positional('type', {
  describe: 'Template to use for EditorConfig',
@@ -21,7 +21,7 @@ exports.builder = yargs =>
  'Adds the standard configuration to .editorconfig'
  )
 
-exports.handler = argv => {
+exports.handler = (argv) => {
  const { add, type, overwrite } = argv
 
  log.info(`editorconfig > ${add ? 'add' : 'remove'}`)

src/commands/actions/eslint.js

@@ -5,7 +5,7 @@ exports.command = 'eslint [type]'
 
 exports.desc = 'Add ESLint configuration to the project.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .positional('type', {
  describe: 'Configuration template for ESLint.',
@@ -18,7 +18,7 @@ exports.builder = yargs =>
  type: 'boolean',
  })
 
-exports.handler = argv => {
+exports.handler = (argv) => {
  const { add, type, overwrite } = argv
 
  log.info(`eslint > ${add ? 'add' : 'remove'}`)

src/commands/actions/git-hook.js

@@ -4,7 +4,7 @@ const { husky, supportedHooks } = require('../../tools/husky.js')
 const { remove } = require('../../utils/config.js')
 const { CONSUMING_ROOT, PROJECT_HOOKS_DIR } = require('../../utils/paths.js')
 
-const defaultCommand = type =>
+const defaultCommand = (type) =>
  `echo "To customize this hook, edit ${type} in ${path.relative(
  CONSUMING_ROOT,
  PROJECT_HOOKS_DIR
@@ -14,7 +14,7 @@ exports.command = 'git-hook <type> [command]'
 
 exports.desc = 'Add Git Hooks to the project.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .positional('type', {
  describe: 'Git Hook to register a command against.',
@@ -39,7 +39,7 @@ exports.builder = yargs =>
  'Applies code style to staged files before committing.'
  )
 
-exports.handler = argv => {
+exports.handler = (argv) => {
  const { add, type, command, overwrite } = argv
 
  log.info(`git-hook > ${add ? 'add' : 'remove'}`)

src/commands/actions/github.js

@@ -5,7 +5,7 @@ exports.command = 'github <type>'
 
 exports.desc = 'Add configuration files for GitHub'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .positional('type', {
  describe: 'Template to use for GitHub configuration',
@@ -25,7 +25,7 @@ exports.builder = yargs =>
  'Adds the configuration file for Dependabot with DHIS2 defaults'
  )
 
-exports.handler = argv => {
+exports.handler = (argv) => {
  const { add, type, overwrite, getCache } = argv
 
  log.info(`github > ${add ? 'add' : 'remove'}`)

src/commands/actions/ls-lint.js

@@ -5,7 +5,7 @@ exports.command = 'ls-lint [type]'
 
 exports.desc = 'Lint file and directory names.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .positional('type', {
  describe: 'Configuration template to use for ls-lint',
@@ -21,7 +21,7 @@ exports.builder = yargs =>
  'Adds the standard configuration to .ls-lint.yml'
  )
 
-exports.handler = argv => {
+exports.handler = (argv) => {
  const { add, type, overwrite } = argv
 
  log.info(`ls-lint > ${add ? 'add' : 'remove'}`)

src/commands/actions/prettier.js

@@ -5,7 +5,7 @@ exports.command = 'prettier [type]'
 
 exports.desc = 'Add the Prettier configuration to the project.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .positional('type', {
  describe: 'Configuration template to use for Prettier',
@@ -21,7 +21,7 @@ exports.builder = yargs =>
  'Adds the standard configuration to .prettierrc.js'
  )
 
-exports.handler = argv => {
+exports.handler = (argv) => {
  const { add, type, overwrite } = argv
 
  log.info(`prettier > ${add ? 'add' : 'remove'}`)

src/commands/actions/renovate.js

@@ -5,7 +5,7 @@ exports.command = 'renovate [type]'
 
 exports.desc = 'Lint file and directory names.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .positional('type', {
  describe: 'Configuration template to use for Renovate',
@@ -21,7 +21,7 @@ exports.builder = yargs =>
  'Adds the standard configuration to renovate.json'
  )
 
-exports.handler = argv => {
+exports.handler = (argv) => {
  const { add, type, overwrite } = argv
 
  log.info(`renovate > ${add ? 'add' : 'remove'}`)

src/commands/add.js

@@ -2,7 +2,7 @@ exports.command = 'add'
 
 exports.describe = 'Add a configuration file for a tool to the project.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .commandDir('actions')
  .config({

src/commands/apply.js

@@ -9,7 +9,7 @@ exports.command = 'apply'
 exports.describe =
  'Apply code format and fix all lint issues that can be resolved automatically.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  jscmd(yargs)
  /*
  * Only list the types that can be automatically fixed here.

src/commands/check.js

@@ -8,16 +8,16 @@ const { handler: textHandler } = require('./types/structured-text.js')
 
 const statusCode = callback()
 
-exports.jscmd = yargs =>
+exports.jscmd = (yargs) =>
  yargs.command(
  '$0 [files..]',
  'default',
- yargs =>
+ (yargs) =>
  yargs.positional('files', {
  describe: '',
  type: 'string',
  }),
- argv => {
+ (argv) => {
  if (!argv.config.patterns) {
  log.warn(
  'No patterns defined, please check the configuration file'
@@ -52,7 +52,7 @@ exports.command = 'check'
 
 exports.describe = 'Run all the configured checks for format and lint.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  this.jscmd(yargs)
  /*
  * Only list the types that can be checked here.

src/commands/install.js

@@ -13,18 +13,18 @@ exports.command = 'install'
 
 exports.describe = 'Install the project configuration into the local project.'
 
-exports.builder = yargs => this.installcmd(yargs)
+exports.builder = (yargs) => this.installcmd(yargs)
 
-exports.installcmd = yargs =>
+exports.installcmd = (yargs) =>
  yargs.command(
  '$0',
  'default',
- yargs =>
+ (yargs) =>
  yargs.option('clean', {
  describe: '',
  type: 'boolean',
  }),
- argv => {
+ (argv) => {
  const { config, clean } = argv
 
  if (clean && fileExists(PROJECT_HOOKS_DIR)) {
@@ -60,7 +60,7 @@ exports.installcmd = yargs =>
  if (isSupportedHook(hookType) && !fileExists(hookPath)) {
  const hookCmds = config.hooks[hookType]
 
- hookCmds.map(hookCmd =>
+ hookCmds.map((hookCmd) =>
  husky({
  command: 'add',
  hookType,

src/commands/remove.js

@@ -2,7 +2,7 @@ exports.command = 'remove'
 
 exports.describe = 'Removes specified tool configuration files.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .commandDir('actions')
  .config({

src/commands/types/commit.js

@@ -11,7 +11,7 @@ exports.command = 'commit [file]'
 
 exports.desc = 'Commit message validations.'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs
  .positional('file', {
  describe: 'File that contains the commit message',
@@ -23,7 +23,7 @@ exports.builder = yargs =>
  type: 'string',
  })
 
-exports.handler = argv => {
+exports.handler = (argv) => {
  log.info(`commit-msg > commitlint`)
 
  if (!gitEnabled()) {

src/commands/types/file-system.js

@@ -7,7 +7,7 @@ exports.command = 'fs'
 exports.aliases = ['file-system']
 exports.desc = 'Lint file and directory names.'
 
-exports.builder = yargs => yargs
+exports.builder = (yargs) => yargs
 
 exports.handler = (argv, callback) => {
  const finalStatus = callback || runCb()

src/commands/types/javascript.js

@@ -15,7 +15,7 @@ exports.aliases = ['javascript']
 
 exports.desc = 'JavaScript code style'
 
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs.positional('files', {
  describe: '',
  type: 'string',

src/commands/types/structured-text.js

@@ -11,7 +11,7 @@ const {
 exports.command = 'text [files..]'
 exports.aliases = ['structured-text']
 exports.desc = 'Structured text style'
-exports.builder = yargs =>
+exports.builder = (yargs) =>
  yargs.positional('files', {
  describe: '',
  type: 'string',

src/tools/husky.js

@@ -14,7 +14,7 @@ exports.supportedHooks = [
  'post-update',
 ]
 
-exports.isSupportedHook = hook => this.supportedHooks.includes(hook)
+exports.isSupportedHook = (hook) => this.supportedHooks.includes(hook)
 
 exports.husky = ({ command, hookType, hookCmd, callback }) => {
  const cmd = 'husky'