Skip to content

Commit

Permalink
fix(@angular-devkit/build-angular): output non human readable lint re…
Browse files Browse the repository at this point in the history
…sult

At the moment, when the tslint formatted is non human readable, it is being fully silenced.

This changes this behaviour and only emit the formatted result.

Fixes #13173
  • Loading branch information
alan-agius4 authored and Keen Yee Liau committed Dec 12, 2018
1 parent a747d50 commit f7cfd54
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
15 changes: 7 additions & 8 deletions packages/angular_devkit/build_angular/src/tslint/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,11 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
const targetSpecifier = this.context.targetSpecifier;
const projectName = targetSpecifier && targetSpecifier.project || '';

// Print formatter output directly for non human-readable formats.
if (!['prose', 'verbose', 'stylish'].includes(options.format)) {
options.silent = true;
}
// Print formatter output only for non human-readable formats.
const printInfo = ['prose', 'verbose', 'stylish'].includes(options.format)
&& !options.silent;

if (!options.silent) {
if (printInfo) {
this.context.logger.info(`Linting ${JSON.stringify(projectName)}...`);
}

Expand Down Expand Up @@ -127,15 +126,15 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
}
}

if (result.warningCount > 0 && !options.silent) {
if (result.warningCount > 0 && printInfo) {
this.context.logger.warn('Lint warnings found in the listed files.');
}

if (result.errorCount > 0 && !options.silent) {
if (result.errorCount > 0 && printInfo) {
this.context.logger.error('Lint errors found in the listed files.');
}

if (result.warningCount === 0 && result.errorCount === 0 && !options.silent) {
if (result.warningCount === 0 && result.errorCount === 0 && printInfo) {
this.context.logger.info('All files pass linting.');
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ describe('Tslint Target', () => {
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
tap(() => {
expect(logger.includes('Linting "app"...')).toBe(false);
expect(logger.includes('<checkstyle')).toBe(true);
}),
).toPromise().then(done, done.fail);
}, 30000);
Expand Down

0 comments on commit f7cfd54

Please sign in to comment.