Skip to content

fix(material/schematics): filter paths when renaming tokens #31249

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 2 commits into from
May 28, 2025
Merged

fix(material/schematics): filter paths when renaming tokens #31249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5518232
fix(material/schematics): filter paths when renaming tokens
May 28, 2025
3488a56
fix(material/schematics): include .git
May 28, 2025
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
38 changes: 28 additions & 10 deletions src/material/schematics/ng-update/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,31 @@ export function updateToV20(): Rule {
]);
}

// Whether the given path should be included when renaming theme token names.
function shouldRenameTokens(path: string) {
if (path.includes('node_modules') || path.includes('.angular') || path.includes('.git')) {
return false;
}

return (
path.endsWith('.html') ||
path.endsWith('.css') ||
path.endsWith('.scss') ||
path.endsWith('.ts')
);
}

// Renames any CSS variables beginning with "--mdc-" to be "--mat-". These CSS variables
// refer to tokens that used to be derived from a mix of MDC and Angular. Now all the tokens
// are converged on being prefixed "--mat-".
function renameMdcTokens(): Rule {
return tree => {
tree.visit(path => {
const content = tree.readText(path);
const updatedContent = content.replace('--mdc-', '--mat-');
tree.overwrite(path, updatedContent);
if (shouldRenameTokens(path)) {
const content = tree.readText(path);
const updatedContent = content.replace('--mdc-', '--mat-');
tree.overwrite(path, updatedContent);
}
});
};
}
Expand Down Expand Up @@ -78,13 +94,15 @@ function renameComponentTokens(): Rule {
];
return tree => {
tree.visit(path => {
const content = tree.readText(path);
let updatedContent = content;
for (const tokenPrefix of tokenPrefixes) {
updatedContent = updatedContent.replace(tokenPrefix.old, tokenPrefix.replacement);
}
if (content !== updatedContent) {
tree.overwrite(path, updatedContent);
if (shouldRenameTokens(path)) {
const content = tree.readText(path);
let updatedContent = content;
for (const tokenPrefix of tokenPrefixes) {
updatedContent = updatedContent.replace(tokenPrefix.old, tokenPrefix.replacement);
}
if (content !== updatedContent) {
tree.overwrite(path, updatedContent);
}
}
});
};
Expand Down
Loading