Skip to content

Commit 8907861

Browse files
fix(sass): replace deprecated if() syntax with modern Sass syntax
Sass has deprecated the legacy `if()` function in favor of the new CSS `if()` function. To resolve this, we must use the new Sass syntax `if(sass(...): ...; else: ...)` introduced in Sass 1.95.0. This change: 1. Updates `sass` dependency to `^1.97.3`. 2. Migrates all token files to use the new syntax. Fixes: #5884 Co-authored-by: asyncLiz <34382620+asyncLiz@users.noreply.github.com>
1 parent 5a52fe9 commit 8907861

113 files changed

Lines changed: 979 additions & 1599 deletions

File tree

Some content is hidden

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

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"jasmine": "^4.5.0",
7575
"playwright": "^1.49.0",
7676
"rollup": "^2.79.1",
77-
"sass": "^1.93.2",
77+
"sass": "^1.97.3",
7878
"sass-true": "^6.1.0",
7979
"typescript": "5.8.2",
8080
"web-test-runner-jasmine": "^0.0.6",

tokens/_md-comp-assist-chip.scss

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@use 'sass:map';
88
@use 'sass:string';
99
// go/keep-sorted end
10-
@use 'utils' as *;
1110
// go/keep-sorted start
1211
@use 'internal/shape';
1312
@use 'internal/validate';
@@ -101,11 +100,11 @@ $_default: (
101100
$new-tokens: map.merge(
102101
shape.get-new-logical-shape-tokens($tokens, 'container-shape'),
103102
(
104-
'leading-space': if-else($exclude-hardcoded-values, null, 16px),
105-
'trailing-space': if-else($exclude-hardcoded-values, null, 16px),
106-
'icon-label-space': if-else($exclude-hardcoded-values, null, 8px),
103+
'leading-space': if(sass($exclude-hardcoded-values): null; else: 16px),
104+
'trailing-space': if(sass($exclude-hardcoded-values): null; else: 16px),
105+
'icon-label-space': if(sass($exclude-hardcoded-values): null; else: 8px),
107106
'with-leading-icon-leading-space':
108-
if-else($exclude-hardcoded-values, null, 8px),
107+
if(sass($exclude-hardcoded-values): null; else: 8px),
109108
)
110109
);
111110

tokens/_md-comp-elevated-button.scss

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@use 'sass:map';
88
@use 'sass:string';
99
// go/keep-sorted end
10-
@use 'utils' as *;
1110
// go/keep-sorted start
1211
@use 'internal/shape';
1312
@use 'internal/validate';
@@ -94,16 +93,16 @@ $_default: (
9493
(
9594
// b/198759625 - Remove once spacing tokens are formally added
9695
// go/keep-sorted start
97-
'leading-space': if-else($exclude-hardcoded-values, null, 24px),
98-
'trailing-space': if-else($exclude-hardcoded-values, null, 24px),
96+
'leading-space': if(sass($exclude-hardcoded-values): null; else: 24px),
97+
'trailing-space': if(sass($exclude-hardcoded-values): null; else: 24px),
9998
'with-leading-icon-leading-space':
100-
if-else($exclude-hardcoded-values, null, 16px),
99+
if(sass($exclude-hardcoded-values): null; else: 16px),
101100
'with-leading-icon-trailing-space':
102-
if-else($exclude-hardcoded-values, null, 24px),
101+
if(sass($exclude-hardcoded-values): null; else: 24px),
103102
'with-trailing-icon-leading-space':
104-
if-else($exclude-hardcoded-values, null, 24px),
103+
if(sass($exclude-hardcoded-values): null; else: 24px),
105104
'with-trailing-icon-trailing-space':
106-
if-else($exclude-hardcoded-values, null, 16px),
105+
if(sass($exclude-hardcoded-values): null; else: 16px),
107106
// go/keep-sorted end
108107
)
109108
);

tokens/_md-comp-filled-button.scss

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@use 'sass:map';
88
@use 'sass:string';
99
// go/keep-sorted end
10-
@use 'utils' as *;
1110
// go/keep-sorted start
1211
@use 'internal/shape';
1312
@use 'internal/validate';
@@ -94,16 +93,16 @@ $_default: (
9493
(
9594
// b/198759625 - Remove once spacing tokens are formally added
9695
// go/keep-sorted start
97-
'leading-space': if-else($exclude-hardcoded-values, null, 24px),
98-
'trailing-space': if-else($exclude-hardcoded-values, null, 24px),
96+
'leading-space': if(sass($exclude-hardcoded-values): null; else: 24px),
97+
'trailing-space': if(sass($exclude-hardcoded-values): null; else: 24px),
9998
'with-leading-icon-leading-space':
100-
if-else($exclude-hardcoded-values, null, 16px),
99+
if(sass($exclude-hardcoded-values): null; else: 16px),
101100
'with-leading-icon-trailing-space':
102-
if-else($exclude-hardcoded-values, null, 24px),
101+
if(sass($exclude-hardcoded-values): null; else: 24px),
103102
'with-trailing-icon-leading-space':
104-
if-else($exclude-hardcoded-values, null, 24px),
103+
if(sass($exclude-hardcoded-values): null; else: 24px),
105104
'with-trailing-icon-trailing-space':
106-
if-else($exclude-hardcoded-values, null, 16px),
105+
if(sass($exclude-hardcoded-values): null; else: 16px),
107106
// go/keep-sorted end
108107
)
109108
);

tokens/_md-comp-filled-field.scss

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@use 'sass:map';
88
@use 'sass:string';
99
// go/keep-sorted end
10-
@use 'utils' as *;
1110
// go/keep-sorted start
1211
@use 'internal/shape';
1312
@use 'internal/validate';
@@ -134,14 +133,14 @@ $_default: (
134133
// go/keep-sorted start
135134
'active-indicator-color': map.get($text-field, 'active-indicator-color'),
136135
'active-indicator-height': map.get($text-field, 'active-indicator-height'),
137-
'bottom-space': if-else($exclude-hardcoded-values, null, 16px),
136+
'bottom-space': if(sass($exclude-hardcoded-values): null; else: 16px),
138137
'container-color': map.get($text-field, 'container-color'),
139138
'container-shape': map.get($text-field, 'container-shape'),
140139
'content-color': map.get($text-field, 'input-text-color'),
141140
'content-font': map.get($text-field, 'input-text-font'),
142141
'content-line-height': map.get($text-field, 'input-text-line-height'),
143142
'content-size': map.get($text-field, 'input-text-size'),
144-
'content-space': if-else($exclude-hardcoded-values, null, 16px),
143+
'content-space': if(sass($exclude-hardcoded-values): null; else: 16px),
145144
'content-weight': map.get($text-field, 'input-text-weight'),
146145
'disabled-active-indicator-color':
147146
map.get($text-field, 'disabled-active-indicator-color'),
@@ -212,7 +211,7 @@ $_default: (
212211
'focus-active-indicator-color':
213212
map.get($text-field, 'focus-active-indicator-color'),
214213
// TODO(b/259455114): remove when focus tokens update to 3px
215-
'focus-active-indicator-height': if-else($exclude-hardcoded-values, null, 3px),
214+
'focus-active-indicator-height': if(sass($exclude-hardcoded-values): null; else: 3px),
216215
'focus-content-color': map.get($text-field, 'focus-input-text-color'),
217216
'focus-label-text-color': map.get($text-field, 'focus-label-text-color'),
218217
'focus-leading-content-color':
@@ -246,25 +245,25 @@ $_default: (
246245
'label-text-size': map.get($text-field, 'label-text-size'),
247246
'label-text-weight': map.get($text-field, 'label-text-weight'),
248247
'leading-content-color': map.get($text-field, 'leading-icon-color'),
249-
'leading-space': if-else($exclude-hardcoded-values, null, 16px),
248+
'leading-space': if(sass($exclude-hardcoded-values): null; else: 16px),
250249
'supporting-text-color': map.get($text-field, 'supporting-text-color'),
251250
'supporting-text-font': map.get($text-field, 'supporting-text-font'),
252-
'supporting-text-leading-space': if-else($exclude-hardcoded-values, null, 16px),
251+
'supporting-text-leading-space': if(sass($exclude-hardcoded-values): null; else: 16px),
253252
'supporting-text-line-height':
254253
map.get($text-field, 'supporting-text-line-height'),
255254
'supporting-text-size': map.get($text-field, 'supporting-text-size'),
256-
'supporting-text-top-space': if-else($exclude-hardcoded-values, null, 4px),
257-
'supporting-text-trailing-space': if-else($exclude-hardcoded-values, null, 16px),
255+
'supporting-text-top-space': if(sass($exclude-hardcoded-values): null; else: 4px),
256+
'supporting-text-trailing-space': if(sass($exclude-hardcoded-values): null; else: 16px),
258257
'supporting-text-weight': map.get($text-field, 'supporting-text-weight'),
259-
'top-space': if-else($exclude-hardcoded-values, null, 16px),
258+
'top-space': if(sass($exclude-hardcoded-values): null; else: 16px),
260259
'trailing-content-color': map.get($text-field, 'trailing-icon-color'),
261-
'trailing-space': if-else($exclude-hardcoded-values, null, 16px),
262-
'with-label-bottom-space': if-else($exclude-hardcoded-values, null, 8px),
263-
'with-label-top-space': if-else($exclude-hardcoded-values, null, 8px),
260+
'trailing-space': if(sass($exclude-hardcoded-values): null; else: 16px),
261+
'with-label-bottom-space': if(sass($exclude-hardcoded-values): null; else: 8px),
262+
'with-label-top-space': if(sass($exclude-hardcoded-values): null; else: 8px),
264263
'with-leading-content-leading-space':
265-
if-else($exclude-hardcoded-values, null, 12px),
264+
if(sass($exclude-hardcoded-values): null; else: 12px),
266265
'with-trailing-content-trailing-space':
267-
if-else($exclude-hardcoded-values, null, 12px),
266+
if(sass($exclude-hardcoded-values): null; else: 12px),
268267
// go/keep-sorted end
269268
);
270269

tokens/_md-comp-filled-select.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@use 'sass:map';
88
@use 'sass:string';
99
// go/keep-sorted end
10-
@use 'utils' as *;
1110
// go/keep-sorted start
1211
@use 'internal/shape';
1312
@use 'internal/validate';
@@ -150,7 +149,7 @@ $_default: (
150149
// go/keep-sorted start
151150
// TODO(b/259455114): remove when focus tokens update to 3px
152151
'text-field-focus-active-indicator-height':
153-
if-else($exclude-hardcoded-values, null, 3px),
152+
if(sass($exclude-hardcoded-values): null; else: 3px),
154153
// go/keep-sorted end
155154
);
156155
}

tokens/_md-comp-filled-text-field.scss

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@use 'sass:map';
88
@use 'sass:string';
99
// go/keep-sorted end
10-
@use 'utils' as *;
1110
// go/keep-sorted start
1211
@use 'internal/shape';
1312
@use 'internal/validate';
@@ -147,23 +146,23 @@ $_default: (
147146
$new-tokens: map.merge(
148147
shape.get-new-logical-shape-tokens($tokens, 'container-shape'),
149148
(
150-
'icon-input-space': if-else($exclude-hardcoded-values, null, 16px),
151-
'leading-space': if-else($exclude-hardcoded-values, null, 16px),
152-
'trailing-space': if-else($exclude-hardcoded-values, null, 16px),
153-
'top-space': if-else($exclude-hardcoded-values, null, 16px),
154-
'bottom-space': if-else($exclude-hardcoded-values, null, 16px),
149+
'icon-input-space': if(sass($exclude-hardcoded-values): null; else: 16px),
150+
'leading-space': if(sass($exclude-hardcoded-values): null; else: 16px),
151+
'trailing-space': if(sass($exclude-hardcoded-values): null; else: 16px),
152+
'top-space': if(sass($exclude-hardcoded-values): null; else: 16px),
153+
'bottom-space': if(sass($exclude-hardcoded-values): null; else: 16px),
155154
'input-text-prefix-trailing-space':
156-
if-else($exclude-hardcoded-values, null, 2px),
155+
if(sass($exclude-hardcoded-values): null; else: 2px),
157156
'input-text-suffix-leading-space':
158-
if-else($exclude-hardcoded-values, null, 2px),
159-
'with-label-top-space': if-else($exclude-hardcoded-values, null, 8px),
160-
'with-label-bottom-space': if-else($exclude-hardcoded-values, null, 8px),
157+
if(sass($exclude-hardcoded-values): null; else: 2px),
158+
'with-label-top-space': if(sass($exclude-hardcoded-values): null; else: 8px),
159+
'with-label-bottom-space': if(sass($exclude-hardcoded-values): null; else: 8px),
161160
// TODO(b/270705687): remove when focus-caret-color token added
162161
'focus-caret-color': map.get($deps, 'md-sys-color', 'primary'),
163162
'with-leading-icon-leading-space':
164-
if-else($exclude-hardcoded-values, null, 12px),
163+
if(sass($exclude-hardcoded-values): null; else: 12px),
165164
'with-trailing-icon-trailing-space':
166-
if-else($exclude-hardcoded-values, null, 12px),
165+
if(sass($exclude-hardcoded-values): null; else: 12px),
167166
)
168167
);
169168

@@ -178,7 +177,7 @@ $_default: (
178177
$tokens,
179178
(
180179
// TODO(b/259455114): remove when focus tokens update to 3px
181-
'focus-active-indicator-height': if-else($exclude-hardcoded-values, null, 3px)
180+
'focus-active-indicator-height': if(sass($exclude-hardcoded-values): null; else: 3px)
182181
)
183182
);
184183

tokens/_md-comp-filled-tonal-button.scss

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@use 'sass:map';
88
@use 'sass:string';
99
// go/keep-sorted end
10-
@use 'utils' as *;
1110
// go/keep-sorted start
1211
@use 'internal/shape';
1312
@use 'internal/validate';
@@ -94,16 +93,16 @@ $_default: (
9493
(
9594
// b/198759625 - Remove once spacing tokens are formally added
9695
// go/keep-sorted start
97-
'leading-space': if-else($exclude-hardcoded-values, null, 24px),
98-
'trailing-space': if-else($exclude-hardcoded-values, null, 24px),
96+
'leading-space': if(sass($exclude-hardcoded-values): null; else: 24px),
97+
'trailing-space': if(sass($exclude-hardcoded-values): null; else: 24px),
9998
'with-leading-icon-leading-space':
100-
if-else($exclude-hardcoded-values, null, 16px),
99+
if(sass($exclude-hardcoded-values): null; else: 16px),
101100
'with-leading-icon-trailing-space':
102-
if-else($exclude-hardcoded-values, null, 24px),
101+
if(sass($exclude-hardcoded-values): null; else: 24px),
103102
'with-trailing-icon-leading-space':
104-
if-else($exclude-hardcoded-values, null, 24px),
103+
if(sass($exclude-hardcoded-values): null; else: 24px),
105104
'with-trailing-icon-trailing-space':
106-
if-else($exclude-hardcoded-values, null, 16px),
105+
if(sass($exclude-hardcoded-values): null; else: 16px),
107106
// go/keep-sorted end
108107
)
109108
);

tokens/_md-comp-filter-chip.scss

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
@use 'sass:map';
88
@use 'sass:string';
99
// go/keep-sorted end
10-
@use 'utils' as *;
1110
// go/keep-sorted start
1211
@use 'internal/shape';
1312
@use 'internal/validate';
@@ -143,13 +142,13 @@ $_default: (
143142
$new-tokens: map.merge(
144143
shape.get-new-logical-shape-tokens($tokens, 'container-shape'),
145144
(
146-
'leading-space': if-else($exclude-hardcoded-values, null, 16px),
147-
'trailing-space': if-else($exclude-hardcoded-values, null, 16px),
148-
'icon-label-space': if-else($exclude-hardcoded-values, null, 8px),
145+
'leading-space': if(sass($exclude-hardcoded-values): null; else: 16px),
146+
'trailing-space': if(sass($exclude-hardcoded-values): null; else: 16px),
147+
'icon-label-space': if(sass($exclude-hardcoded-values): null; else: 8px),
149148
'with-leading-icon-leading-space':
150-
if-else($exclude-hardcoded-values, null, 8px),
149+
if(sass($exclude-hardcoded-values): null; else: 8px),
151150
'with-trailing-icon-trailing-space':
152-
if-else($exclude-hardcoded-values, null, 8px),
151+
if(sass($exclude-hardcoded-values): null; else: 8px),
153152
)
154153
);
155154

0 commit comments

Comments
 (0)