Skip to content

perf(@angular/build): decouple diagnostic type checking from build start #34043

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

Open
alan-agius4 wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −10
Open

perf(@angular/build): decouple diagnostic type checking from build start #34043

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
42 changes: 32 additions & 10 deletions packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export function createCompilerPlugin(
// eslint-disable-next-line max-lines-per-function
async setup(build: PluginBuild): Promise<void> {
let setupWarnings: PartialMessage[] | undefined = [];
let diagnosticsPromise: ReturnType<AngularCompilation['diagnoseFiles']> | undefined;
const preserveSymlinks = build.initialOptions.preserveSymlinks;

// Initialize a worker pool for JavaScript transformations.
Expand Down Expand Up @@ -157,6 +158,7 @@ export function createCompilerPlugin(

// eslint-disable-next-line max-lines-per-function
build.onStart(async () => {
hasCompilationErrors = true;
await initializeHash();

const result: OnStartResult = {
Expand Down Expand Up @@ -402,15 +404,21 @@ export function createCompilerPlugin(
}
}

const diagnostics = await compilation.diagnoseFiles(
useTypeChecking ? DiagnosticModes.All : DiagnosticModes.All & ~DiagnosticModes.Semantic,
);
if (diagnostics.errors?.length) {
(result.errors ??= []).push(...diagnostics.errors);
}
if (diagnostics.warnings?.length) {
(result.warnings ??= []).push(...diagnostics.warnings);
}
const diagnosticModes = useTypeChecking
? DiagnosticModes.All
: DiagnosticModes.All & ~DiagnosticModes.Semantic;
diagnosticsPromise = compilation.diagnoseFiles(diagnosticModes).catch((error) => ({
errors: [
{
text: 'Angular compilation diagnostics failed.',
notes: [
{
text: error instanceof Error ? (error.stack ?? error.message) : String(error),
},
],
},
],
}));

// Add errors from failed additional results.
// This must be done after emit to capture latest web worker results.
Expand Down Expand Up @@ -617,7 +625,7 @@ export function createCompilerPlugin(
);
}

build.onEnd((result) => {
build.onEnd(async (result) => {
Comment thread
alan-agius4 marked this conversation as resolved.
// Ensure other compilations are unblocked if the main compilation throws during start
if (angularCompilationContext.isPrimary()) {
angularCompilationContext.markAsReady(hasCompilationErrors);
Expand All @@ -640,6 +648,20 @@ export function createCompilerPlugin(
}

logCumulativeDurations();

if (diagnosticsPromise) {
try {
const diagnostics = await diagnosticsPromise;
const errors = diagnostics.errors?.length ? diagnostics.errors : undefined;
const warnings = diagnostics.warnings?.length ? diagnostics.warnings : undefined;

if (errors || warnings) {
return { errors, warnings };
}
} finally {
diagnosticsPromise = undefined;
}
}
});

build.onDispose(() => {
Expand Down