Merge branch 'angular:main' into chip-edit

Author: adolgachev

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="20.0.1"></a>
+# 20.0.1 "sulfur-sandpaper" (2025-05-28)
+### material
+| Commit | Type | Description |
+| -- | -- | -- |
+| [ecd17ad75](https://github.com/angular/components/commit/ecd17ad758dd831f0be2d106ad4b4cd63f116069) | fix | **button:** add token for icon button shape ([#31223](https://github.com/angular/components/pull/31223)) |
+| [20fa71807](https://github.com/angular/components/commit/20fa71807bcbb8ef4dee75b86f0000aee31591f5) | fix | **schematics:** filter paths when renaming tokens ([#31249](https://github.com/angular/components/pull/31249)) |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
 <a name="20.0.0"></a>
 # 20.0.0 "calcium-carrot" (2025-05-28)
 ## Breaking Changes

src/material/schematics/ng-update/index.ts

@@ -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);
+      }
     });
   };
 }
@@ -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);
+        }
       }
     });
   };