From 3ee8fbc50e689b239562ac909fa396fb3a1318eb Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Thu, 19 Oct 2017 14:14:03 +0100 Subject: [PATCH] fix(@ngtools/webpack): update formatDiagnostics call Followup to https://github.com/angular/angular/pull/19748, https://github.com/angular/angular/pull/19804 Fix #8101 --- packages/@ngtools/webpack/src/angular_compiler_plugin.ts | 4 ++-- packages/@ngtools/webpack/src/ngtools_api.ts | 2 +- packages/@ngtools/webpack/src/type_checker.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@ngtools/webpack/src/angular_compiler_plugin.ts b/packages/@ngtools/webpack/src/angular_compiler_plugin.ts index 59ba56cbc847..748c963ea30b 100644 --- a/packages/@ngtools/webpack/src/angular_compiler_plugin.ts +++ b/packages/@ngtools/webpack/src/angular_compiler_plugin.ts @@ -760,12 +760,12 @@ export class AngularCompilerPlugin implements Tapable { .filter((diag) => diag.category === ts.DiagnosticCategory.Warning); if (errors.length > 0) { - const message = formatDiagnostics(this._angularCompilerOptions, errors); + const message = formatDiagnostics(errors); this._compilation.errors.push(message); } if (warnings.length > 0) { - const message = formatDiagnostics(this._angularCompilerOptions, warnings); + const message = formatDiagnostics(warnings); this._compilation.warnings.push(message); } diff --git a/packages/@ngtools/webpack/src/ngtools_api.ts b/packages/@ngtools/webpack/src/ngtools_api.ts index ee9df8db3594..84300962336e 100644 --- a/packages/@ngtools/webpack/src/ngtools_api.ts +++ b/packages/@ngtools/webpack/src/ngtools_api.ts @@ -102,7 +102,7 @@ export interface CreateCompilerHostInterface { }): CompilerHost; } export interface FormatDiagnosticsInterface { - (options: CompilerOptions, diags: Diagnostics): string; + (diags: Diagnostics): string; } // Manually check for Compiler CLI availability and supported version. diff --git a/packages/@ngtools/webpack/src/type_checker.ts b/packages/@ngtools/webpack/src/type_checker.ts index ef20fb4f2af4..664de29d7b4a 100644 --- a/packages/@ngtools/webpack/src/type_checker.ts +++ b/packages/@ngtools/webpack/src/type_checker.ts @@ -145,12 +145,12 @@ class TypeChecker { const warnings = allDiagnostics.filter((d) => d.category === ts.DiagnosticCategory.Warning); if (errors.length > 0) { - const message = formatDiagnostics(this._angularCompilerOptions, errors); + const message = formatDiagnostics(errors); console.error(bold(red('ERROR in ' + message))); } if (warnings.length > 0) { - const message = formatDiagnostics(this._angularCompilerOptions, warnings); + const message = formatDiagnostics(warnings); console.log(bold(yellow('WARNING in ' + message))); } }