Skip to content

Commit faa9af3

Browse files
jathakabhiomkar
authored andcommitted
refactor: migrate to the Sass module system (material-components#5453)
BREAKING CHANGE: Four variables and a mixin in mdc-textfield were renamed to use a mdc-text-field- prefix when depended on via @import (formerly mdc-required-text-field-label-asterisk_, now required-label-asterisk_).
1 parent a4db5fb commit faa9af3

File tree

309 files changed

+7157
-4780
lines changed

Some content is hidden

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

309 files changed

+7157
-4780
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"cross-env": "^5.0.0",
7979
"css-loader": "^2.0.0",
8080
"cssom": "^0.3.2",
81-
"dart-sass": "^1.15.2",
81+
"dart-sass": "^1.24.3",
8282
"debounce": "^1.1.0",
8383
"del": "^4.0.0",
8484
"detect-port": "^1.2.3",
@@ -138,7 +138,7 @@
138138
"stylelint": "^9.2.1",
139139
"stylelint-config-standard": "^18.0.0",
140140
"stylelint-order": "^2.0.0",
141-
"stylelint-scss": "^3.0.0",
141+
"stylelint-scss": "^3.13.0",
142142
"stylelint-selector-bem-pattern": "^2.1.0",
143143
"testdouble": "^3.2.4",
144144
"to-slug-case": "^1.0.0",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@forward "variables" as mdc-animation-*;
2+
@forward "functions" as mdc-animation-*;

packages/mdc-animation/_functions.scss

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@
2020
// THE SOFTWARE.
2121
//
2222

23-
@import "./variables";
23+
@use "./variables";
2424

25-
@function mdc-animation-enter($name, $duration, $delay: 0ms) {
26-
@return $name $duration $delay $mdc-animation-deceleration-curve-timing-function;
25+
@function enter($name, $duration, $delay: 0ms) {
26+
@return $name $duration $delay variables.$deceleration-curve-timing-function;
2727
}
2828

29-
@function mdc-animation-exit-permanent($name, $duration, $delay: 0ms) {
30-
@return $name $duration $delay $mdc-animation-acceleration-curve-timing-function;
29+
@function exit-permanent($name, $duration, $delay: 0ms) {
30+
@return $name $duration $delay variables.$acceleration-curve-timing-function;
3131
}
3232

33-
@function mdc-animation-exit-temporary($name, $duration, $delay: 0ms) {
34-
@return $name $duration $delay $mdc-animation-sharp-curve-timing-function;
33+
@function exit-temporary($name, $duration, $delay: 0ms) {
34+
@return $name $duration $delay variables.$sharp-curve-timing-function;
3535
}
3636

37-
@function mdc-animation-standard($name, $duration, $delay: 0ms) {
38-
@return $name $duration $delay $mdc-animation-standard-curve-timing-function;
37+
@function standard($name, $duration, $delay: 0ms) {
38+
@return $name $duration $delay variables.$standard-curve-timing-function;
3939
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@forward "variables" as mdc-animation-*;

packages/mdc-animation/_variables.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// THE SOFTWARE.
2121
//
2222

23-
$mdc-animation-deceleration-curve-timing-function: cubic-bezier(0, 0, .2, 1) !default;
24-
$mdc-animation-standard-curve-timing-function: cubic-bezier(.4, 0, .2, 1) !default;
25-
$mdc-animation-acceleration-curve-timing-function: cubic-bezier(.4, 0, 1, 1) !default;
26-
$mdc-animation-sharp-curve-timing-function: cubic-bezier(.4, 0, .6, 1) !default;
23+
$deceleration-curve-timing-function: cubic-bezier(0, 0, .2, 1) !default;
24+
$standard-curve-timing-function: cubic-bezier(.4, 0, .2, 1) !default;
25+
$acceleration-curve-timing-function: cubic-bezier(.4, 0, 1, 1) !default;
26+
$sharp-curve-timing-function: cubic-bezier(.4, 0, .6, 1) !default;

packages/mdc-base/_mixins.import.scss

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@forward "mixins" as mdc-base-*;

packages/mdc-base/_mixins.scss

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use "sass:list";
12
//
23
// Copyright 2018 Google Inc.
34
//
@@ -22,11 +23,11 @@
2223

2324
// This variable is not intended to be overridden externally; it uses !default to avoid being reset
2425
// every time this file is imported.
25-
$mdc-base-styles-emitted_: () !default;
26+
$styles-emitted_: () !default;
2627

27-
@mixin mdc-base-emit-once($key) {
28-
@if not index($mdc-base-styles-emitted_, $key) {
29-
$mdc-base-styles-emitted_: append($mdc-base-styles-emitted_, $key, comma) !global;
28+
@mixin emit-once($key) {
29+
@if not list.index($styles-emitted_, $key) {
30+
$styles-emitted_: list.append($styles-emitted_, $key, comma) !global;
3031

3132
@content;
3233
}
+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
@forward "@material/base/mixins" as mdc-base-*;
2+
@forward "@material/feature-targeting/variables" as mdc-feature-*;
3+
@forward "@material/feature-targeting/mixins" as mdc-feature-*;
4+
@forward "@material/theme/constants" as mdc-theme-*;
5+
@forward "@material/theme/variables" as mdc-theme-*;
6+
@forward "@material/animation/variables" as mdc-animation-*;
7+
@forward "@material/elevation/variables" as mdc-elevation-*;
8+
@forward "@material/ripple/variables" as mdc-* hide $mdc-dark-ink-opacities, $mdc-fade-in-duration, $mdc-fade-out-duration, $mdc-light-ink-opacities, $mdc-pressed-dark-ink-opacity, $mdc-pressed-light-ink-opacity, $mdc-translate-duration;
9+
@forward "@material/ripple/variables" as mdc-ripple-* hide $mdc-ripple-states-wash-duration;
10+
@forward "@material/rtl/variables" as mdc-rtl-*;
11+
@forward "@material/touch-target/variables" as mdc-touch-target-*;
12+
@forward "@material/typography/variables" as mdc-typography-*;
13+
@forward "@material/shape/variables" as mdc-shape-*;
14+
@forward "@material/density/variables" as mdc-density-*;
15+
@forward "variables" as mdc-button-*;
16+
@forward "@material/theme/mixins" as mdc-theme-*;
17+
@forward "@material/elevation/mixins" as mdc-* hide mdc-core-styles, mdc-overlay-common, mdc-overlay-dimensions, mdc-overlay-fill-color, mdc-overlay-opacity, mdc-overlay-selector-, mdc-overlay-surface-position, mdc-shadow;
18+
@forward "@material/elevation/mixins" as mdc-elevation-* hide mdc-elevation-elevation;
19+
@forward "@material/ripple/keyframes" as mdc-ripple-*;
20+
@forward "@material/ripple/mixins" as mdc-* hide mdc-common, mdc-core-styles, mdc-radius-bounded, mdc-radius-unbounded, mdc-surface, mdc-target-common, mdc-target-selector;
21+
@forward "@material/ripple/mixins" as mdc-ripple-* hide mdc-ripple-states, mdc-ripple-states-activated, mdc-ripple-states-base-color, mdc-ripple-states-focus-opacity, mdc-ripple-states-focus-opacity-properties-, mdc-ripple-states-hover-opacity, mdc-ripple-states-interactions-, mdc-ripple-states-opacities, mdc-ripple-states-press-opacity, mdc-ripple-states-selected;
22+
@forward "@material/rtl/mixins" as mdc-* hide mdc-property-, mdc-reflexive, mdc-reflexive-box, mdc-reflexive-position, mdc-reflexive-property;
23+
@forward "@material/rtl/mixins" as mdc-rtl-* hide mdc-rtl-rtl;
24+
@forward "@material/touch-target/mixins" as mdc-* hide mdc-margin, mdc-wrapper;
25+
@forward "@material/touch-target/mixins" as mdc-touch-target-* hide mdc-touch-target-touch-target;
26+
@forward "@material/typography/mixins" as mdc-* hide mdc-base, mdc-baseline-bottom, mdc-baseline-strut-, mdc-baseline-top, mdc-core-styles, mdc-overflow-ellipsis;
27+
@forward "@material/typography/mixins" as mdc-typography-* hide mdc-typography-typography;
28+
@forward "@material/shape/mixins" as mdc-shape-*;
29+
@forward "@material/feature-targeting/functions" as mdc-feature-*;
30+
@forward "@material/theme/functions" as mdc-theme-*;
31+
@forward "@material/elevation/functions" as mdc-elevation-*;
32+
@forward "@material/animation/functions" as mdc-animation-*;
33+
@forward "@material/ripple/functions" as mdc-*;
34+
@forward "@material/typography/functions" as mdc-typography-*;
35+
@forward "@material/shape/functions" as mdc-shape-*;
36+
@forward "@material/density/functions" as mdc-density-*;
37+
@forward "mixins" as mdc-button-*;

0 commit comments

Comments
 (0)