Skip to content

refactor(@angular/build): use new encapsulate style helper for HMR #28492

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
Sep 26, 2024
Merged

refactor(@angular/build): use new encapsulate style helper for HMR #28492

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: 5 additions & 6 deletions packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import type { Connect, ViteDevServer } from 'vite';
import { loadEsmModule } from '../../../utils/load-esm';
import { AngularMemoryOutputFiles, pathnameWithoutBasePath } from '../utils';

const COMPONENT_REGEX = /%COMP%/g;

export function createAngularAssetsMiddleware(
server: ViteDevServer,
assets: Map<string, string>,
Expand Down Expand Up @@ -90,12 +88,13 @@ export function createAngularAssetsMiddleware(
// Shim the stylesheet if a component ID is provided
if (componentId.length > 0) {
// Validate component ID
if (/[_.-A-Za-z0-9]+-c\d{9}$/.test(componentId)) {
if (/^[_.\-\p{Letter}\d]+-c\d{9}$/u.test(componentId)) {
loadEsmModule<typeof import('@angular/compiler')>('@angular/compiler')
.then((compilerModule) => {
const encapsulatedData = compilerModule
.encapsulateStyle(new TextDecoder().decode(data))
.replaceAll(COMPONENT_REGEX, componentId);
const encapsulatedData = compilerModule.encapsulateStyle(
new TextDecoder().decode(data),
componentId,
);

res.setHeader('Content-Type', 'text/css');
res.setHeader('Cache-Control', 'no-cache');
Expand Down