fix(multiple): remove forward of legacy styles

Author: andrewseguin

src/material/BUILD.bazel

@@ -27,8 +27,6 @@ sass_library(
     deps = [
         "//src/material/core:core_scss_lib",
         "//src/material/core:theming_scss_lib",
-        "//src/material/legacy-core:legacy_core_scss_lib",
-        "//src/material/legacy-core:theming_scss_lib",
     ],
 )
 
@@ -52,10 +50,6 @@ ng_package(
         ":package_json",
         ":sass_lib",
         "//src/material/core:theming_scss_lib",
-        "//src/material/legacy-prebuilt-themes:deeppurple-amber",
-        "//src/material/legacy-prebuilt-themes:indigo-pink",
-        "//src/material/legacy-prebuilt-themes:pink-bluegrey",
-        "//src/material/legacy-prebuilt-themes:purple-green",
         "//src/material/prebuilt-themes:deeppurple-amber",
         "//src/material/prebuilt-themes:indigo-pink",
         "//src/material/prebuilt-themes:pink-bluegrey",

src/material/_index.scss

@@ -19,8 +19,6 @@
 
 // Private/Internal
 @forward './core/density/private/all-density' show all-component-densities;
-@forward './legacy-core/density/private/all-density' as private-* show
-  private-all-legacy-component-densities;
 @forward './core/theming/theming' show private-check-duplicate-theme-styles,
   private-legacy-get-theme, private-is-theme-object;
 @forward './core/style/layout-common' as private-* show private-fill;
@@ -44,7 +42,6 @@
 
 // Structural
 @forward './core/core' show core;
-@forward './legacy-core/core' as legacy-* show legacy-core;
 @forward './core/ripple/ripple' show ripple;
 @forward './core/focus-indicators/focus-indicators' show strong-focus-indicators;
 @forward './core/focus-indicators/private' as private-strong-focus-indicators-*;
@@ -54,22 +51,14 @@
 @forward './core/theming/all-theme' show all-component-themes;
 @forward './core/color/all-color' show all-component-colors;
 @forward './core/typography/all-typography' show all-component-typographies;
-@forward './legacy-core/theming/all-theme' show all-legacy-component-themes;
-@forward './legacy-core/color/all-color' show all-legacy-component-colors;
-@forward './legacy-core/typography/all-typography' show all-legacy-component-typographies;
 
 // Component themes
 @forward './core/core-theme' as core-* show core-color, core-theme, core-typography, core-density;
-@forward './legacy-core/core-theme' as legacy-core-* show legacy-core-color, legacy-core-theme;
 @forward './core/ripple/ripple-theme' as ripple-* show ripple-color, ripple-theme;
-@forward './legacy-core/option/option-theme' as legacy-option-* show legacy-option-color,
-  legacy-option-typography, legacy-option-theme;
 @forward './core/option/option-theme' as option-* show option-color, option-typography,
   option-theme, option-density;
 @forward './core/option/optgroup-theme' as optgroup-* show optgroup-color, optgroup-typography,
   optgroup-theme, optgroup-density;
-@forward './legacy-core/option/optgroup-theme' as legacy-optgroup-* show legacy-optgroup-color,
-  legacy-optgroup-typography, legacy-optgroup-theme;
 @forward './core/selection/pseudo-checkbox/pseudo-checkbox-theme' as pseudo-checkbox-* show
   pseudo-checkbox-color, pseudo-checkbox-typography, pseudo-checkbox-theme;
 @forward './core/selection/pseudo-checkbox/pseudo-checkbox-common' as pseudo-checkbox-* show
@@ -78,14 +67,10 @@
   strong-focus-indicators-color, strong-focus-indicators-theme;
 @forward './autocomplete/autocomplete-theme' as autocomplete-* show autocomplete-theme,
   autocomplete-color, autocomplete-typography, autocomplete-density;
-@forward './legacy-autocomplete/autocomplete-theme' as legacy-autocomplete-* show
-  legacy-autocomplete-theme, legacy-autocomplete-color, legacy-autocomplete-typography;
 @forward './badge/badge-theme' as badge-* show badge-theme, badge-color, badge-typography,
   badge-density;
 @forward './bottom-sheet/bottom-sheet-theme' as bottom-sheet-* show bottom-sheet-theme,
   bottom-sheet-color, bottom-sheet-typography, bottom-sheet-density;
-@forward './legacy-button/button-theme' as legacy-button-* show legacy-button-theme,
-  legacy-button-color, legacy-button-typography;
 @forward './button/button-theme' as button-* show button-theme, button-color, button-typography,
   button-density;
 @forward './button/fab-theme' as fab-* show fab-color, fab-typography,
@@ -96,20 +81,12 @@
   button-toggle-color, button-toggle-typography, button-toggle-density;
 @forward './card/card-theme' as card-* show card-theme, card-color, card-typography, card-density,
   card-base;
-@forward './legacy-card/card-theme' as legacy-card-* show legacy-card-theme, legacy-card-color,
-  legacy-card-typography;
-@forward './legacy-checkbox/checkbox-theme' as legacy-checkbox-* show
-  legacy-checkbox-theme, legacy-checkbox-color, legacy-checkbox-typography;
 @forward './checkbox/checkbox-theme' as checkbox-* show checkbox-theme, checkbox-color,
   checkbox-typography, checkbox-density, checkbox-base;
-@forward './legacy-chips/chips-theme' as legacy-chips-* show legacy-chips-theme,
-  legacy-chips-color, legacy-chips-typography;
 @forward './chips/chips-theme' as chips-* show chips-theme, chips-color, chips-typography,
   chips-density;
 @forward './datepicker/datepicker-theme' as datepicker-* show datepicker-theme, datepicker-color,
   datepicker-typography, datepicker-date-range-colors, datepicker-density;
-@forward './legacy-dialog/dialog-theme' as legacy-dialog-* show legacy-dialog-theme,
-  legacy-dialog-color, legacy-dialog-typography;
 @forward './dialog/dialog-theme' as dialog-* show dialog-theme, dialog-color, dialog-typography,
   dialog-density;
 @forward './dialog/dialog-legacy-padding' as dialog-* show dialog-legacy-padding;
@@ -119,71 +96,41 @@
   expansion-typography, expansion-density;
 @forward './form-field/form-field-theme' as form-field-* show form-field-theme,
   form-field-color, form-field-typography, form-field-density;
-@forward './legacy-form-field/form-field-theme' as legacy-form-field-* show legacy-form-field-theme,
-  legacy-form-field-color, legacy-form-field-typography;
 @forward './grid-list/grid-list-theme' as grid-list-* show grid-list-theme, grid-list-color,
   grid-list-typography, grid-list-density;
 @forward './icon/icon-theme' as icon-* show icon-theme, icon-color, icon-typography, icon-density;
-@forward './legacy-input/input-theme' as legacy-input-* show legacy-input-theme, legacy-input-color,
-  legacy-input-typography;
 @forward './input/input-theme' as input-* show input-theme, input-color, input-typography,
   input-density;
 @forward './list/list-theme' as list-* show list-theme, list-color, list-typography, list-density;
-@forward './legacy-list/list-theme' as legacy-list-* show legacy-list-theme, legacy-list-color,
-  legacy-list-typography;
 @forward './menu/menu-theme' as menu-* show menu-theme, menu-color, menu-typography, menu-density;
-@forward './legacy-menu/menu-theme' as legacy-menu-* show legacy-menu-theme, legacy-menu-color,
-  legacy-menu-typography;
 @forward './paginator/paginator-theme' as paginator-* show paginator-theme, paginator-color,
   paginator-typography, paginator-density;
-@forward './legacy-paginator/paginator-theme' as legacy-paginator-* show legacy-paginator-theme,
-  legacy-paginator-color, legacy-paginator-typography;
-@forward './legacy-progress-bar/progress-bar-theme' as legacy-progress-bar-* show
-  legacy-progress-bar-theme, legacy-progress-bar-color, legacy-progress-bar-typography;
 @forward './progress-bar/progress-bar-theme' as progress-bar-* show
   progress-bar-theme, progress-bar-color, progress-bar-typography,
   progress-bar-density, progress-bar-base;
 @forward './progress-spinner/progress-spinner-theme' as progress-spinner-* show
   progress-spinner-theme, progress-spinner-color, progress-spinner-typography,
   progress-spinner-density, progress-spinner-base;
-@forward './legacy-progress-spinner/progress-spinner-theme' as legacy-progress-spinner-* show
-  legacy-progress-spinner-theme, legacy-progress-spinner-color, legacy-progress-spinner-typography;
 @forward './radio/radio-theme' as radio-* show radio-theme, radio-color, radio-typography,
   radio-density;
-@forward './legacy-radio/radio-theme' as legacy-radio-* show legacy-radio-theme, legacy-radio-color,
-  legacy-radio-typography;
 @forward './select/select-theme' as select-* show select-theme, select-color, select-typography,
   select-density;
-@forward './legacy-select/select-theme' as legacy-select-* show legacy-select-theme,
-  legacy-select-color, legacy-select-typography;
 @forward './sidenav/sidenav-theme' as sidenav-* show sidenav-theme, sidenav-color,
   sidenav-typography, sidenav-density;
-@forward './legacy-slide-toggle/slide-toggle-theme' as legacy-slide-toggle-* show
-  legacy-slide-toggle-theme, legacy-slide-toggle-color, legacy-slide-toggle-typography;
 @forward './slide-toggle/slide-toggle-theme' as slide-toggle-* show
   slide-toggle-theme, slide-toggle-color, slide-toggle-typography, slide-toggle-density;
-@forward './legacy-slider/slider-theme' as legacy-slider-* show legacy-slider-theme,
-  legacy-slider-color, legacy-slider-typography;
 @forward './slider/slider-theme' as slider-* show slider-theme, slider-color, slider-typography,
   slider-density, slider-base;
 @forward './snack-bar/snack-bar-theme' as snack-bar-* show snack-bar-theme, snack-bar-color,
   snack-bar-typography, snack-bar-density;
-@forward './legacy-snack-bar/snack-bar-theme' as legacy-snack-bar-* show legacy-snack-bar-theme,
-  legacy-snack-bar-color, legacy-snack-bar-typography;
 @forward './sort/sort-theme' as sort-* show sort-theme, sort-color, sort-typography, sort-density;
 @forward './stepper/stepper-theme' as stepper-* show stepper-theme, stepper-color,
   stepper-typography, stepper-density;
 @forward './table/table-theme' as table-* show table-theme, table-color, table-typography,
   table-density;
-@forward './legacy-table/table-theme' as legacy-table-* show legacy-table-theme, legacy-table-color,
-  legacy-table-typography;
 @forward './tabs/tabs-theme' as tabs-* show tabs-theme, tabs-color, tabs-typography, tabs-density;
-@forward './legacy-tabs/tabs-theme' as legacy-tabs-* show legacy-tabs-theme, legacy-tabs-color,
-legacy-tabs-typography;
 @forward './toolbar/toolbar-theme' as toolbar-* show toolbar-theme, toolbar-color,
   toolbar-typography, toolbar-density;
-@forward './legacy-tooltip/tooltip-theme' as legacy-tooltip-* show legacy-tooltip-theme,
-  legacy-tooltip-color, legacy-tooltip-typography;
 @forward './tooltip/tooltip-theme' as tooltip-* show tooltip-theme, tooltip-color,
   tooltip-typography, tooltip-density, tooltip-base;
 @forward './tree/tree-theme' as tree-* show tree-theme, tree-color, tree-typography, tree-density;

src/material/core/theming/tests/BUILD.bazel

@@ -11,20 +11,18 @@ sass_binary(
     src = "test-css-variables-theme.scss",
     deps = [
         "//src/material/core:theming_scss_lib",
-        "//src/material/legacy-core:theming_scss_lib",
     ],
 )
 
-# Sass binary which is used to ensure that our themes will compile with the legacy and new
-# pattern for configuring themes. For more information on the legacy and new pattern, inspect
+# Sass binary which is used to ensure that our themes will compile with the
+# pattern for configuring themes. For more information, inspect
 # the `mat-light-theme` and `mat-dark-theme` theming functions.
 sass_binary(
     name = "test-theming-api",
     testonly = True,
     src = "test-theming-api.scss",
     deps = [
         "//src/material/core:theming_scss_lib",
-        "//src/material/legacy-core:theming_scss_lib",
     ],
 )
 

src/material/core/theming/tests/test-css-variables-theme.scss

@@ -4,7 +4,6 @@
 @use '../../typography/typography';
 @use '../palette';
 @use '../theming';
-@use '../../../legacy-core/theming/all-theme' as legacy-all-theme;
 
 // Recursively replaces all of the values inside a Sass map with a different value.
 @function _replace-all-values($palette, $replacement) {
@@ -35,5 +34,4 @@
   ));
   $css-var-theme: _replace-all-values($theme, var(--test-var));
   @include all-theme.all-component-themes($css-var-theme);
-  @include legacy-all-theme.all-legacy-component-themes($css-var-theme);
 }

src/material/core/theming/tests/test-theming-api.scss

@@ -1,12 +1,8 @@
 @use 'sass:map';
 @use '../../density/private/all-density';
-@use '../../../legacy-core/density/private/all-density' as legacy-all-density;
 @use '../../color/all-color';
-@use '../../../legacy-core/color/all-color' as legacy-all-color;
 @use '../../typography/all-typography';
-@use '../../../legacy-core/typography/all-typography' as legacy-all-typography;
 @use '../all-theme';
-@use '../../../legacy-core/theming/all-theme' as legacy-all-theme;
 @use '../../typography/typography';
 @use '../palette';
 @use '../theming';
@@ -188,19 +184,6 @@ $dark-theme-only-typography: theming.define-dark-theme((typography: $typography-
   @include all-theme.all-component-themes($dark-theme-only-density);
   @include all-theme.all-component-themes($light-theme-only-typography);
   @include all-theme.all-component-themes($dark-theme-only-typography);
-
-  @include legacy-all-theme.all-legacy-component-themes($legacy-light-theme);
-  @include legacy-all-theme.all-legacy-component-themes($legacy-light-theme-default-warn);
-  @include legacy-all-theme.all-legacy-component-themes($legacy-dark-theme);
-  @include legacy-all-theme.all-legacy-component-themes($legacy-dark-theme-default-warn);
-  @include legacy-all-theme.all-legacy-component-themes($new-api-light-theme);
-  @include legacy-all-theme.all-legacy-component-themes($new-api-light-theme-default-warn);
-  @include legacy-all-theme.all-legacy-component-themes($new-api-dark-theme);
-  @include legacy-all-theme.all-legacy-component-themes($new-api-dark-theme-default-warn);
-  @include legacy-all-theme.all-legacy-component-themes($light-theme-only-density);
-  @include legacy-all-theme.all-legacy-component-themes($dark-theme-only-density);
-  @include legacy-all-theme.all-legacy-component-themes($light-theme-only-typography);
-  @include legacy-all-theme.all-legacy-component-themes($dark-theme-only-typography);
 }
 
 // Custom theme mixin used by the custom theme backwards compatibility test.
@@ -266,28 +249,16 @@ $dark-theme-only-typography: theming.define-dark-theme((typography: $typography-
 
   @each $theme in $test-themes {
     @include all-typography.all-component-typographies($theme);
-    @include legacy-all-typography.all-legacy-component-typographies($theme);
     @include all-color.all-component-colors($theme);
-    @include legacy-all-color.all-legacy-component-colors($theme);
     @include all-density.all-component-densities($theme);
-    @include legacy-all-density.all-legacy-component-densities($theme);
   }
 
   @include all-typography.all-component-typographies(
     map.get($light-theme-only-typography, typography));
   @include all-typography.all-component-typographies($light-theme-only-typography);
-  @include legacy-all-typography.all-legacy-component-typographies(
-          map.get($light-theme-only-typography, typography));
-  @include legacy-all-typography.all-legacy-component-typographies($light-theme-only-typography);
 
   @include all-density.all-component-densities(map.get($light-theme-only-density, density));
   @include all-density.all-component-densities($light-theme-only-density);
-  @include legacy-all-density.all-legacy-component-densities(
-          map.get($light-theme-only-density, density));
-  @include legacy-all-density.all-legacy-component-densities($light-theme-only-density);
-
-  @include legacy-all-color.all-legacy-component-colors(map.get($new-api-dark-theme, color));
-  @include legacy-all-color.all-legacy-component-colors($new-api-dark-theme);
 }
 
 @mixin test-individual-system-mixins-unwrap() {
@@ -298,8 +269,6 @@ $dark-theme-only-typography: theming.define-dark-theme((typography: $typography-
 
   @include all-theme.all-component-themes($new-api-dark-theme);
   @include all-theme.all-component-themes(map.get($new-api-dark-theme, color));
-  @include legacy-all-theme.all-legacy-component-themes($new-api-dark-theme);
-  @include legacy-all-theme.all-legacy-component-themes(map.get($new-api-dark-theme, color));
 }
 
 // Include all tests. Sass will throw if one of the tests fails.