Unverified Commit 5df64654 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: cleanup StyleSheetLike (#85718)

This abstraction was a leftover from when we had a swc_css and a lightningcss backend.

Also inspired by https://github.com/vercel/next.js/pull/85524 as there was another constant-false `PartialEq` impl.
parent 684d11bf
...@@ -43,15 +43,6 @@ use crate::{ ...@@ -43,15 +43,6 @@ use crate::{
}, },
}; };
#[derive(Debug)]
pub struct StyleSheetLike<'i, 'o>(pub(crate) StyleSheet<'i, 'o>);
impl PartialEq for StyleSheetLike<'_, '_> {
fn eq(&self, _: &Self) -> bool {
false
}
}
pub type CssOutput = (ToCssResult, Option<Rope>); pub type CssOutput = (ToCssResult, Option<Rope>);
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
...@@ -94,60 +85,49 @@ async fn get_lightningcss_browser_targets( ...@@ -94,60 +85,49 @@ async fn get_lightningcss_browser_targets(
} }
} }
impl StyleSheetLike<'_, '_> { async fn stylesheet_to_css(
pub fn to_static( ss: &StyleSheet<'_, '_>,
&self, code: &str,
options: ParserOptions<'static, 'static>, minify_type: MinifyType,
) -> StyleSheetLike<'static, 'static> { enable_srcmap: bool,
StyleSheetLike(stylesheet_into_static(&self.0, options)) handle_nesting: bool,
} mut origin_source_map: Option<parcel_sourcemap::SourceMap>,
environment: Option<ResolvedVc<Environment>>,
) -> Result<CssOutput> {
let mut srcmap = if enable_srcmap {
Some(parcel_sourcemap::SourceMap::new(""))
} else {
None
};
pub async fn to_css( let targets =
&self, *get_lightningcss_browser_targets(environment.as_deref().copied(), handle_nesting).await?;
code: &str,
minify_type: MinifyType, let result = ss.to_css(PrinterOptions {
enable_srcmap: bool, minify: matches!(minify_type, MinifyType::Minify { .. }),
handle_nesting: bool, source_map: srcmap.as_mut(),
mut origin_source_map: Option<parcel_sourcemap::SourceMap>, targets,
environment: Option<ResolvedVc<Environment>>, analyze_dependencies: None,
) -> Result<CssOutput> { ..Default::default()
let ss = &self.0; })?;
let mut srcmap = if enable_srcmap {
Some(parcel_sourcemap::SourceMap::new("")) if let Some(srcmap) = &mut srcmap {
debug_assert_eq!(ss.sources.len(), 1);
if let Some(origin_source_map) = origin_source_map.as_mut() {
let _ = srcmap.extends(origin_source_map);
} else { } else {
None srcmap.add_sources(ss.sources.clone());
}; srcmap.set_source_content(0, code)?;
let targets =
*get_lightningcss_browser_targets(environment.as_deref().copied(), handle_nesting)
.await?;
let result = ss.to_css(PrinterOptions {
minify: matches!(minify_type, MinifyType::Minify { .. }),
source_map: srcmap.as_mut(),
targets,
analyze_dependencies: None,
..Default::default()
})?;
if let Some(srcmap) = &mut srcmap {
debug_assert_eq!(ss.sources.len(), 1);
if let Some(origin_source_map) = origin_source_map.as_mut() {
let _ = srcmap.extends(origin_source_map);
} else {
srcmap.add_sources(ss.sources.clone());
srcmap.set_source_content(0, code)?;
}
} }
}
let srcmap = match srcmap { let srcmap = match srcmap {
Some(srcmap) => Some(generate_css_source_map(&srcmap)?), Some(srcmap) => Some(generate_css_source_map(&srcmap)?),
None => None, None => None,
}; };
Ok((result, srcmap)) Ok((result, srcmap))
}
} }
/// Multiple [ModuleReference]s /// Multiple [ModuleReference]s
...@@ -161,7 +141,7 @@ pub enum ParseCssResult { ...@@ -161,7 +141,7 @@ pub enum ParseCssResult {
code: ResolvedVc<FileContent>, code: ResolvedVc<FileContent>,
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
stylesheet: StyleSheetLike<'static, 'static>, stylesheet: StyleSheet<'static, 'static>,
references: ResolvedVc<ModuleReferences>, references: ResolvedVc<ModuleReferences>,
...@@ -228,9 +208,16 @@ pub async fn process_css_with_placeholder( ...@@ -228,9 +208,16 @@ pub async fn process_css_with_placeholder(
// We use NoMinify because this is not a final css. We need to replace url references, // We use NoMinify because this is not a final css. We need to replace url references,
// and we do final codegen with proper minification. // and we do final codegen with proper minification.
let (result, _) = stylesheet let (result, _) = stylesheet_to_css(
.to_css(&code, MinifyType::NoMinify, false, false, None, environment) stylesheet,
.await?; &code,
MinifyType::NoMinify,
false,
false,
None,
environment,
)
.await?;
let exports = result.exports.map(|exports| { let exports = result.exports.map(|exports| {
let mut exports = exports.into_iter().collect::<FxIndexMap<_, _>>(); let mut exports = exports.into_iter().collect::<FxIndexMap<_, _>>();
...@@ -275,7 +262,7 @@ pub async fn finalize_css( ...@@ -275,7 +262,7 @@ pub async fn finalize_css(
options, options,
code, code,
.. ..
} => (stylesheet.to_static(options.clone()), *code), } => (stylesheet_into_static(stylesheet, options.clone()), *code),
ParseCssResult::Unparsable => return Ok(FinalCssResult::Unparsable.cell()), ParseCssResult::Unparsable => return Ok(FinalCssResult::Unparsable.cell()),
ParseCssResult::NotFound => return Ok(FinalCssResult::NotFound.cell()), ParseCssResult::NotFound => return Ok(FinalCssResult::NotFound.cell()),
}; };
...@@ -305,16 +292,16 @@ pub async fn finalize_css( ...@@ -305,16 +292,16 @@ pub async fn finalize_css(
None None
}; };
let (result, srcmap) = stylesheet let (result, srcmap) = stylesheet_to_css(
.to_css( &stylesheet,
&code, &code,
minify_type, minify_type,
true, true,
true, true,
origin_source_map, origin_source_map,
environment, environment,
) )
.await?; .await?;
Ok(FinalCssResult::Ok { Ok(FinalCssResult::Ok {
output_code: result.code, output_code: result.code,
...@@ -435,7 +422,7 @@ async fn process_content( ...@@ -435,7 +422,7 @@ async fn process_content(
..Default::default() ..Default::default()
}; };
let stylesheet = StyleSheetLike({ let stylesheet = {
let warnings: Arc<RwLock<_>> = Default::default(); let warnings: Arc<RwLock<_>> = Default::default();
match StyleSheet::parse( match StyleSheet::parse(
...@@ -455,10 +442,7 @@ async fn process_content( ...@@ -455,10 +442,7 @@ async fn process_content(
} }
} }
// We need to collect here because we need to avoid holding the lock while calling for err in warnings.read().unwrap().iter() {
// `.await` in the loop.
let warnings = warnings.read().unwrap().iter().cloned().collect::<Vec<_>>();
for err in warnings.iter() {
match err.kind { match err.kind {
lightningcss::error::ParserError::UnexpectedToken(_) lightningcss::error::ParserError::UnexpectedToken(_)
| lightningcss::error::ParserError::UnexpectedImportRule | lightningcss::error::ParserError::UnexpectedImportRule
...@@ -546,10 +530,10 @@ async fn process_content( ...@@ -546,10 +530,10 @@ async fn process_content(
return Ok(ParseCssResult::Unparsable.cell()); return Ok(ParseCssResult::Unparsable.cell());
} }
} }
}); };
let config = without_warnings(config); let config = without_warnings(config);
let mut stylesheet = stylesheet.to_static(config.clone()); let mut stylesheet = stylesheet_into_static(&stylesheet, config.clone());
let (references, url_references) = let (references, url_references) =
analyze_references(&mut stylesheet, source, origin, import_context).await?; analyze_references(&mut stylesheet, source, origin, import_context).await?;
......
...@@ -3,6 +3,7 @@ use std::convert::Infallible; ...@@ -3,6 +3,7 @@ use std::convert::Infallible;
use anyhow::Result; use anyhow::Result;
use lightningcss::{ use lightningcss::{
rules::CssRule, rules::CssRule,
stylesheet::StyleSheet,
traits::IntoOwned, traits::IntoOwned,
values::url::Url, values::url::Url,
visitor::{Visit, Visitor}, visitor::{Visit, Visitor},
...@@ -18,12 +19,9 @@ use turbopack_core::{ ...@@ -18,12 +19,9 @@ use turbopack_core::{
source_pos::SourcePos, source_pos::SourcePos,
}; };
use crate::{ use crate::references::{
StyleSheetLike, import::{ImportAssetReference, ImportAttributes},
references::{ url::UrlAssetReference,
import::{ImportAssetReference, ImportAttributes},
url::UrlAssetReference,
},
}; };
pub(crate) mod compose; pub(crate) mod compose;
...@@ -38,7 +36,7 @@ pub type AnalyzedRefs = ( ...@@ -38,7 +36,7 @@ pub type AnalyzedRefs = (
/// Returns `(all_references, urls)`. /// Returns `(all_references, urls)`.
pub async fn analyze_references( pub async fn analyze_references(
stylesheet: &mut StyleSheetLike<'static, 'static>, stylesheet: &mut StyleSheet<'static, 'static>,
source: ResolvedVc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
import_context: Option<ResolvedVc<ImportContext>>, import_context: Option<ResolvedVc<ImportContext>>,
...@@ -48,7 +46,7 @@ pub async fn analyze_references( ...@@ -48,7 +46,7 @@ pub async fn analyze_references(
let mut visitor = let mut visitor =
ModuleReferencesVisitor::new(source, origin, import_context, &mut references, &mut urls); ModuleReferencesVisitor::new(source, origin, import_context, &mut references, &mut urls);
stylesheet.0.visit(&mut visitor).unwrap(); stylesheet.visit(&mut visitor).unwrap();
tokio::try_join!( tokio::try_join!(
references.into_iter().map(|v| v.to_resolved()).try_join(), references.into_iter().map(|v| v.to_resolved()).try_join(),
......
...@@ -2,6 +2,7 @@ use std::convert::Infallible; ...@@ -2,6 +2,7 @@ use std::convert::Infallible;
use anyhow::Result; use anyhow::Result;
use lightningcss::{ use lightningcss::{
stylesheet::StyleSheet,
values::url::Url, values::url::Url,
visit_types, visit_types,
visitor::{Visit, Visitor}, visitor::{Visit, Visitor},
...@@ -18,7 +19,7 @@ use turbopack_core::{ ...@@ -18,7 +19,7 @@ use turbopack_core::{
resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request, url_resolve}, resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request, url_resolve},
}; };
use crate::{StyleSheetLike, embed::CssEmbed}; use crate::embed::CssEmbed;
#[turbo_tasks::value] #[turbo_tasks::value]
pub enum ReferencedAsset { pub enum ReferencedAsset {
...@@ -122,12 +123,9 @@ pub async fn resolve_url_reference( ...@@ -122,12 +123,9 @@ pub async fn resolve_url_reference(
Ok(Vc::cell(None)) Ok(Vc::cell(None))
} }
pub fn replace_url_references( pub fn replace_url_references<'i, 'o>(ss: &mut StyleSheet<'i, 'o>, urls: &FxHashMap<RcStr, RcStr>) {
ss: &mut StyleSheetLike<'static, 'static>,
urls: &FxHashMap<RcStr, RcStr>,
) {
let mut replacer = AssetReferenceReplacer { urls }; let mut replacer = AssetReferenceReplacer { urls };
ss.0.visit(&mut replacer).unwrap(); ss.visit(&mut replacer).unwrap();
} }
struct AssetReferenceReplacer<'a> { struct AssetReferenceReplacer<'a> {
......
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