Skip to content

Commit d27bb14

Browse files
ztannerdevjiwonchoikdy1
authored
backport: fix(turbo): sassOptions silenceDeprecations was not overwritten with user options (#74005)
Backports: - #73937 Co-authored-by: Jiwon Choi <[email protected]> Co-authored-by: Donny/강동윤 <[email protected]>
1 parent 0c8187a commit d27bb14

File tree

1 file changed

+7
-4
lines changed
  • crates/next-core/src/next_shared/webpack_rules

1 file changed

+7
-4
lines changed

crates/next-core/src/next_shared/webpack_rules/sass.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@ pub async fn maybe_add_sass_loader(
1616
bail!("sass_options must be an object");
1717
};
1818
// TODO: Remove this once we upgrade to sass-loader 16
19-
sass_options.insert(
20-
"silenceDeprecations".into(),
21-
serde_json::json!(["legacy-js-api"]),
22-
);
19+
let silence_deprecations = if let Some(v) = sass_options.get("silenceDeprecations") {
20+
v.clone()
21+
} else {
22+
serde_json::json!(["legacy-js-api"])
23+
};
24+
25+
sass_options.insert("silenceDeprecations".into(), silence_deprecations);
2326
let mut rules = if let Some(webpack_rules) = webpack_rules {
2427
webpack_rules.await?.clone_value()
2528
} else {

0 commit comments

Comments
 (0)