refactor(@ngtools/webpack): consolidate diagnostic helper functions

packages/ngtools/webpack/src/ivy/diagnostics.ts

@@ -8,8 +8,7 @@
 
 import { Diagnostics, formatDiagnostics } from '@angular/compiler-cli';
 import { DiagnosticCategory } from 'typescript';
-import { Compilation } from 'webpack';
-import { addError, addWarning } from '../webpack-diagnostics';
+import type { Compilation } from 'webpack';
 
 export type DiagnosticsReporter = (diagnostics: Diagnostics) => void;
 
@@ -25,3 +24,11 @@ export function createDiagnosticsReporter(compilation: Compilation): Diagnostics
     }
   };
 }
+
+export function addWarning(compilation: Compilation, message: string): void {
+  compilation.warnings.push(new compilation.compiler.webpack.WebpackError(message));
+}
+
+export function addError(compilation: Compilation, message: string): void {
+  compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
+}

packages/ngtools/webpack/src/ivy/plugin.ts

@@ -14,9 +14,13 @@ import type { Compilation, Compiler, Module, NormalModule } from 'webpack';
 import { NgccProcessor } from '../ngcc_processor';
 import { TypeScriptPathsPlugin } from '../paths-plugin';
 import { WebpackResourceLoader } from '../resource_loader';
-import { addError, addWarning } from '../webpack-diagnostics';
 import { SourceFileCache } from './cache';
-import { DiagnosticsReporter, createDiagnosticsReporter } from './diagnostics';
+import {
+  DiagnosticsReporter,
+  addError,
+  addWarning,
+  createDiagnosticsReporter,
+} from './diagnostics';
 import {
   augmentHostWithCaching,
   augmentHostWithDependencyCollection,