Skip to content

fix(@angular-devkit/build-angular): clear diagnostic cache when external templates change with esbuild builders #25940

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
clydin merged 1 commit into from
Oct 4, 2023
Merged

fix(@angular-devkit/build-angular): clear diagnostic cache when external templates change with esbuild builders #25940

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
29 changes: 20 additions & 9 deletions ...ges/angular_devkit/build_angular/src/tools/esbuild/angular/compilation/aot-compilation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class AotCompilation extends AngularCompilation {
let usingBuildInfo = false;
if (!oldProgram) {
oldProgram = ts.readBuilderProgram(compilerOptions, host);
usingBuildInfo = true;
usingBuildInfo = !!oldProgram;
}

const typeScriptProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
Expand All @@ -93,6 +93,25 @@ export class AotCompilation extends AngularCompilation {
findAffectedFiles(typeScriptProgram, angularCompiler, usingBuildInfo),
);

// Get all files referenced in the TypeScript/Angular program including component resources
const referencedFiles = typeScriptProgram
.getSourceFiles()
.filter((sourceFile) => !angularCompiler.ignoreForEmit.has(sourceFile))
.flatMap((sourceFile) => {
const resourceDependencies = angularCompiler.getResourceDependencies(sourceFile);

// Also invalidate Angular diagnostics for a source file if component resources are modified
if (this.#state && hostOptions.modifiedFiles?.size) {
for (const resourceDependency of resourceDependencies) {
if (hostOptions.modifiedFiles.has(resourceDependency)) {
this.#state.diagnosticCache.delete(sourceFile);
}
}
}

return [sourceFile.fileName, ...resourceDependencies];
});

this.#state = new AngularCompilationState(
angularProgram,
host,
Expand All @@ -103,14 +122,6 @@ export class AotCompilation extends AngularCompilation {
this.#state?.diagnosticCache,
);

const referencedFiles = typeScriptProgram
.getSourceFiles()
.filter((sourceFile) => !angularCompiler.ignoreForEmit.has(sourceFile))
.flatMap((sourceFile) => [
sourceFile.fileName,
...angularCompiler.getResourceDependencies(sourceFile),
]);

return { affectedFiles, compilerOptions, referencedFiles };
}

Expand Down