Skip to content

fix(@angular/build): ensure SVG template URLs are considered templates with external stylesheets #28767

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 1, 2024
Merged

fix(@angular/build): ensure SVG template URLs are considered templates with external stylesheets #28767

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
18 changes: 16 additions & 2 deletions packages/angular/build/src/tools/angular/angular-host.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,9 @@ export function createAngularCompilerHost(
host.resourceNameToFileName = function (resourceName, containingFile) {
const resolvedPath = nodePath.join(nodePath.dirname(containingFile), resourceName);

// All resource names that have HTML file extensions are assumed to be templates
if (resourceName.endsWith('.html') || !hostOptions.externalStylesheets) {
// All resource names that have template file extensions are assumed to be templates
// TODO: Update compiler to provide the resource type to avoid extension matching here.
if (!hostOptions.externalStylesheets || hasTemplateExtension(resolvedPath)) {
return resolvedPath;
}

Expand Down Expand Up @@ -248,3 +249,16 @@ export function createAngularCompilerHost(

return host;
}

function hasTemplateExtension(file: string): boolean {
const extension = nodePath.extname(file).toLowerCase();

switch (extension) {
case '.htm':
case '.html':
case '.svg':
return true;
}

return false;
}