Skip to content

fix(@angular/build): avoid overwriting inline style bundling additional results #28816

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
merged 1 commit into from
Nov 8, 2024
Merged

fix(@angular/build): avoid overwriting inline style bundling additional results #28816

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
11 changes: 9 additions & 2 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 @@ -153,7 +153,6 @@ export function createCompilerPlugin(
let modifiedFiles;
if (
pluginOptions.sourceFileCache?.modifiedFiles.size &&
referencedFileTracker &&
!pluginOptions.noopTypeScriptCompilation
) {
// TODO: Differentiate between changed input files and stale output files
Expand All @@ -164,6 +163,8 @@ export function createCompilerPlugin(
if (!pluginOptions.externalRuntimeStyles) {
stylesheetBundler.invalidate(modifiedFiles);
}
// Remove any stale additional results based on modified files
modifiedFiles.forEach((file) => additionalResults.delete(file));
}

if (
Expand All @@ -181,6 +182,7 @@ export function createCompilerPlugin(
sourceFileCache: pluginOptions.sourceFileCache,
async transformStylesheet(data, containingFile, stylesheetFile, order, className) {
let stylesheetResult;
let resultSource = stylesheetFile ?? containingFile;

// Stylesheet file only exists for external stylesheets
if (stylesheetFile) {
Expand All @@ -203,6 +205,11 @@ export function createCompilerPlugin(
.digest('hex')
: undefined,
);
// Adjust result source for inline styles.
// There may be multiple inline styles with the same containing file and to ensure that the results
// do not overwrite each other the result source identifier needs to be unique for each. The class
// name and order fields can be used for this. The structure is arbitrary as long as it is unique.
resultSource += `?class=${className}&order=${order}`;
}

(result.warnings ??= []).push(...stylesheetResult.warnings);
Expand All @@ -213,7 +220,7 @@ export function createCompilerPlugin(
}

const { contents, outputFiles, metafile, referencedFiles } = stylesheetResult;
additionalResults.set(stylesheetFile ?? containingFile, {
additionalResults.set(resultSource, {
outputFiles,
metafile,
});
Expand Down