diff --git a/packages/@angular/cli/lib/config/schema.json b/packages/@angular/cli/lib/config/schema.json index 17854b6719c8..89c69e2a58b9 100644 --- a/packages/@angular/cli/lib/config/schema.json +++ b/packages/@angular/cli/lib/config/schema.json @@ -232,8 +232,7 @@ }, "tslintConfig": { "description": "Location of the tslint.json configuration.", - "type": "string", - "default": "tslint.json" + "type": "string" }, "exclude": { "description": "File glob(s) to ignore.", diff --git a/tests/e2e/tests/lint/lint-with-nested-configs.ts b/tests/e2e/tests/lint/lint-with-nested-configs.ts new file mode 100644 index 000000000000..244cd82922ee --- /dev/null +++ b/tests/e2e/tests/lint/lint-with-nested-configs.ts @@ -0,0 +1,23 @@ +import { createDir, writeFile } from '../../utils/fs'; +import { ng } from '../../utils/process'; +import { expectToFail } from '../../utils/utils'; + +export default function () { + const fileName = 'src/app/foo/foo.ts'; + const nestedConfigContent = ` + { + "rules": { + "quotemark": [ + true, + "double", + "avoid-escape" + ] + } + }`; + + return Promise.resolve() + .then(() => createDir('src/app/foo')) + .then(() => writeFile(fileName, 'const foo = \'\';\n')) + .then(() => writeFile('src/app/foo/tslint.json', nestedConfigContent)) + .then(() => expectToFail(() => ng('lint'))); +}