Skip to content

fix(@angular-devkit/build-angular): ensure preload hints for external stylesheets are marked as styles #25442

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
alan-agius4 merged 1 commit into from
Jun 26, 2023
Merged

fix(@angular-devkit/build-angular): ensure preload hints for external stylesheets are marked as styles #25442

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ..._devkit/build_angular/src/builders/application/tests/behavior/index-preload-hints_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
harness
.expectFile('dist/index.html')
.content.toContain(
'<link rel="preload" href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Roboto:wght@300;400;500;700&display=swap">',
'<link rel="preload" href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Roboto:wght@300;400;500;700&display=swap" as="style">',
);
});
});
Expand Down
4 changes: 3 additions & 1 deletion packages/angular_devkit/build_angular/src/tools/esbuild/index-html-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ export function generateIndexHtml(
if (value.type === 'script') {
hints.push({ url: key, mode: 'modulepreload' as const });
} else if (value.type === 'style') {
hints.push({ url: key, mode: 'preload' as const });
// Provide an "as" value of "style" to ensure external URLs which may not have a
// file extension are treated as stylesheets.
hints.push({ url: key, mode: 'preload' as const, as: 'style' });
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface AugmentIndexHtmlOptions {
entrypoints: Entrypoint[];
/** Used to set the document default locale */
lang?: string;
hints?: { url: string; mode: string }[];
hints?: { url: string; mode: string; as?: string }[];
}

export interface FileInfo {
Expand Down Expand Up @@ -152,6 +152,11 @@ export async function augmentIndexHtml(
case '.css':
attrs.push('as="style"');
break;
default:
if (hint.as) {
attrs.push(`as="${hint.as}"`);
}
break;
}
}

Expand Down
23 changes: 23 additions & 0 deletions packages/angular_devkit/build_angular/src/utils/index-file/augment-index-html_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,29 @@ describe('augment-index-html', () => {
`);
});

it(`should add prefetch/preload hints with as=style when specified with a URL and an 'as' option`, async () => {
const { content, warnings } = await augmentIndexHtml({
...indexGeneratorOptions,
hints: [
{ mode: 'prefetch', url: 'https://example.com/x?a=1', as: 'style' },
{ mode: 'preload', url: 'http://example.com/y?b=2', as: 'style' },
],
});

expect(warnings).toHaveSize(0);
expect(content).toEqual(oneLineHtml`
<html>
<head>
<base href="/">
<link rel="prefetch" href="https://example.com/x?a=1" as="style">
<link rel="preload" href="http://example.com/y?b=2" as="style">
</head>
<body>
</body>
</html>
`);
});

it('should add `.mjs` script tags', async () => {
const { content } = await augmentIndexHtml({
...indexGeneratorOptions,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/utils/index-file/index-html-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export interface IndexHtmlGeneratorProcessOptions {
baseHref: string | undefined;
outputPath: string;
files: FileInfo[];
hints?: { url: string; mode: HintMode }[];
hints?: { url: string; mode: HintMode; as?: string }[];
}

export interface IndexHtmlGeneratorOptions {
Expand Down