Skip to content

Commit 5d13491

Browse files
crisbetojelbourn
authored andcommitted
fix(material-experimental): errors with latest MDC canary version (#18173)
A few hours ago MDC switched all their Sass to use the new Sass modules (see material-components/material-components-web@faa9af3). This breaks our MDC components since they've been set up to use global Sass variables. These changes switch all the imports to the `.import` files which use the old approach for exposing variables. (cherry picked from commit 1b16701)
1 parent 796db4d commit 5d13491

34 files changed

+699
-585
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@types/youtube": "^0.0.38",
5555
"@webcomponents/custom-elements": "^1.1.0",
5656
"core-js": "^2.6.9",
57-
"material-components-web": "5.0.0-canary.b602226ce.0",
57+
"material-components-web": "5.0.0-canary.faa9af310.0",
5858
"rxjs": "^6.5.3",
5959
"systemjs": "0.19.43",
6060
"tslib": "^1.10.0",
@@ -127,7 +127,7 @@
127127
"minimatch": "^3.0.4",
128128
"minimist": "^1.2.0",
129129
"moment": "^2.18.1",
130-
"node-sass": "^4.12.0",
130+
"sass": "^1.24.4",
131131
"parse5": "^5.0.0",
132132
"protractor": "^5.4.2",
133133
"requirejs": "^2.3.6",

src/material-experimental/mdc-button/_mdc-button.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@import '@material/button/mixins';
2-
@import '@material/button/variables';
3-
@import '@material/fab/mixins';
4-
@import '@material/ripple/mixins';
5-
@import '@material/icon-button/mixins';
1+
@import '@material/button/mixins.import';
2+
@import '@material/button/variables.import';
3+
@import '@material/fab/mixins.import';
4+
@import '@material/ripple/mixins.import';
5+
@import '@material/icon-button/mixins.import';
66
@import '../../material/core/ripple/ripple';
77
@import '../mdc-helpers/mdc-helpers';
88

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import '@material/button/mixins';
2-
@import '@material/button/variables';
3-
@import '@material/ripple/mixins';
1+
@import '@material/button/mixins.import';
2+
@import '@material/button/variables.import';
3+
@import '@material/ripple/mixins.import';
44
@import '../mdc-helpers/mdc-helpers';
55
@import '../../cdk/a11y/a11y';
66
@import '_button-base';

src/material-experimental/mdc-button/fab.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import '@material/fab/mixins';
2-
@import '@material/button/variables';
3-
@import '@material/theme/variables';
1+
@import '@material/fab/mixins.import';
2+
@import '@material/button/variables.import';
3+
@import '@material/theme/variables.import';
44
@import '../mdc-helpers/mdc-helpers';
55
@import '_button-base';
66

src/material-experimental/mdc-button/icon-button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '@material/icon-button/mixins';
1+
@import '@material/icon-button/mixins.import';
22
@import '../mdc-helpers/mdc-helpers';
33
@import '_button-base';
44

src/material-experimental/mdc-card/_mdc-card.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import '@material/card/mixins';
2-
@import '@material/typography/mixins';
1+
@import '@material/card/mixins.import';
2+
@import '@material/typography/mixins.import';
33
@import '../mdc-helpers/mdc-helpers';
44

55
@mixin mat-card-theme-mdc($theme) {

src/material-experimental/mdc-card/card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '@material/card/mixins';
1+
@import '@material/card/mixins.import';
22
@import '../mdc-helpers/mdc-helpers';
33
@import '../../cdk/a11y/a11y';
44

src/material-experimental/mdc-checkbox/_mdc-checkbox.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@import '@material/checkbox/mixins';
2-
@import '@material/checkbox/variables';
3-
@import '@material/form-field/mixins';
4-
@import '@material/ripple/variables';
5-
@import '@material/theme/functions';
1+
@import '@material/checkbox/mixins.import';
2+
@import '@material/checkbox/variables.import';
3+
@import '@material/form-field/mixins.import';
4+
@import '@material/ripple/variables.import';
5+
@import '@material/theme/functions.import';
66
@import '../mdc-helpers/mdc-helpers';
77

88
@mixin mat-checkbox-theme-mdc($theme) {

src/material-experimental/mdc-checkbox/checkbox.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@import '@material/checkbox/functions';
2-
@import '@material/checkbox/mixins';
3-
@import '@material/form-field/mixins';
4-
@import '@material/ripple/variables';
1+
@import '@material/checkbox/functions.import';
2+
@import '@material/checkbox/mixins.import';
3+
@import '@material/form-field/mixins.import';
4+
@import '@material/ripple/variables.import';
55
@import '../mdc-helpers/mdc-helpers';
66

77
@include mdc-checkbox-without-ripple($query: $mat-base-styles-query);

src/material-experimental/mdc-chips/_mdc-chips.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import '@material/chips/mixins';
1+
@import '@material/chips/mixins.import';
22
@import '../mdc-helpers/mdc-helpers';
3-
@import '@material/theme/functions';
3+
@import '@material/theme/functions.import';
44

55
@mixin mat-chips-theme-mdc($theme) {
66
@include mdc-chip-set-core-styles($query: $mat-theme-styles-query);

0 commit comments

Comments
 (0)