Unverified Commit e3e337b7 authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

perf(turbopack): Reduce needless allocations for SWC plugins (#75275)

### What?

Reduce allocations for SWC plugins, by applying
https://github.com/swc-project/plugins/pull/393

### Why?

Those are actually noop so they should not allocate too much.
parent 4249afd7
...@@ -4243,9 +4243,9 @@ dependencies = [ ...@@ -4243,9 +4243,9 @@ dependencies = [
[[package]] [[package]]
name = "modularize_imports" name = "modularize_imports"
version = "0.70.1" version = "0.71.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7d7ecfbafc7a6aa66370d235e8e094f75f6b421a322236b5842c408c34a8219" checksum = "c162b3d0bd2d79bc3764d47f472d66237bc2c4614ef4a4ba63d9a79a7aafcf03"
dependencies = [ dependencies = [
"convert_case", "convert_case",
"handlebars", "handlebars",
...@@ -6888,9 +6888,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" ...@@ -6888,9 +6888,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]] [[package]]
name = "styled_components" name = "styled_components"
version = "0.98.2" version = "0.99.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "358eebb96614cbe52a1bd2c2afee17a791351e409d9cb1ccc9b5adcb7eedc6bc" checksum = "4d34cadaadd2b145e0d19340ee7226b233ec214b4ae47d8d225c18b8671748fe"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"once_cell", "once_cell",
...@@ -6906,9 +6906,9 @@ dependencies = [ ...@@ -6906,9 +6906,9 @@ dependencies = [
[[package]] [[package]]
name = "styled_jsx" name = "styled_jsx"
version = "0.75.2" version = "0.76.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1f6e318858ba16a2ad6b70a60c3c81266096602faf1839c20c6c060bd707bf2" checksum = "e4f3904ed82f85537fb9041f8609d24fc4be4b9be9457db0de24303e0b1d50ab"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"lightningcss", "lightningcss",
...@@ -8061,9 +8061,9 @@ dependencies = [ ...@@ -8061,9 +8061,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_emotion" name = "swc_emotion"
version = "0.74.2" version = "0.75.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "177c1403bd72b2e08ffbf1c13d4567fc789d69564f2e62677a434645b34bc328" checksum = "64ef7ba670900bf054e9fbfe779c9a8a86fe958b40b92b7ba4046919eb300cbf"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"byteorder", "byteorder",
......
...@@ -101,10 +101,10 @@ testing = { version = "5.0.0" } ...@@ -101,10 +101,10 @@ testing = { version = "5.0.0" }
browserslist-rs = { version = "0.16.0" } browserslist-rs = { version = "0.16.0" }
miette = { version = "5.10.0", features = ["fancy"] } miette = { version = "5.10.0", features = ["fancy"] }
mdxjs = "0.2.15" mdxjs = "0.2.15"
modularize_imports = { version = "0.70.1" } modularize_imports = { version = "0.71.0" }
styled_components = { version = "0.98.2" } styled_components = { version = "0.99.0" }
styled_jsx = { version = "0.75.2" } styled_jsx = { version = "0.76.0" }
swc_emotion = { version = "0.74.2" } swc_emotion = { version = "0.75.0" }
swc_relay = { version = "0.46.1" } swc_relay = { version = "0.46.1" }
# General Deps # General Deps
......
use std::collections::HashMap;
use anyhow::Result; use anyhow::Result;
use async_trait::async_trait; use async_trait::async_trait;
use modularize_imports::{modularize_imports, PackageConfig}; use modularize_imports::{modularize_imports, Config, PackageConfig};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use swc_core::ecma::ast::Program; use swc_core::ecma::ast::Program;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, NonLocalValue, OperationValue, ResolvedVc}; use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, NonLocalValue, OperationValue, ResolvedVc};
...@@ -71,12 +69,13 @@ pub fn get_next_modularize_imports_rule( ...@@ -71,12 +69,13 @@ pub fn get_next_modularize_imports_rule(
#[derive(Debug)] #[derive(Debug)]
struct ModularizeImportsTransformer { struct ModularizeImportsTransformer {
packages: HashMap<String, PackageConfig>, config: Config,
} }
impl ModularizeImportsTransformer { impl ModularizeImportsTransformer {
fn new(packages: &FxIndexMap<String, ModularizeImportPackageConfig>) -> Self { fn new(packages: &FxIndexMap<String, ModularizeImportPackageConfig>) -> Self {
Self { Self {
config: Config {
packages: packages packages: packages
.iter() .iter()
.map(|(k, v)| { .map(|(k, v)| {
...@@ -87,7 +86,9 @@ impl ModularizeImportsTransformer { ...@@ -87,7 +86,9 @@ impl ModularizeImportsTransformer {
Transform::String(s) => { Transform::String(s) => {
modularize_imports::Transform::String(s.clone()) modularize_imports::Transform::String(s.clone())
} }
Transform::Vec(v) => modularize_imports::Transform::Vec(v.clone()), Transform::Vec(v) => {
modularize_imports::Transform::Vec(v.clone())
}
Transform::None => { Transform::None => {
panic!("Missing transform value for package {}", k) panic!("Missing transform value for package {}", k)
} }
...@@ -100,6 +101,7 @@ impl ModularizeImportsTransformer { ...@@ -100,6 +101,7 @@ impl ModularizeImportsTransformer {
) )
}) })
.collect(), .collect(),
},
} }
} }
} }
...@@ -108,9 +110,7 @@ impl ModularizeImportsTransformer { ...@@ -108,9 +110,7 @@ impl ModularizeImportsTransformer {
impl CustomTransformer for ModularizeImportsTransformer { impl CustomTransformer for ModularizeImportsTransformer {
#[tracing::instrument(level = tracing::Level::TRACE, name = "modularize_imports", skip_all)] #[tracing::instrument(level = tracing::Level::TRACE, name = "modularize_imports", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> { async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
program.mutate(modularize_imports(modularize_imports::Config { program.mutate(modularize_imports(&self.config));
packages: self.packages.clone(),
}));
Ok(()) Ok(())
} }
......
...@@ -13,9 +13,9 @@ use swc_core::{ ...@@ -13,9 +13,9 @@ use swc_core::{
FileName, Mark, SourceFile, SourceMap, SyntaxContext, FileName, Mark, SourceFile, SourceMap, SyntaxContext,
}, },
ecma::{ ecma::{
ast::{noop_pass, EsVersion, Pass}, ast::{fn_pass, noop_pass, EsVersion, Pass},
parser::parse_file_as_module, parser::parse_file_as_module,
visit::{fold_pass, visit_mut_pass}, visit::visit_mut_pass,
}, },
}; };
...@@ -149,13 +149,6 @@ where ...@@ -149,13 +149,6 @@ where
} }
}; };
let modularize_imports_config = match &opts.modularize_imports {
Some(config) => config.clone(),
None => modularize_imports::Config {
packages: std::collections::HashMap::new(),
},
};
let target_browsers = opts let target_browsers = opts
.swc .swc
.config .config
...@@ -164,20 +157,69 @@ where ...@@ -164,20 +157,69 @@ where
.map(|env| targets_to_versions(env.targets.clone()).expect("failed to parse env.targets")) .map(|env| targets_to_versions(env.targets.clone()).expect("failed to parse env.targets"))
.unwrap_or_default(); .unwrap_or_default();
let styled_jsx = if let Some(config) = opts.styled_jsx.to_option() { let styled_jsx = {
Either::Left(styled_jsx::visitor::styled_jsx( let cm = cm.clone();
let file = file.clone();
fn_pass(move |program| {
if let Some(config) = opts.styled_jsx.to_option() {
program.mutate(styled_jsx::visitor::styled_jsx(
cm.clone(), cm.clone(),
(*file.name).clone(), &file.name,
styled_jsx::visitor::Config { &styled_jsx::visitor::Config {
use_lightningcss: config.use_lightningcss, use_lightningcss: config.use_lightningcss,
browsers: target_browsers, browsers: target_browsers,
}, },
styled_jsx::visitor::NativeConfig { process_css: None }, &styled_jsx::visitor::NativeConfig { process_css: None },
)) ))
} else { }
Either::Right(noop_pass()) })
}; };
let styled_components = {
let file = file.clone();
fn_pass(move |program| {
if let Some(config) = &opts.styled_components {
program.mutate(styled_components::styled_components(
&file.name,
file.src_hash,
config,
NoopComments,
))
}
})
};
let emotion = {
let cm = cm.clone();
let file = file.clone();
let comments = comments.clone();
fn_pass(move |program| {
if let Some(config) = opts.emotion.as_ref() {
if !config.enabled.unwrap_or(false) {
return;
}
if let FileName::Real(path) = &*file.name {
program.mutate(swc_emotion::emotion(
config,
path,
file.src_hash as u32,
cm.clone(),
comments.clone(),
));
}
}
})
};
let modularize_imports = fn_pass(move |program| {
if let Some(config) = opts.modularize_imports.as_ref() {
program.mutate(modularize_imports::modularize_imports(config));
}
});
( (
( (
crate::transforms::disallow_re_export_all_in_page::disallow_re_export_all_in_page( crate::transforms::disallow_re_export_all_in_page::disallow_re_export_all_in_page(
...@@ -195,15 +237,7 @@ where ...@@ -195,15 +237,7 @@ where
_ => Either::Right(noop_pass()), _ => Either::Right(noop_pass()),
}, },
styled_jsx, styled_jsx,
match &opts.styled_components { styled_components,
Some(config) => Either::Left(styled_components::styled_components(
file.name.clone(),
file.src_hash,
config.clone(),
NoopComments,
)),
None => Either::Right(noop_pass()),
},
Optional::new( Optional::new(
crate::transforms::next_ssg::next_ssg(eliminated_packages), crate::transforms::next_ssg::next_ssg(eliminated_packages),
!opts.disable_next_ssg, !opts.disable_next_ssg,
...@@ -274,28 +308,8 @@ where ...@@ -274,28 +308,8 @@ where
), ),
_ => Either::Right(noop_pass()), _ => Either::Right(noop_pass()),
}, },
opts.emotion emotion,
.as_ref() modularize_imports,
.and_then(|config| {
if !config.enabled.unwrap_or(false) {
return None;
}
if let FileName::Real(path) = &*file.name {
path.to_str().map(|_| {
Either::Left(fold_pass(swc_emotion::EmotionTransformer::new(
config.clone(),
path,
file.src_hash as u32,
cm,
comments.clone(),
)))
})
} else {
None
}
})
.unwrap_or_else(|| Either::Right(noop_pass())),
modularize_imports::modularize_imports(modularize_imports_config),
match &opts.font_loaders { match &opts.font_loaders {
Some(config) => Either::Left(next_font_loaders(config.clone())), Some(config) => Either::Left(next_font_loaders(config.clone())),
None => Either::Right(noop_pass()), None => Either::Right(noop_pass()),
......
...@@ -104,7 +104,7 @@ impl CustomTransformer for EmotionTransformer { ...@@ -104,7 +104,7 @@ impl CustomTransformer for EmotionTransformer {
hasher.finish() hasher.finish()
}; };
program.mutate(swc_emotion::emotion( program.mutate(swc_emotion::emotion(
self.config.clone(), &self.config,
Path::new(ctx.file_name_str), Path::new(ctx.file_name_str),
hash as u32, hash as u32,
ctx.source_map.clone(), ctx.source_map.clone(),
......
use std::collections::HashMap;
use anyhow::Result; use anyhow::Result;
use async_trait::async_trait; use async_trait::async_trait;
use modularize_imports::{modularize_imports, Config, PackageConfig}; use modularize_imports::{modularize_imports, Config, PackageConfig};
...@@ -20,19 +18,22 @@ pub struct ModularizeImportPackageConfig { ...@@ -20,19 +18,22 @@ pub struct ModularizeImportPackageConfig {
#[derive(Debug)] #[derive(Debug)]
pub struct ModularizeImportsTransformer { pub struct ModularizeImportsTransformer {
packages: HashMap<String, PackageConfig>, config: Config,
} }
impl ModularizeImportsTransformer { impl ModularizeImportsTransformer {
pub fn new(packages: &FxIndexMap<String, ModularizeImportPackageConfig>) -> Self { pub fn new(packages: &FxIndexMap<String, ModularizeImportPackageConfig>) -> Self {
Self { Self {
config: Config {
packages: packages packages: packages
.iter() .iter()
.map(|(k, v)| { .map(|(k, v)| {
( (
k.clone(), k.clone(),
PackageConfig { PackageConfig {
transform: modularize_imports::Transform::String(v.transform.clone()), transform: modularize_imports::Transform::String(
v.transform.clone(),
),
prevent_full_import: v.prevent_full_import, prevent_full_import: v.prevent_full_import,
skip_default_conversion: v.skip_default_conversion, skip_default_conversion: v.skip_default_conversion,
handle_default_import: false, handle_default_import: false,
...@@ -41,6 +42,7 @@ impl ModularizeImportsTransformer { ...@@ -41,6 +42,7 @@ impl ModularizeImportsTransformer {
) )
}) })
.collect(), .collect(),
},
} }
} }
} }
...@@ -49,9 +51,7 @@ impl ModularizeImportsTransformer { ...@@ -49,9 +51,7 @@ impl ModularizeImportsTransformer {
impl CustomTransformer for ModularizeImportsTransformer { impl CustomTransformer for ModularizeImportsTransformer {
#[tracing::instrument(level = tracing::Level::TRACE, name = "modularize_imports", skip_all)] #[tracing::instrument(level = tracing::Level::TRACE, name = "modularize_imports", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> { async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
program.mutate(modularize_imports(Config { program.mutate(modularize_imports(&self.config));
packages: self.packages.clone(),
}));
Ok(()) Ok(())
} }
......
...@@ -92,9 +92,9 @@ impl CustomTransformer for StyledComponentsTransformer { ...@@ -92,9 +92,9 @@ impl CustomTransformer for StyledComponentsTransformer {
#[tracing::instrument(level = tracing::Level::TRACE, name = "styled_components", skip_all)] #[tracing::instrument(level = tracing::Level::TRACE, name = "styled_components", skip_all)]
async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> { async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
program.mutate(styled_components::styled_components( program.mutate(styled_components::styled_components(
FileName::Real(PathBuf::from(ctx.file_path_str)).into(), &FileName::Real(PathBuf::from(ctx.file_path_str)),
ctx.file_name_hash, ctx.file_name_hash,
self.config.clone(), &self.config,
NoopComments, NoopComments,
)); ));
......
...@@ -24,12 +24,12 @@ impl CustomTransformer for StyledJsxTransformer { ...@@ -24,12 +24,12 @@ impl CustomTransformer for StyledJsxTransformer {
program.mutate(styled_jsx::visitor::styled_jsx( program.mutate(styled_jsx::visitor::styled_jsx(
ctx.source_map.clone(), ctx.source_map.clone(),
// styled_jsx don't really use that in a relevant way // styled_jsx don't really use that in a relevant way
FileName::Anon, &FileName::Anon,
styled_jsx::visitor::Config { &styled_jsx::visitor::Config {
use_lightningcss: true, use_lightningcss: true,
browsers: self.target_browsers, browsers: self.target_browsers,
}, },
styled_jsx::visitor::NativeConfig { process_css: None }, &styled_jsx::visitor::NativeConfig { process_css: None },
)); ));
Ok(()) Ok(())
......
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