Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-16 10:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/build): avoid deploy URL usage on absolute preload links

Browse Source 
The `deployUrl` option was unintentionally being prepended to preload
links with absolute URLs within the generated index HTML for an appplication.
This has now been corrected and absolute URLs will not be altered when a
deploy URL is configured.
This commit is contained in:
Charles Lyding 2024-12-03 10:46:51 -05:00 committed by Alan Agius
parent cd5e119ab7
commit a8ea9cf6ad
2 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/angular/build/src/utils/index-file/augment-index-html.ts
View File

@ -65,17 +65,8 @@ export interface FileInfo {
export async function augmentIndexHtml(
params: AugmentIndexHtmlOptions,
): Promise<{ content: string; warnings: string[]; errors: string[] }> {
const {
loadOutputFile,
files,
entrypoints,
sri,
deployUrl = '',
lang,
baseHref,
html,
imageDomains,
} = params;
const { loadOutputFile, files, entrypoints, sri, deployUrl, lang, baseHref, html, imageDomains } =
params;
const warnings: string[] = [];
const errors: string[] = [];
@ -117,7 +108,7 @@ export async function augmentIndexHtml(
let scriptTags: string[] = [];
for (const [src, isModule] of scripts) {
const attrs = [`src="${deployUrl}${src}"`];
const attrs = [`src="${generateUrl(src, deployUrl)}"`];
// This is also need for non entry-points as they may contain problematic code.
if (isModule) {
@ -141,7 +132,7 @@ export async function augmentIndexHtml(
let headerLinkTags: string[] = [];
let bodyLinkTags: string[] = [];
for (const src of stylesheets) {
const attrs = [`rel="stylesheet"`, `href="${deployUrl}${src}"`];
const attrs = [`rel="stylesheet"`, `href="${generateUrl(src, deployUrl)}"`];
if (crossOrigin !== 'none') {
attrs.push(`crossorigin="${crossOrigin}"`);
@ -157,7 +148,7 @@ export async function augmentIndexHtml(
if (params.hints?.length) {
for (const hint of params.hints) {
const attrs = [`rel="${hint.mode}"`, `href="${deployUrl}${hint.url}"`];
const attrs = [`rel="${hint.mode}"`, `href="${generateUrl(hint.url, deployUrl)}"`];
if (hint.mode !== 'modulepreload' && crossOrigin !== 'none') {
// Value is considered anonymous by the browser when not present or empty
@ -303,6 +294,19 @@ function generateSriAttributes(content: string): string {
return `integrity="${algo}-${hash}"`;
}
function generateUrl(value: string, deployUrl: string | undefined): string {
if (!deployUrl) {
return value;
}
// Skip if root-relative, absolute or protocol relative url
if (/^((?:\w+:)?\/\/|data:|chrome:|\/)/.test(value)) {
return value;
}
return `${deployUrl}${value}`;
}
function updateAttribute(
tag: { attrs: { name: string; value: string }[] },
name: string,

40
packages/angular/build/src/utils/index-file/augment-index-html_spec.ts
View File

@ -398,6 +398,46 @@ describe('augment-index-html', () => {
`);
});
it(`should not add deploy URL to hints with an absolute URL`, async () => {
const { content, warnings } = await augmentIndexHtml({
...indexGeneratorOptions,
deployUrl: 'https://localhost/',
hints: [{ mode: 'preload', url: 'http://example.com/y?b=2' }],
});
expect(warnings).toHaveSize(0);
expect(content).toEqual(oneLineHtml`
<html>
<head>
<base href="/">
<link rel="preload" href="http://example.com/y?b=2">
</head>
<body>
</body>
</html>
`);
});
it(`should not add deploy URL to hints with a root-relative URL`, async () => {
const { content, warnings } = await augmentIndexHtml({
...indexGeneratorOptions,
deployUrl: 'https://example.com/',
hints: [{ mode: 'preload', url: '/y?b=2' }],
});
expect(warnings).toHaveSize(0);
expect(content).toEqual(oneLineHtml`
<html>
<head>
<base href="/">
<link rel="preload" href="/y?b=2">
</head>
<body>
</body>
</html>
`);
});
it('should add `.mjs` script tags', async () => {
const { content } = await augmentIndexHtml({
...indexGeneratorOptions,