Skip to content

Commit 492c879

Browse files
committed
refactor(@ngtools/webpack): consolidate diagnostic helper functions
All the webpack related diagnostic helplers are now located in one file which simplifies maintenance and reduces the number of required imports.
1 parent beb78ef commit 492c879

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
import { Diagnostics, formatDiagnostics } from '@angular/compiler-cli';
1010
import { DiagnosticCategory } from 'typescript';
11-
import { Compilation } from 'webpack';
12-
import { addError, addWarning } from '../webpack-diagnostics';
11+
import type { Compilation } from 'webpack';
1312

1413
export type DiagnosticsReporter = (diagnostics: Diagnostics) => void;
1514

@@ -25,3 +24,11 @@ export function createDiagnosticsReporter(compilation: Compilation): Diagnostics
2524
}
2625
};
2726
}
27+
28+
export function addWarning(compilation: Compilation, message: string): void {
29+
compilation.warnings.push(new compilation.compiler.webpack.WebpackError(message));
30+
}
31+
32+
export function addError(compilation: Compilation, message: string): void {
33+
compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
34+
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ import type { Compilation, Compiler, Module, NormalModule } from 'webpack';
1414
import { NgccProcessor } from '../ngcc_processor';
1515
import { TypeScriptPathsPlugin } from '../paths-plugin';
1616
import { WebpackResourceLoader } from '../resource_loader';
17-
import { addError, addWarning } from '../webpack-diagnostics';
1817
import { SourceFileCache } from './cache';
19-
import { DiagnosticsReporter, createDiagnosticsReporter } from './diagnostics';
18+
import {
19+
DiagnosticsReporter,
20+
addError,
21+
addWarning,
22+
createDiagnosticsReporter,
23+
} from './diagnostics';
2024
import {
2125
augmentHostWithCaching,
2226
augmentHostWithDependencyCollection,

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)