Skip to content

Commit 07c2d00

Browse files
authored
fix(material/core): address sass compiler warnings (#33040)
Resolves some Sass compiler warnings that were reported internally.
1 parent 0f5b0ee commit 07c2d00

File tree

3 files changed

+30
-11
lines changed

3 files changed

+30
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"rollup": "^4.52.3",
133133
"rollup-plugin-dts": "6.4.1",
134134
"rollup-plugin-sourcemaps2": "0.5.6",
135-
"sass": "^1.97.2",
135+
"sass": "^1.99.0",
136136
"selenium-webdriver": "^3.6.0",
137137
"semver": "^7.3.5",
138138
"shelljs": "^0.10.0",

pnpm-lock.yaml

Lines changed: 15 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/material/core/tokens/_system.scss

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
$density-tokens: get-density-tokens($scale);
153153
@each $tokens in $density-tokens {
154154
@each $token-name, $token-value in $tokens {
155-
--mat-#{$token-name}: #{$token-value};
155+
@include _output-token('mat', $token-name, $token-value);
156156
}
157157
}
158158
}
@@ -204,7 +204,7 @@
204204
@include sass-utils.current-selector-or-root {
205205
@each $name, $value in $overrides {
206206
@if (map.has-key($sys-names, $name)) {
207-
--#{$prefix}-#{$name}: #{map.get($overrides, $name)};
207+
@include _output-token($prefix, $name, map.get($overrides, $name));
208208
}
209209
}
210210
}
@@ -229,7 +229,7 @@
229229

230230
@include sass-utils.current-selector-or-root {
231231
@each $name, $value in $sys-colors {
232-
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
232+
@include _output-token($prefix, $name, map.get($overrides, $name) or $value);
233233
}
234234
}
235235
}
@@ -268,7 +268,7 @@
268268

269269
@include sass-utils.current-selector-or-root {
270270
@each $name, $value in m3.md-sys-typescale-values($font-definition) {
271-
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
271+
@include _output-token($prefix, $name, map.get($overrides, $name) or $value);
272272
}
273273
}
274274
}
@@ -281,23 +281,23 @@
281281
@each $name, $value in m3.md-sys-elevation-values() {
282282
$level: map.get($overrides, $name) or $value;
283283
$value: elevation.get-box-shadow($level, $shadow-color);
284-
--#{$prefix}-#{$name}: #{$value};
284+
@include _output-token($prefix, $name, $value);
285285
}
286286
}
287287
}
288288

289289
@mixin system-level-shape($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
290290
@include sass-utils.current-selector-or-root {
291291
@each $name, $value in m3.md-sys-shape-values() {
292-
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
292+
@include _output-token($prefix, $name, map.get($overrides, $name) or $value);
293293
}
294294
}
295295
}
296296

297297
@mixin system-level-state($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
298298
@include sass-utils.current-selector-or-root {
299299
@each $name, $value in m3.md-sys-state-values() {
300-
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
300+
@include _output-token($prefix, $name, map.get($overrides, $name) or $value);
301301
}
302302
}
303303
}
@@ -389,10 +389,16 @@
389389
}
390390
}
391391

392+
@mixin _output-token($prefix, $name, $value) {
393+
// The strings silence some Sass compiler warnings.
394+
--#{'' + $prefix}-#{'' + $name}: #{$value};
395+
}
396+
392397
@mixin _define-m2-system-vars($vars, $overrides) {
393398
@include sass-utils.current-selector-or-root {
394399
@each $name, $value in $vars {
395-
--#{definition.$system-fallback-prefix}-#{$name}: #{map.get($overrides, $name) or $value};
400+
@include _output-token(
401+
definition.$system-fallback-prefix, $name, map.get($overrides, $name) or $value);
396402
}
397403
}
398404
}

0 commit comments

Comments
 (0)