Unverified Commit 1ed75446 authored by OJ Kwon's avatar OJ Kwon Committed by GitHub

refactor(next-core): remove ast cloning in custom transform (#49560)

### What?

- closes WEB-1024.

Minor refactoring to avoid explicit AST cloning. Still visitors are
using fold though.

### Turbopack changes

* https://github.com/vercel/turbo/pull/4869
* https://github.com/vercel/turbo/pull/4879
* https://github.com/vercel/turbo/pull/4881
parent 11a7117d
This diff is collapsed.
...@@ -41,11 +41,11 @@ swc_core = { version = "0.75.41" } ...@@ -41,11 +41,11 @@ swc_core = { version = "0.75.41" }
testing = { version = "0.33.4" } testing = { version = "0.33.4" }
# Turbo crates # Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230508.2" } turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230510.1" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230508.2" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230510.1" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230508.2" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230510.1" }
# General Deps # General Deps
......
...@@ -9,10 +9,6 @@ pub use next_dynamic::get_next_dynamic_transform_rule; ...@@ -9,10 +9,6 @@ pub use next_dynamic::get_next_dynamic_transform_rule;
pub use next_font::get_next_font_transform_rule; pub use next_font::get_next_font_transform_rule;
pub use next_strip_page_exports::get_next_pages_transforms_rule; pub use next_strip_page_exports::get_next_pages_transforms_rule;
pub use relay::get_relay_transform_plugin; pub use relay::get_relay_transform_plugin;
use swc_core::{
common::util::take::Take,
ecma::ast::{Module, ModuleItem, Program},
};
use turbo_binding::turbopack::{ use turbo_binding::turbopack::{
core::reference_type::{ReferenceType, UrlReferenceSubType}, core::reference_type::{ReferenceType, UrlReferenceSubType},
turbopack::module_options::{ModuleRule, ModuleRuleCondition, ModuleRuleEffect, ModuleType}, turbopack::module_options::{ModuleRule, ModuleRuleCondition, ModuleRuleEffect, ModuleType},
...@@ -53,18 +49,3 @@ pub(crate) fn module_rule_match_js_no_url() -> ModuleRuleCondition { ...@@ -53,18 +49,3 @@ pub(crate) fn module_rule_match_js_no_url() -> ModuleRuleCondition {
]), ]),
]) ])
} }
pub(crate) fn unwrap_module_program(program: &mut Program) -> Program {
match program {
Program::Module(module) => Program::Module(module.take()),
Program::Script(s) => Program::Module(Module {
span: s.span,
body: s
.body
.iter()
.map(|stmt| ModuleItem::Stmt(stmt.clone()))
.collect(),
shebang: s.shebang.clone(),
}),
}
}
...@@ -77,11 +77,7 @@ impl ModularizeImportsTransformer { ...@@ -77,11 +77,7 @@ impl ModularizeImportsTransformer {
#[async_trait] #[async_trait]
impl CustomTransformer for ModularizeImportsTransformer { impl CustomTransformer for ModularizeImportsTransformer {
async fn transform( async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
&self,
program: &mut Program,
_ctx: &TransformContext<'_>,
) -> Result<Option<Program>> {
let p = std::mem::replace(program, Program::Module(Module::dummy())); let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut modularize_imports( *program = p.fold_with(&mut modularize_imports(
turbo_binding::swc::custom_transform::modularize_imports::Config { turbo_binding::swc::custom_transform::modularize_imports::Config {
...@@ -89,6 +85,6 @@ impl CustomTransformer for ModularizeImportsTransformer { ...@@ -89,6 +85,6 @@ impl CustomTransformer for ModularizeImportsTransformer {
}, },
)); ));
Ok(None) Ok(())
} }
} }
...@@ -4,8 +4,11 @@ use anyhow::Result; ...@@ -4,8 +4,11 @@ use anyhow::Result;
use async_trait::async_trait; use async_trait::async_trait;
use next_transform_dynamic::{next_dynamic, NextDynamicMode}; use next_transform_dynamic::{next_dynamic, NextDynamicMode};
use swc_core::{ use swc_core::{
common::FileName, common::{util::take::Take, FileName},
ecma::{ast::Program, visit::FoldWith}, ecma::{
ast::{Module, Program},
visit::FoldWith,
},
}; };
use turbo_binding::{ use turbo_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
...@@ -18,7 +21,7 @@ use turbo_binding::{ ...@@ -18,7 +21,7 @@ use turbo_binding::{
}, },
}; };
use super::{module_rule_match_js_no_url, unwrap_module_program}; use super::module_rule_match_js_no_url;
/// Returns a rule which applies the Next.js dynamic transform. /// Returns a rule which applies the Next.js dynamic transform.
pub async fn get_next_dynamic_transform_rule( pub async fn get_next_dynamic_transform_rule(
...@@ -55,19 +58,17 @@ struct NextJsDynamic { ...@@ -55,19 +58,17 @@ struct NextJsDynamic {
#[async_trait] #[async_trait]
impl CustomTransformer for NextJsDynamic { impl CustomTransformer for NextJsDynamic {
async fn transform( async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
&self, let p = std::mem::replace(program, Program::Module(Module::dummy()));
program: &mut Program, *program = p.fold_with(&mut next_dynamic(
ctx: &TransformContext<'_>,
) -> Result<Option<Program>> {
let module_program = unwrap_module_program(program);
Ok(Some(module_program.fold_with(&mut next_dynamic(
self.is_development, self.is_development,
self.is_server, self.is_server,
self.is_server_components, self.is_server_components,
NextDynamicMode::Turbo, NextDynamicMode::Turbo,
FileName::Real(ctx.file_path_str.into()), FileName::Real(ctx.file_path_str.into()),
self.pages_dir.clone(), self.pages_dir.clone(),
)))) ));
Ok(())
} }
} }
...@@ -38,17 +38,13 @@ struct NextJsFont { ...@@ -38,17 +38,13 @@ struct NextJsFont {
#[async_trait] #[async_trait]
impl CustomTransformer for NextJsFont { impl CustomTransformer for NextJsFont {
async fn transform( async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
&self,
program: &mut Program,
ctx: &TransformContext<'_>,
) -> Result<Option<Program>> {
let mut next_font = next_transform_font::next_font_loaders(next_transform_font::Config { let mut next_font = next_transform_font::next_font_loaders(next_transform_font::Config {
font_loaders: self.font_loaders.clone(), font_loaders: self.font_loaders.clone(),
relative_file_path_from_root: ctx.file_name_str.into(), relative_file_path_from_root: ctx.file_name_str.into(),
}); });
program.visit_mut_with(&mut next_font); program.visit_mut_with(&mut next_font);
Ok(None) Ok(())
} }
} }
use anyhow::Result; use anyhow::Result;
use async_trait::async_trait; use async_trait::async_trait;
use next_transform_strip_page_exports::{next_transform_strip_page_exports, ExportFilter}; use next_transform_strip_page_exports::{next_transform_strip_page_exports, ExportFilter};
use swc_core::ecma::{ast::Program, visit::FoldWith}; use swc_core::{
common::util::take::Take,
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
};
use turbo_binding::{ use turbo_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
...@@ -13,7 +19,7 @@ use turbo_binding::{ ...@@ -13,7 +19,7 @@ use turbo_binding::{
}, },
}; };
use super::{module_rule_match_js_no_url, unwrap_module_program}; use super::module_rule_match_js_no_url;
/// Returns a rule which applies the Next.js page export stripping transform. /// Returns a rule which applies the Next.js page export stripping transform.
pub async fn get_next_pages_transforms_rule( pub async fn get_next_pages_transforms_rule(
...@@ -55,17 +61,16 @@ struct NextJsStripPageExports { ...@@ -55,17 +61,16 @@ struct NextJsStripPageExports {
#[async_trait] #[async_trait]
impl CustomTransformer for NextJsStripPageExports { impl CustomTransformer for NextJsStripPageExports {
async fn transform( async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
&self,
program: &mut Program,
_ctx: &TransformContext<'_>,
) -> Result<Option<Program>> {
// TODO(alexkirsz) Connect the eliminated_packages to telemetry. // TODO(alexkirsz) Connect the eliminated_packages to telemetry.
let eliminated_packages = Default::default(); let eliminated_packages = Default::default();
let module_program = unwrap_module_program(program); let p = std::mem::replace(program, Program::Module(Module::dummy()));
Ok(Some(module_program.fold_with( *program = p.fold_with(&mut next_transform_strip_page_exports(
&mut next_transform_strip_page_exports(self.export_filter, eliminated_packages), self.export_filter,
))) eliminated_packages,
));
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