From 7b23508e93f556e1f7fe678f13055d9a31817696 Mon Sep 17 00:00:00 2001 From: Vladimir Bolshutkin Date: Wed, 13 Mar 2019 09:50:05 +0200 Subject: [PATCH] TSLint: merge linterOptions to preserve original options from tslint.json. Support for excluding files and folders --- src/lint/lint-factory.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lint/lint-factory.ts b/src/lint/lint-factory.ts index 38f20052..c0f2ed0e 100644 --- a/src/lint/lint-factory.ts +++ b/src/lint/lint-factory.ts @@ -79,7 +79,10 @@ export function getFileNames(context: BuildContext, program: Program): string[] */ export function getTsLintConfig(tsLintConfig: string, linterOptions?: LinterOptions): LinterConfig { const config = Configuration.loadConfigurationFromPath(tsLintConfig); - Object.assign(config, isObject(linterOptions) ? {linterOptions} : {}); + const configLinterOptions = isObject(config.linterOptions) ? config.linterOptions : {} + const ionicLinterOptions = isObject(linterOptions) ? linterOptions : {} + Object.assign(configLinterOptions, ionicLinterOptions); + Object.assign(config, isObject(linterOptions) ? {linterOptions: configLinterOptions} : {}); return config; }