Skip to content

fix(@angular-devkit/build-angular): don't log blank warnings in console #18529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2020
Merged

fix(@angular-devkit/build-angular): don't log blank warnings in console #18529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ export function statsToString(json: any, statsConfig: any) {
}

// TODO(#16193): Don't emit this warning in the first place rather than just suppressing it.
const ERRONEOUS_WARNINGS = [
const ERRONEOUS_WARNINGS_FILTER = (warning: string) => ![
/multiple assets emit different content.*3rdpartylicenses\.txt/i,
];
export function statsWarningsToString(json: any, statsConfig: any) {
].some(msg => msg.test(warning));

export function statsWarningsToString(json: any, statsConfig: any): string {
const colors = statsConfig.colors;
const rs = (x: string) => colors ? reset(x) : x;
const y = (x: string) => colors ? bold(yellow(x)) : x;
Expand All @@ -104,12 +105,12 @@ export function statsWarningsToString(json: any, statsConfig: any) {

return rs('\n' + warnings
.map((warning: any) => `${warning}`)
.filter((warning: string) => !ERRONEOUS_WARNINGS.some((erroneous) => erroneous.test(warning)))
.filter(ERRONEOUS_WARNINGS_FILTER)
.map((warning: string) => y(`WARNING in ${warning}`))
.join('\n\n'));
}

export function statsErrorsToString(json: any, statsConfig: any) {
export function statsErrorsToString(json: any, statsConfig: any): string {
const colors = statsConfig.colors;
const rs = (x: string) => colors ? reset(x) : x;
const r = (x: string) => colors ? bold(red(x)) : x;
Expand All @@ -120,16 +121,18 @@ export function statsErrorsToString(json: any, statsConfig: any) {
.reduce((a: string[], b: string[]) => [...a, ...b], [])
);
}

return rs('\n' + errors
.map((error: any) => r(`ERROR in ${error}`))
.join('\n\n')
);
}

export function statsHasErrors(json: any): boolean {
return json.errors.length > 0 || !!json.children?.some((c: any) => c.errors.length);
return json.errors.length || !!json.children?.some((c: any) => c.errors.length);
}

export function statsHasWarnings(json: any): boolean {
return json.warnings.length > 0 || !!json.children?.some((c: any) => c.warnings.length);
return json.warnings.filter(ERRONEOUS_WARNINGS_FILTER).length ||
!!json.children?.some((c: any) => c.warnings.filter(ERRONEOUS_WARNINGS_FILTER).length);
}
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_angular/src/browser/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ export function createBrowserLoggingCallback(
logger.info(statsToString(json, config.stats));
}

if (stats.hasWarnings()) {
if (statsHasWarnings(json)) {
logger.warn(statsWarningsToString(json, config.stats));
}
if (stats.hasErrors()) {
if (statsHasErrors(json)) {
logger.error(statsErrorsToString(json, config.stats));
}
};
Expand Down
6 changes: 3 additions & 3 deletions packages/angular_devkit/build_angular/src/extract-i18n/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
getStatsConfig,
getStylesConfig,
} from '../angular-cli-files/models/webpack-configs';
import { statsErrorsToString, statsWarningsToString } from '../angular-cli-files/utilities/stats';
import { statsErrorsToString, statsHasErrors, statsHasWarnings, statsWarningsToString } from '../angular-cli-files/utilities/stats';
import { Schema as BrowserBuilderOptions } from '../browser/schema';
import { createI18nOptions } from '../utils/i18n-options';
import { assertCompatibleAngularVersion } from '../utils/version';
Expand Down Expand Up @@ -127,11 +127,11 @@ export async function execute(
const logging: WebpackLoggingCallback = (stats, config) => {
const json = stats.toJson({ errors: true, warnings: true });

if (stats.hasWarnings()) {
if (statsHasWarnings(json)) {
context.logger.warn(statsWarningsToString(json, config.stats));
}

if (stats.hasErrors()) {
if (statsHasErrors(json)) {
context.logger.error(statsErrorsToString(json, config.stats));
}
};
Expand Down