Skip to content

Commit 8eb702e

Browse files
crisbetoandrewseguin
crisbeto
authored and
andrewseguin
committed
fix(material/core): reduce the number of module resolutions required for the legacy theming bundle
Currently the legacy `material/theming` bundle is set up to forward a few top-level `.import` files. The problem is that those files have been auto-generated to be backwards-compatible even for deep imports which means that they have a lot of overlapping `@forward` and `@import` statements. This results in a significant increase in build times for consumers still using the old bundle. These changes address the issue by introducing new shallower `*-legacy-index.scss` files which only export the APIs from the specific package and which in turn are re-exported through the top-level `material/theming` file. The change appears to cut the down the production build time on material.angular.io before the @use migration by more than 60%. Fixes #22676.
1 parent 4cf7716 commit 8eb702e

File tree

115 files changed

+345
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+345
-305
lines changed

‎src/material/_theming.scss

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,42 @@
22
// Note that we have to forward the `.import` files for backwards-compatibility with
33
// projects that don't use Sass modules and include the `mat-`-prefixed mixins.
44

5-
@forward './core/color/all-color.import';
6-
@forward './core/density/private/all-density.import';
7-
@forward './core/theming/all-theme.import';
8-
@forward './core/typography/all-typography.import';
5+
@forward '../cdk/a11y/index.import';
6+
@forward '../cdk/overlay/index.import';
7+
@forward '../cdk/text-field/index.import';
8+
9+
@forward './core/core-legacy-index';
10+
@forward './autocomplete/autocomplete-legacy-index';
11+
@forward './badge/badge-legacy-index';
12+
@forward './bottom-sheet/bottom-sheet-legacy-index';
13+
@forward './button-toggle/button-toggle-legacy-index';
14+
@forward './button/button-legacy-index';
15+
@forward './card/card-legacy-index';
16+
@forward './checkbox/checkbox-legacy-index';
17+
@forward './chips/chips-legacy-index';
18+
@forward './datepicker/datepicker-legacy-index';
19+
@forward './dialog/dialog-legacy-index';
20+
@forward './divider/divider-legacy-index';
21+
@forward './expansion/expansion-legacy-index';
22+
@forward './form-field/form-field-legacy-index';
23+
@forward './grid-list/grid-list-legacy-index';
24+
@forward './icon/icon-legacy-index';
25+
@forward './input/input-legacy-index';
26+
@forward './list/list-legacy-index';
27+
@forward './menu/menu-legacy-index';
28+
@forward './paginator/paginator-legacy-index';
29+
@forward './progress-bar/progress-bar-legacy-index';
30+
@forward './progress-spinner/progress-spinner-legacy-index';
31+
@forward './radio/radio-legacy-index';
32+
@forward './select/select-legacy-index';
33+
@forward './sidenav/sidenav-legacy-index';
34+
@forward './slide-toggle/slide-toggle-legacy-index';
35+
@forward './slider/slider-legacy-index';
36+
@forward './snack-bar/snack-bar-legacy-index';
37+
@forward './sort/sort-legacy-index';
38+
@forward './stepper/stepper-legacy-index';
39+
@forward './table/table-legacy-index';
40+
@forward './tabs/tabs-legacy-index';
41+
@forward './toolbar/toolbar-legacy-index';
42+
@forward './tooltip/tooltip-legacy-index';
43+
@forward './tree/tree-legacy-index';

‎src/material/autocomplete/_autocomplete-legacy-index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@forward 'autocomplete-theme' hide color, theme, typography;
2+
@forward 'autocomplete-theme' as mat-autocomplete-* hide mat-autocomplete-density;

‎src/material/autocomplete/_autocomplete-theme.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
3-
@forward 'autocomplete-theme' hide color, theme, typography;
4-
@forward 'autocomplete-theme' as mat-autocomplete-* hide mat-autocomplete-density;
3+
@forward './autocomplete-legacy-index';
54

65
@import '../core/style/private';
76
@import '../core/theming/theming';

‎src/material/badge/_badge-legacy-index.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size,
2+
color, theme, typography;
3+
@forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size;

‎src/material/badge/_badge-theme.import.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
@forward '../core/theming/theming.import';
22
@forward '../core/typography/typography-utils.import';
33
@forward '../../cdk/a11y/index.import';
4-
@forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size,
5-
color, theme, typography;
6-
@forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size;
4+
@forward './badge-legacy-index';
75

86
@import '../core/theming/palette';
97
@import '../core/theming/theming';

‎src/material/bottom-sheet/_bottom-sheet-legacy-index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@forward 'bottom-sheet-theme' hide color, theme, typography;
2+
@forward 'bottom-sheet-theme' as mat-bottom-sheet-* hide mat-bottom-sheet-density;

‎src/material/bottom-sheet/_bottom-sheet-theme.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward 'bottom-sheet-theme' hide color, theme, typography;
5-
@forward 'bottom-sheet-theme' as mat-bottom-sheet-* hide mat-bottom-sheet-density;
4+
@forward './bottom-sheet-legacy-index';
65

76
@import '../core/style/private';
87
@import '../core/typography/typography-utils';

‎src/material/button-toggle/_button-toggle-legacy-index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@forward 'button-toggle-variables' as mat-button-toggle-*;
2+
@forward 'button-toggle-theme' as mat-button-toggle-*;

‎src/material/button-toggle/_button-toggle-theme.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
33
@forward '../core/density/private/compatibility.import';
4-
@forward 'button-toggle-variables' as mat-button-toggle-*;
54
@forward '../../cdk/a11y/index.import';
65
@forward '../core/typography/typography-utils.import';
7-
@forward 'button-toggle-theme' as mat-button-toggle-*;
6+
@forward './button-toggle-legacy-index';
87

98
@import '../../cdk/a11y';
109
@import '../core/style/private';

‎src/material/button/_button-base.import.scss

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
@forward '../core/style/private.import';
22
@forward '../core/style/button-common.import';
3-
@forward 'button-base' as mat-* hide $mat-border-radius, $mat-button-border-radius,
4-
$mat-button-line-height, $mat-button-size, $mat-focus-transition, $mat-line-height, $mat-margin,
5-
$mat-min-width, $mat-padding, mat-base;
6-
@forward 'button-base' as mat-button-* hide $mat-button-button-border-radius,
7-
$mat-button-button-line-height, $mat-button-button-size, $mat-button-fab-border-radius,
8-
$mat-button-fab-padding, $mat-button-fab-size, $mat-button-mini-fab-padding,
9-
$mat-button-mini-fab-size, $mat-button-stroked-button-border-width,
10-
$mat-button-stroked-button-line-height, $mat-button-stroked-button-padding, mat-button-fab,
11-
mat-button-raised-button;
12-
@forward 'button-base' as mat-icon-* hide $mat-icon-border-radius, $mat-icon-fab-border-radius,
13-
$mat-icon-fab-padding, $mat-icon-fab-size, $mat-icon-focus-transition, $mat-icon-line-height,
14-
$mat-icon-margin, $mat-icon-min-width, $mat-icon-mini-fab-padding, $mat-icon-mini-fab-size,
15-
$mat-icon-padding, $mat-icon-stroked-button-border-width, $mat-icon-stroked-button-line-height,
16-
$mat-icon-stroked-button-padding, mat-icon-base, mat-icon-fab, mat-icon-raised-button;
3+
@forward './button-legacy-index';
174

185
@import '../core/style/variables';
196
@import '../core/style/elevation';

‎src/material/button/_button-legacy-index.scss

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@forward 'button-theme' hide color, theme, typography;
2+
@forward 'button-theme' as mat-button-* hide $mat-button-ripple-opacity, mat-button-density,
3+
mat-button-focus-overlay-color, mat-button-ripple-background, mat-button-ripple-color,
4+
mat-button-theme-property;
5+
6+
@forward 'button-base' as mat-* hide $mat-border-radius, $mat-button-border-radius,
7+
$mat-button-line-height, $mat-button-size, $mat-focus-transition, $mat-line-height, $mat-margin,
8+
$mat-min-width, $mat-padding, mat-base;
9+
@forward 'button-base' as mat-button-* hide $mat-button-button-border-radius,
10+
$mat-button-button-line-height, $mat-button-button-size, $mat-button-fab-border-radius,
11+
$mat-button-fab-padding, $mat-button-fab-size, $mat-button-mini-fab-padding,
12+
$mat-button-mini-fab-size, $mat-button-stroked-button-border-width,
13+
$mat-button-stroked-button-line-height, $mat-button-stroked-button-padding, mat-button-fab,
14+
mat-button-raised-button;
15+
@forward 'button-base' as mat-icon-* hide $mat-icon-border-radius, $mat-icon-fab-border-radius,
16+
$mat-icon-fab-padding, $mat-icon-fab-size, $mat-icon-focus-transition, $mat-icon-line-height,
17+
$mat-icon-margin, $mat-icon-min-width, $mat-icon-mini-fab-padding, $mat-icon-mini-fab-size,
18+
$mat-icon-padding, $mat-icon-stroked-button-border-width, $mat-icon-stroked-button-line-height,
19+
$mat-icon-stroked-button-padding, mat-icon-base, mat-icon-fab, mat-icon-raised-button;

‎src/material/button/_button-theme.import.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
@forward '../core/theming/theming.import';
22
@forward '../core/style/private.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward 'button-theme' hide color, theme, typography;
5-
@forward 'button-theme' as mat-button-* hide $mat-button-ripple-opacity, mat-button-density,
6-
mat-button-focus-overlay-color, mat-button-ripple-background, mat-button-ripple-color,
7-
mat-button-theme-property;
4+
@forward './button-legacy-index';
85

96
@import '../core/theming/theming';
107
@import '../core/style/private';

‎src/material/card/_card-legacy-index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@forward 'card-theme' hide color, theme, typography;
2+
@forward 'card-theme' as mat-card-* hide mat-card-density;

‎src/material/card/_card-theme.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
@forward '../core/theming/theming.import';
22
@forward '../core/style/private.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward 'card-theme' hide color, theme, typography;
5-
@forward 'card-theme' as mat-card-* hide mat-card-density;
4+
@forward './card-legacy-index';
65

76
@import '../core/theming/palette';
87
@import '../core/theming/theming';

‎src/material/checkbox/_checkbox-legacy-index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@forward 'checkbox-theme' hide color, theme, typography;
2+
@forward 'checkbox-theme' as mat-checkbox-* hide mat-checkbox-density;

‎src/material/checkbox/_checkbox-theme.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@forward '../core/theming/theming.import';
22
@forward '../core/typography/typography-utils.import';
3-
@forward 'checkbox-theme' hide color, theme, typography;
4-
@forward 'checkbox-theme' as mat-checkbox-* hide mat-checkbox-density;
3+
@forward './checkbox-legacy-index';
54

65
@import '../core/theming/theming';
76
@import '../core/typography/typography-utils';

‎src/material/chips/_chips-legacy-index.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@forward 'chips-theme' hide $chip-remove-font-size, color, theme, typography;
2+
@forward 'chips-theme' as mat-* hide mat-chip-element-color, mat-chip-theme-color, mat-color,
3+
mat-density, mat-ripple-background, mat-theme, mat-typography;
4+
@forward 'chips-theme' as mat-chips-* hide $mat-chips-chip-remove-font-size,
5+
mat-chips-chip-element-color, mat-chips-chip-theme-color, mat-chips-density,
6+
mat-chips-ripple-background;

‎src/material/chips/_chips-theme.import.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward 'chips-theme' hide $chip-remove-font-size, color, theme, typography;
5-
@forward 'chips-theme' as mat-* hide mat-chip-element-color, mat-chip-theme-color, mat-color,
6-
mat-density, mat-ripple-background, mat-theme, mat-typography;
7-
@forward 'chips-theme' as mat-chips-* hide $mat-chips-chip-remove-font-size,
8-
mat-chips-chip-element-color, mat-chips-chip-theme-color, mat-chips-density,
9-
mat-chips-ripple-background;
4+
@forward './chips-legacy-index';
105

116
@import '../core/style/private';
127
@import '../core/theming/palette';

‎src/material/core/_core-legacy-index.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@forward 'core' hide core;
2+
@forward 'core-theme' hide color, theme;
3+
@forward 'core' as mat-* hide mat-mdc-core, mat-mdc-strong-focus-indicators-positioning;
4+
@forward 'core-theme' as mat-* hide mat-color, mat-theme;
5+
@forward 'core' as mat-core-* hide mat-core-mdc-core,
6+
mat-core-mdc-strong-focus-indicators-positioning;
7+
@forward 'core-theme' as mat-core-*;
8+
9+
@forward './theming/all-theme';
10+
@forward './color/color-legacy-index';
11+
@forward './density/private/density-legacy-index';
12+
@forward './focus-indicators/focus-indicators-legacy-index';
13+
@forward './option/option-legacy-index';
14+
@forward './ripple/ripple-legacy-index';
15+
@forward './selection/pseudo-checkbox/pseudo-checkbox-legacy-index';
16+
@forward './style/style-legacy-index';
17+
@forward './theming/theming-legacy-index';
18+
@forward './typography/typography-legacy-index';

‎src/material/core/_core.import.scss

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,7 @@
4141
@forward '../sort/sort-theme.import';
4242
@forward '../tabs/tabs-theme.import';
4343
@forward 'typography/all-typography';
44-
@forward 'core' hide core;
45-
@forward 'core-theme' hide color, theme;
46-
@forward 'core' as mat-* hide mat-mdc-core, mat-mdc-strong-focus-indicators-positioning;
47-
@forward 'core-theme' as mat-* hide mat-color, mat-theme;
48-
@forward 'core' as mat-core-* hide mat-core-mdc-core,
49-
mat-core-mdc-strong-focus-indicators-positioning;
50-
@forward 'core-theme' as mat-core-*;
44+
@forward './core-legacy-index';
5145

5246
@import '../../cdk/overlay';
5347
@import '../../cdk/a11y';

‎src/material/core/color/_all-color.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@forward '../core' as mat-core-* hide mat-core-core;
4848
@forward '../core-theme' as mat-core-*;
4949
@forward '../theming/all-theme';
50-
@forward 'all-color';
50+
@forward './color-legacy-index';
5151

5252
@import '../theming/all-theme';
5353
@import '../theming/theming';

‎src/material/core/color/_color-legacy-index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@forward 'all-color';

‎src/material/core/density/private/_all-density.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@forward '../../../tree/tree-theme.import';
66
@forward '../../../paginator/paginator-theme.import';
77
@forward '../../../form-field/form-field-theme.import';
8-
@forward 'all-density' hide all-component-densities;
8+
@forward './density-legacy-index';
99

1010
@import '../../theming/theming';
1111
@import '../../../expansion/expansion-theme';

‎src/material/core/density/private/_compatibility.import.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
@forward 'compatibility' hide $private-density-generate-at-root, $private-density-generate-styles,
2-
private-density-legacy-compatibility, private-density-prop-value;
3-
@forward 'compatibility' as mat-* hide $mat-default-scale, $mat-interval, $mat-maximum-scale,
4-
$mat-minimum-scale, $mat-supported-scales;
1+
@forward './density-legacy-index';

‎src/material/core/density/private/_density-legacy-index.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@forward 'all-density' hide all-component-densities;
2+
@forward 'compatibility' hide $private-density-generate-at-root, $private-density-generate-styles,
3+
private-density-legacy-compatibility, private-density-prop-value;
4+
@forward 'compatibility' as mat-* hide $mat-default-scale, $mat-interval, $mat-maximum-scale,
5+
$mat-minimum-scale, $mat-supported-scales;

‎src/material/core/focus-indicators/_focus-indicators-legacy-index.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@forward 'focus-indicators' hide private-strong-focus-indicators-positioning,
2+
strong-focus-indicators;
3+
@forward 'focus-indicators-theme' hide color, theme;
4+
@forward 'focus-indicators' as mat-*;
5+
@forward 'focus-indicators-theme' as mat-strong-focus-indicators-*;

‎src/material/core/focus-indicators/_focus-indicators.import.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ $mat-white-6-opacity, $mat-white-87-opacity;
1212
@forward '../density/private/compatibility' as mat-*;
1313
@forward '../theming/theming' as mat-*;
1414
@forward '../style/layout-common' as mat-*;
15-
@forward 'focus-indicators' hide private-strong-focus-indicators-positioning,
16-
strong-focus-indicators;
17-
@forward 'focus-indicators-theme' hide color, theme;
18-
@forward 'focus-indicators' as mat-*;
19-
@forward 'focus-indicators-theme' as mat-strong-focus-indicators-*;
15+
@forward './focus-indicators-legacy-index';
2016

2117
@import '../theming/theming';
2218
@import '../style/layout-common';

‎src/material/core/option/_optgroup-theme.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ mat-line-typography-level;
1919
@forward '../typography/typography-utils' as mat-typography-* hide mat-typography-font-family,
2020
mat-typography-font-size, mat-typography-font-weight, mat-typography-height,
2121
mat-typography-letter-spacing;
22-
@forward 'optgroup-theme' hide color, theme, typography;
23-
@forward 'optgroup-theme' as mat-optgroup-* hide mat-optgroup-density;
22+
@forward './option-legacy-index';
2423

2524
@import '../theming/palette';
2625
@import '../theming/theming';

‎src/material/core/option/_option-legacy-index.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@forward 'option-theme' hide color, theme, typography;
2+
@forward 'option-theme' as mat-option-* hide mat-option-density;
3+
4+
@forward 'optgroup-theme' hide color, theme, typography;
5+
@forward 'optgroup-theme' as mat-optgroup-* hide mat-optgroup-density;

‎src/material/core/option/_option-theme.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ mat-line-typography-level;
1919
@forward '../typography/typography-utils' as mat-typography-* hide mat-typography-font-family,
2020
mat-typography-font-size, mat-typography-font-weight, mat-typography-height,
2121
mat-typography-letter-spacing;
22-
@forward 'option-theme' hide color, theme, typography;
23-
@forward 'option-theme' as mat-option-* hide mat-option-density;
22+
@forward './option-legacy-index';
2423

2524
@import '../theming/palette';
2625
@import '../theming/theming';

‎src/material/core/ripple/_ripple-legacy-index.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@forward 'ripple' as mat-* hide $mat-color-opacity;
2+
@forward 'ripple' as mat-ripple-* hide mat-ripple-ripple;
3+
@forward 'ripple-theme' as mat-ripple-*;

‎src/material/core/ripple/_ripple.import.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ $mat-white-6-opacity, $mat-white-87-opacity;
1212
@forward '../density/private/compatibility' as mat-*;
1313
@forward '../theming/theming' as mat-*;
1414
@forward '../../../cdk/a11y/index.import';
15-
@forward 'ripple' as mat-* hide $mat-color-opacity;
16-
@forward 'ripple' as mat-ripple-* hide mat-ripple-ripple;
17-
@forward 'ripple-theme' as mat-ripple-*;
15+
@forward './ripple-legacy-index';
1816

1917
@import '../theming/theming';
2018
@import '../../../cdk/a11y';

‎src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-legacy-index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@forward 'pseudo-checkbox-theme' hide color, theme, typography;
2+
@forward 'pseudo-checkbox-theme' as mat-pseudo-checkbox-* hide mat-pseudo-checkbox-density;

‎src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi
1111
$mat-white-6-opacity, $mat-white-87-opacity;
1212
@forward '../../density/private/compatibility' as mat-*;
1313
@forward '../../theming/theming' as mat-*;
14-
@forward 'pseudo-checkbox-theme' hide color, theme, typography;
15-
@forward 'pseudo-checkbox-theme' as mat-pseudo-checkbox-* hide mat-pseudo-checkbox-density;
14+
@forward './pseudo-checkbox-legacy-index';
1615

1716
@import '../../theming/theming';

‎src/material/core/style/_button-common.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@forward 'vendor-prefixes';
2-
@forward 'button-common' as mat-button-*;
1+
@forward './style-legacy-index';
32

43
@import './vendor-prefixes';

‎src/material/core/style/_checkbox-common.import.scss

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
2-
$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
3-
@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
4-
$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
5-
$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
6-
$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
7-
$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
8-
$mat-z-index-fab;
9-
@forward 'checkbox-common' as mat-checkbox-*;
1+
@forward './style-legacy-index';
102

113
@import './variables';

‎src/material/core/style/_elevation.import.scss

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
2-
$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
3-
@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
4-
$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
5-
$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
6-
$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
7-
$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
8-
$mat-z-index-fab;
9-
@forward 'elevation' hide $color, $opacity, $prefix, $transition-duration,
10-
$transition-timing-function, elevation, overridable-elevation, elevation-transition,
11-
private-transition-property-value;
12-
@forward 'elevation' as mat-* hide $mat-color, $mat-opacity, $mat-prefix, $mat-transition-duration,
13-
$mat-transition-timing-function, mat-get-ambient-map, mat-get-penumbra-map, mat-get-umbra-map;
14-
@forward 'elevation' as mat-elevation-* hide mat-elevation-elevation, mat-elevation-get-ambient-map,
15-
mat-elevation-get-penumbra-map, mat-elevation-get-umbra-map, mat-elevation-overridable-elevation;
1+
@forward './style-legacy-index';
162

173
@import 'variables';

‎src/material/core/style/_form-common.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi
1111
$mat-white-6-opacity, $mat-white-87-opacity;
1212
@forward '../density/private/compatibility' as mat-*;
1313
@forward '../theming/theming' as mat-*;
14-
@forward 'form-common' as mat-*;
14+
@forward './style-legacy-index';
1515

1616
@import '../theming/theming';

‎src/material/core/style/_layout-common.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@forward 'layout-common' as mat-*;
1+
@forward './style-legacy-index';

‎src/material/core/style/_list-common.import.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
@forward 'list-common' as mat-* hide mat-base, mat-wrapper-base;
2-
@forward 'list-common' as mat-line-* hide mat-line-normalize-text, mat-line-truncate-line;
1+
@forward './style-legacy-index';

0 commit comments

Comments
 (0)