diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd61b718..5d26cb00e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.0.2](https://github.com/dhis2/app-platform/compare/v3.0.1...v3.0.2) (2019-12-20) + + +### Bug Fixes + +* add an eslint config to shell, falling back to react-app defaults ([#222](https://github.com/dhis2/app-platform/issues/222)) ([2c7deae](https://github.com/dhis2/app-platform/commit/2c7deaea257a0b0780a2b5372335219a9a302d52)) + ## [3.0.1](https://github.com/dhis2/app-platform/compare/v3.0.0...v3.0.1) (2019-12-20) diff --git a/cli/package.json b/cli/package.json index 63f12eea1..0777c4aba 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/cli-app-scripts", - "version": "3.0.1", + "version": "3.0.2", "main": "src/index.js", "repository": "https://github.com/amcgee/dhis2-app-platform", "author": "Austin McGee ", diff --git a/package.json b/package.json index 9dedd9c94..f11160a9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "root", - "version": "3.0.1", + "version": "3.0.2", "private": true, "repository": { "type": "git", diff --git a/shell/.eslintrc.js b/shell/.eslintrc.js new file mode 100644 index 000000000..cd34c873b --- /dev/null +++ b/shell/.eslintrc.js @@ -0,0 +1,13 @@ +const fs = require('fs'), + path = require('path') + +const customConfigFile = path.resolve('../../.eslintrc.js') +const hasCustomConfig = fs.existsSync(customConfigFile) + +const extendsArray = hasCustomConfig + ? [require(customConfigFile)] + : ['react-app'] + +module.exports = { + extends: extendsArray, +}