Unverified Commit e15eb2a4 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

fix sass handling after refactoring (#50259)

### What?

Push sass into the css pipeline
parent e257068b
...@@ -19,7 +19,12 @@ pub async fn maybe_add_sass_loader( ...@@ -19,7 +19,12 @@ pub async fn maybe_add_sass_loader(
} else { } else {
Default::default() Default::default()
}; };
for pattern in ["*.scss", "*.sass"] { for (pattern, rename) in [
("*.module.scss", ".module.css"),
("*.module.sass", ".module.css"),
("*.scss", ".css"),
("*.sass", ".css"),
] {
let rule = rules.get_mut(pattern); let rule = rules.get_mut(pattern);
let loader = WebpackLoaderItem { let loader = WebpackLoaderItem {
loader: "next/dist/compiled/sass-loader".to_string(), loader: "next/dist/compiled/sass-loader".to_string(),
...@@ -37,12 +42,17 @@ pub async fn maybe_add_sass_loader( ...@@ -37,12 +42,17 @@ pub async fn maybe_add_sass_loader(
let mut loaders = rule.loaders.await?.clone_value(); let mut loaders = rule.loaders.await?.clone_value();
loaders.push(loader); loaders.push(loader);
rule.loaders = WebpackLoaderItemsVc::cell(loaders); rule.loaders = WebpackLoaderItemsVc::cell(loaders);
if let Some(rename_as) = rule.rename_as.as_mut() {
rename_as.push_str(rename);
} else {
rule.rename_as = Some(format!("*{rename}"));
}
} else { } else {
rules.insert( rules.insert(
pattern.to_string(), pattern.to_string(),
LoaderRuleItem { LoaderRuleItem {
loaders: WebpackLoaderItemsVc::cell(vec![loader]), loaders: WebpackLoaderItemsVc::cell(vec![loader]),
rename_as: Some("*".to_string()), rename_as: Some(format!("*{rename}")),
}, },
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment