Fix ESLint 6 support (#7513)

* Remove extends restriction to fix ESLint 6 support

* Attempt to resolve CI errors
This commit is contained in:
Ian Schmitz
2019-08-13 10:24:29 -07:00
committed by Ian Sutherland
parent 4a84cd4c70
commit cbaed7f9ff
2 changed files with 3 additions and 9 deletions

View File

@@ -347,14 +347,8 @@ module.exports = function(webpackEnv) {
// A config couldn't be found.
}
// We allow overriding the config, only if it extends our config
// (`extends` can be a string or array of strings).
if (
process.env.EXTEND_ESLINT &&
eslintConfig &&
eslintConfig.extends &&
eslintConfig.extends.includes('react-app')
) {
// We allow overriding the config only if the env variable is set
if (process.env.EXTEND_ESLINT && eslintConfig) {
return eslintConfig;
} else {
return {