fix(material-experimental/mdc-core): consolidate mdc theming code under mdc-core (#25084)

The theming code for mdc is currently scattered across mdc-theming,
mdc-color, mdc-density, mdc-typography, and mdc-helpers. This PR
consolidates it all under mdc-core to better match the way our entry
points are organized in @angular/material

Author: mmalerba

.github/CODEOWNERS

@@ -103,12 +103,9 @@
 /src/material-experimental/mdc-card/**             @mmalerba
 /src/material-experimental/mdc-checkbox/**         @mmalerba
 /src/material-experimental/mdc-chips/**            @mmalerba
-/src/material-experimental/mdc-color/**            @andrewseguin @devversion
 /src/material-experimental/mdc-core/**             @crisbeto
-/src/material-experimental/mdc-density/**          @devversion
 /src/material-experimental/mdc-dialog/**           @devversion
 /src/material-experimental/mdc-form-field/**       @devversion @mmalerba
-/src/material-experimental/mdc-helpers/**          @mmalerba
 /src/material-experimental/mdc-input/**            @devversion @mmalerba
 /src/material-experimental/mdc-list/**             @mmalerba @devversion
 /src/material-experimental/mdc-menu/**             @crisbeto
@@ -123,8 +120,6 @@
 /src/material-experimental/mdc-tabs/**             @crisbeto
 /src/material-experimental/mdc-tooltip/**          @crisbeto
 /src/material-experimental/mdc-table/**            @andrewseguin
-/src/material-experimental/mdc-theming/**          @mmalerba
-/src/material-experimental/mdc-typography/**       @mmalerba
 /src/material-experimental/menubar/**              @jelbourn
 /src/material-experimental/popover-edit/**         @andrewseguin
 /src/material-experimental/selection/**            @andrewseguin

.ng-dev/commit-message.mts

@@ -45,12 +45,9 @@ export const commitMessage: CommitMessageConfig = {
     'material-experimental/mdc-card',
     'material-experimental/mdc-checkbox',
     'material-experimental/mdc-chips',
-    'material-experimental/mdc-color',
     'material-experimental/mdc-core',
-    'material-experimental/mdc-density',
     'material-experimental/mdc-dialog',
     'material-experimental/mdc-form-field',
-    'material-experimental/mdc-helpers',
     'material-experimental/mdc-input',
     'material-experimental/mdc-list',
     'material-experimental/mdc-menu',
@@ -65,8 +62,6 @@ export const commitMessage: CommitMessageConfig = {
     'material-experimental/mdc-table',
     'material-experimental/mdc-tabs',
     'material-experimental/mdc-tooltip',
-    'material-experimental/mdc-theming',
-    'material-experimental/mdc-typography',
     'material-experimental/menubar',
     'material-experimental/popover-edit',
     'material-experimental/selection',

scripts/migrate-sass-modules.js

@@ -66,7 +66,7 @@ migrate('material/core/**/_*.scss', materialPrefixes, true);
 commentOutMdc('material-experimental/**/*.scss');
 
 // Migrate all of the MDC partials.
-migrate('material-experimental/mdc-helpers/**/_*.scss', mdcPrefixes, true);
+migrate('material-experimental/mdc-core/mdc-helpers/**/_*.scss', mdcPrefixes, true);
 migrate('material-experimental/mdc-core/**/_*.scss', mdcPrefixes, true, ['**/_core.scss']);
 migrate('material-experimental/**/_*.scss', mdcPrefixes, true);
 

src/material-experimental/BUILD.bazel

@@ -20,11 +20,11 @@ ts_library(
 sass_library(
     name = "theming_scss_lib",
     srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS + [
-        "//src/material-experimental/mdc-color",
-        "//src/material-experimental/mdc-density",
-        "//src/material-experimental/mdc-helpers",
-        "//src/material-experimental/mdc-theming",
-        "//src/material-experimental/mdc-typography",
+        "//src/material-experimental/mdc-core/color",
+        "//src/material-experimental/mdc-core/density",
+        "//src/material-experimental/mdc-core/mdc-helpers",
+        "//src/material-experimental/mdc-core/theming",
+        "//src/material-experimental/mdc-core/typography",
     ],
 )
 

src/material-experimental/_index.scss

@@ -1,13 +1,13 @@
 // Structural
-@forward './mdc-helpers/focus-indicators' as mdc-* show mdc-strong-focus-indicators;
+@forward './mdc-core/mdc-helpers/focus-indicators' as mdc-* show mdc-strong-focus-indicators;
 @forward './mdc-core/elevation' as mdc-* show mdc-elevation, mdc-overridable-elevation;
 
 // Theme bundles
-@forward './mdc-theming/all-theme' show all-mdc-component-themes;
-@forward './mdc-color/all-color' show all-mdc-component-colors;
-@forward './mdc-typography/all-typography' show all-mdc-component-typographies,
+@forward './mdc-core/theming/all-theme' show all-mdc-component-themes;
+@forward './mdc-core/color/all-color' show all-mdc-component-colors;
+@forward './mdc-core/typography/all-typography' show all-mdc-component-typographies,
   define-mdc-typography-config;
-@forward './mdc-density/all-density' show all-mdc-component-densities;
+@forward './mdc-core/density/all-density' show all-mdc-component-densities;
 
 // Component themes
 @forward './column-resize/column-resize-theme' as column-resize-* show column-resize-color,
@@ -18,7 +18,7 @@
 // MDC-related themes
 @forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color,
   mdc-core-density, mdc-core-typography;
-@forward './mdc-helpers/focus-indicators-theme' as mdc-strong-focus-indicators-* show
+@forward './mdc-core/mdc-helpers/focus-indicators-theme' as mdc-strong-focus-indicators-* show
   mdc-strong-focus-indicators-color, mdc-strong-focus-indicators-theme;
 @forward './mdc-core/option/option-theme' as mdc-option-* show mdc-option-color,
   mdc-option-typography, mdc-option-density, mdc-option-theme;

src/material-experimental/mdc-autocomplete/BUILD.bazel

@@ -27,8 +27,8 @@ sass_library(
     srcs = glob(["**/_*.scss"]),
     deps = [
         "//src/material:sass_lib",
-        "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib",
-        "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib",
     ],
 )
 
@@ -40,8 +40,8 @@ sass_binary(
     ],
     deps = [
         "//src/cdk:sass_lib",
-        "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib",
-        "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib",
     ],
 )
 

src/material-experimental/mdc-autocomplete/_autocomplete-theme.import.scss

@@ -1,5 +1,5 @@
-@forward '../mdc-helpers/mdc-helpers.import';
-@forward '../mdc-helpers/mdc-helpers';
+@forward '../mdc-core/mdc-helpers/mdc-helpers.import';
+@forward '../mdc-core/mdc-helpers/mdc-helpers';
 @forward 'autocomplete-theme' as mat-mdc-autocomplete-*;
 
-@import '../mdc-helpers/mdc-helpers';
+@import '../mdc-core/mdc-helpers/mdc-helpers';

src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss

@@ -2,7 +2,7 @@
 @use '@material/menu-surface/mixins' as mdc-menu-surface;
 @use '@material/list/evolution-mixins' as mdc-list;
 
-@use '../mdc-helpers/mdc-helpers';
+@use '../mdc-core/mdc-helpers/mdc-helpers';
 
 @mixin color($config-or-theme) {
   $config: mat.get-color-config($config-or-theme);

src/material-experimental/mdc-button/BUILD.bazel

@@ -36,8 +36,8 @@ sass_library(
     srcs = glob(["**/_*.scss"]),
     deps = [
         "//src/material:sass_lib",
-        "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib",
-        "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib",
     ],
 )
 
@@ -55,8 +55,8 @@ sass_binary(
     deps = [
         ":button_base_scss_lib",
         "//src/material:sass_lib",
-        "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib",
-        "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib",
     ],
 )
 
@@ -78,8 +78,8 @@ sass_binary(
     deps = [
         ":button_base_scss_lib",
         "//src/material:sass_lib",
-        "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib",
-        "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib",
     ],
 )
 
@@ -92,8 +92,8 @@ sass_binary(
     deps = [
         ":button_base_scss_lib",
         "//src/material:sass_lib",
-        "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib",
-        "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_helpers_scss_lib",
+        "//src/material-experimental/mdc-core/mdc-helpers:mdc_scss_deps_lib",
     ],
 )
 

src/material-experimental/mdc-button/_button-base.scss

@@ -2,7 +2,7 @@
 @use '@angular/material' as mat;
 @use '@material/touch-target' as mdc-touch-target;
 
-@use '../mdc-helpers/mdc-helpers';
+@use '../mdc-core/mdc-helpers/mdc-helpers';
 
 // Adds styles necessary to provide stateful interactions with the button. This includes providing
 // content for the state container's ::before and ::after so that they can be given a background