Skip to content

Fix CI #33639

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 2 commits into from
Jul 23, 2026
+11 −11
Merged

Fix CI #33639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ce93e
test: allow hyphens in hash for server routes preload links
alan-agius4 Jul 23, 2026
e0dcf4e
fix(@angular/build): support hyphens and underscores when stripping c…
alan-agius4 Jul 23, 2026
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
4 changes: 2 additions & 2 deletions packages/angular/build/src/builders/application/chunk-optimizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ export async function optimizeChunks(
minify: { mangle: false, compress: false },
sourcemap,
chunkFileNames: (chunkInfo) =>
`${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`,
`${chunkInfo.name.replace(/-[a-zA-Z0-9_-]{8}$/, '')}-[hash].js`,
});
optimizedOutput = result.output;
} else {
Expand All @@ -324,7 +324,7 @@ export async function optimizeChunks(
compact: true,
sourcemap,
chunkFileNames: (chunkInfo) =>
`${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`,
`${chunkInfo.name.replace(/-[a-zA-Z0-9_-]{8}$/, '')}-[hash].js`,
});
optimizedOutput = result.output;
}
Expand Down
18 changes: 9 additions & 9 deletions tests/e2e/tests/build/server-rendering/server-routes-preload-links.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,36 +137,36 @@ const RESPONSE_EXPECTS: Record<
}
> = {
'/': {
matches: [/<link rel="modulepreload" href="(home-[a-zA-Z0-9_]{8}\.js)">/],
matches: [/<link rel="modulepreload" href="(home-[a-zA-Z0-9_-]{8}\.js)">/],
notMatches: [/ssg\-component/, /ssr/, /csr/, /cross-dep-/],
},
'/ssg': {
matches: [
/<link rel="modulepreload" href="(ssg\.routes-[a-zA-Z0-9_]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg-component-[a-zA-Z0-9_]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg\.routes-[a-zA-Z0-9_-]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg-component-[a-zA-Z0-9_-]{8}\.js)">/,
],
notMatches: [/home/, /ssr/, /csr/, /ssg-one/, /ssg-two/, /cross-dep-/],
},
'/ssg/one': {
matches: [
/<link rel="modulepreload" href="(ssg\.routes-[a-zA-Z0-9_]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg-one-[a-zA-Z0-9_]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg\.routes-[a-zA-Z0-9_-]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg-one-[a-zA-Z0-9_-]{8}\.js)">/,
],
notMatches: [/home/, /ssr/, /csr/, /ssg-two/, /ssg\-component/, /cross-dep-/],
},
'/ssg/two': {
matches: [
/<link rel="modulepreload" href="(ssg\.routes-[a-zA-Z0-9_]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg-two-[a-zA-Z0-9_]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg\.routes-[a-zA-Z0-9_-]{8}\.js)">/,
/<link rel="modulepreload" href="(ssg-two-[a-zA-Z0-9_-]{8}\.js)">/,
],
notMatches: [/home/, /ssr/, /csr/, /ssg-one/, /ssg\-component/, /cross-dep-/],
},
'/ssr': {
matches: [/<link rel="modulepreload" href="(ssr-[a-zA-Z0-9_]{8}\.js)">/],
matches: [/<link rel="modulepreload" href="(ssr-[a-zA-Z0-9_-]{8}\.js)">/],
notMatches: [/home/, /ssg\-component/, /csr/],
},
'/csr': {
matches: [/<link rel="modulepreload" href="(csr-[a-zA-Z0-9_]{8}\.js)">/],
matches: [/<link rel="modulepreload" href="(csr-[a-zA-Z0-9_-]{8}\.js)">/],
notMatches: [/home/, /ssg\-component/, /ssr/, /cross-dep-/],
},
};
Expand Down
Loading