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

build: Update `swc_core` to `v5.0.1` (#71683)

### What?

ChangeLog:
https://github.com/swc-project/swc/compare/swc_core%40v1.0.6...swc_core%40v5.0.1

### Why?

To keep in sync.

### How?

 - Closes SWC-612

 - Depends on https://github.com/wooorm/mdxjs-rs/pull/55
parent fa8d5581
This diff is collapsed.
......@@ -86,21 +86,21 @@ turbopack-trace-utils = { path = "turbopack/crates/turbopack-trace-utils" }
turbopack-wasm = { path = "turbopack/crates/turbopack-wasm" }
# SWC crates
swc_core = { version = "0.106.3", features = [
swc_core = { version = "5.0.1", features = [
"ecma_loader_lru",
"ecma_loader_parking_lot",
] }
testing = { version = "0.42.0" }
testing = { version = "4.0.0" }
# Keep consistent with preset_env_base through swc_core
browserslist-rs = { version = "0.16.0" }
miette = { version = "5.10.0", features = ["fancy"] }
mdxjs = "0.2.10"
modularize_imports = { version = "0.68.26" }
styled_components = { version = "0.96.24" }
styled_jsx = { version = "0.73.35" }
swc_emotion = { version = "0.72.23" }
swc_relay = { version = "0.44.26" }
mdxjs = "0.2.13"
modularize_imports = { version = "0.68.30" }
styled_components = { version = "0.96.28" }
styled_jsx = { version = "0.73.40" }
swc_emotion = { version = "0.72.28" }
swc_relay = { version = "0.44.30" }
# General Deps
......@@ -153,12 +153,12 @@ indoc = "2.0.0"
itertools = "0.10.5"
lazy_static = "1.4.0"
log = "0.4.17"
lightningcss = { version = "1.0.0-alpha.59", features = [
lightningcss = { version = "1.0.0-alpha.60", features = [
"serde",
"visitor",
"into_owned",
] }
lightningcss-napi = { version = "0.3.0", default-features = false, features = [
lightningcss-napi = { version = "0.4.0", default-features = false, features = [
"visitor"
]}
markdown = "1.0.0-alpha.18"
......@@ -167,7 +167,7 @@ nohash-hasher = "0.2.0"
notify = "6.1.1"
once_cell = "1.17.1"
owo-colors = "3.5.0"
parcel_selectors = "0.27.0"
parcel_selectors = "0.28.0"
parking_lot = "0.12.1"
pathdiff = "0.2.1"
petgraph = "0.6.3"
......
......@@ -42,7 +42,7 @@ use once_cell::sync::Lazy;
use swc_core::{
base::{try_with_handler, Compiler, TransformOutput},
common::{comments::SingleThreadedComments, errors::ColorConfig, FileName, Mark, GLOBALS},
ecma::transforms::base::pass::noop,
ecma::ast::noop_pass,
};
use crate::{complete_output, get_compiler, util::MapErr};
......@@ -145,7 +145,7 @@ impl Task for TransformTask {
unresolved_mark,
)
},
|_| noop(),
|_| noop_pass(),
)
})
},
......
......@@ -31,8 +31,8 @@ lazy_static = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
rustc-hash = { workspace = true }
react_remove_properties = "0.24.21"
remove_console = "0.25.21"
react_remove_properties = "0.24.25"
remove_console = "0.25.25"
auto-hash-map = { workspace = true }
......
......@@ -4,13 +4,7 @@ use anyhow::Result;
use async_trait::async_trait;
use modularize_imports::{modularize_imports, PackageConfig};
use serde::{Deserialize, Serialize};
use swc_core::{
common::util::take::Take,
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
};
use swc_core::ecma::ast::Program;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, Vc};
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
......@@ -92,8 +86,7 @@ impl ModularizeImportsTransformer {
impl CustomTransformer for ModularizeImportsTransformer {
#[tracing::instrument(level = tracing::Level::TRACE, name = "modularize_imports", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut modularize_imports(modularize_imports::Config {
program.mutate(modularize_imports(modularize_imports::Config {
packages: self.packages.clone(),
}));
......
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::amp_attributes::amp_attributes;
use swc_core::{
common::util::take::Take,
ecma::{ast::*, visit::FoldWith},
};
use swc_core::ecma::ast::*;
use turbo_tasks::Vc;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
......@@ -30,8 +27,7 @@ struct NextAmpAttributes {}
impl CustomTransformer for NextAmpAttributes {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_amp", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut amp_attributes());
program.mutate(amp_attributes());
Ok(())
}
}
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::disallow_re_export_all_in_page::disallow_re_export_all_in_page;
use swc_core::{
common::util::take::Take,
ecma::{ast::*, visit::FoldWith},
};
use swc_core::ecma::ast::*;
use turbo_tasks::{ReadRef, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
......@@ -34,8 +31,7 @@ struct NextDisallowReExportAllInPage;
impl CustomTransformer for NextDisallowReExportAllInPage {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_disallow_reexport_all", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut disallow_re_export_all_in_page(true));
program.mutate(disallow_re_export_all_in_page(true));
Ok(())
}
}
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::dynamic::{next_dynamic, NextDynamicMode};
use swc_core::{
common::{util::take::Take, FileName},
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
};
use swc_core::{common::FileName, ecma::ast::Program};
use turbo_tasks::Vc;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
......@@ -50,8 +44,7 @@ struct NextJsDynamic {
impl CustomTransformer for NextJsDynamic {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_dynamic", skip_all)]
async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut next_dynamic(
program.mutate(next_dynamic(
self.mode.is_development(),
self.is_server_compiler,
self.is_react_server_layer,
......
......@@ -44,6 +44,7 @@ impl CustomTransformer for NextEdgeNodeApiAssert {
ExprCtx {
is_unresolved_ref_safe: false,
unresolved_ctxt: SyntaxContext::empty().apply_mark(ctx.unresolved_mark),
in_strict: false,
},
self.should_error_for_node_apis,
self.is_production,
......
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::optimize_server_react::{optimize_server_react, Config};
use swc_core::{
common::util::take::Take,
ecma::{ast::*, visit::FoldWith},
};
use swc_core::ecma::ast::*;
use turbo_tasks::Vc;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
......@@ -38,9 +35,7 @@ struct NextOptimizeServerReact {
impl CustomTransformer for NextOptimizeServerReact {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_optimize_server_react", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut optimize_server_react(Config {
program.mutate(optimize_server_react(Config {
optimize_use_state: self.optimize_use_state,
}));
Ok(())
......
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::page_config::page_config;
use swc_core::{
common::util::take::Take,
ecma::{ast::*, visit::FoldWith},
};
use swc_core::ecma::ast::*;
use turbo_tasks::{ReadRef, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
......@@ -38,9 +35,7 @@ struct NextPageConfig {
impl CustomTransformer for NextPageConfig {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_page_config", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut page_config(self.is_development, true));
program.mutate(page_config(self.is_development, true));
Ok(())
}
}
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::shake_exports::{shake_exports, Config};
use swc_core::{
common::util::take::Take,
ecma::{ast::*, visit::FoldWith},
};
use swc_core::ecma::ast::*;
use turbo_tasks::Vc;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
......@@ -33,9 +30,7 @@ struct NextShakeExports {
impl CustomTransformer for NextShakeExports {
#[tracing::instrument(level = tracing::Level::TRACE, name = "next_shake_exports", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut shake_exports(Config {
program.mutate(shake_exports(Config {
ignore: self.ignore.iter().map(|s| s.clone().into()).collect(),
}));
Ok(())
......
......@@ -3,13 +3,7 @@ use async_trait::async_trait;
use next_custom_transforms::transforms::strip_page_exports::{
next_transform_strip_page_exports, ExportFilter,
};
use swc_core::{
common::util::take::Take,
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
};
use swc_core::ecma::ast::Program;
use turbo_tasks::Vc;
use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect, RuleCondition};
......@@ -66,9 +60,7 @@ impl CustomTransformer for NextJsStripPageExports {
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
// TODO(alexkirsz) Connect the eliminated_packages to telemetry.
let eliminated_packages = Default::default();
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut next_transform_strip_page_exports(
program.mutate(next_transform_strip_page_exports(
self.export_filter,
eliminated_packages,
));
......
use anyhow::Result;
use async_trait::async_trait;
use swc_core::{
common::util::take::Take,
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
};
use swc_core::ecma::ast::Program;
use turbo_tasks::Vc;
use turbopack::module_options::ModuleRule;
use turbopack_ecmascript::{CustomTransformer, TransformContext};
......@@ -56,8 +50,7 @@ struct ReactRemovePropertiesTransformer {
impl CustomTransformer for ReactRemovePropertiesTransformer {
#[tracing::instrument(level = tracing::Level::TRACE, name = "react_remove_properties", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut react_remove_properties::react_remove_properties(
program.mutate(react_remove_properties::react_remove_properties(
self.config.clone(),
));
......
use anyhow::Result;
use async_trait::async_trait;
use swc_core::{
common::{util::take::Take, SyntaxContext},
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
};
use swc_core::{common::SyntaxContext, ecma::ast::Program};
use turbo_tasks::Vc;
use turbopack::module_options::ModuleRule;
use turbopack_ecmascript::{CustomTransformer, TransformContext};
......@@ -59,8 +53,7 @@ struct RemoveConsoleTransformer {
impl CustomTransformer for RemoveConsoleTransformer {
#[tracing::instrument(level = tracing::Level::TRACE, name = "remove_console", skip_all)]
async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut remove_console::remove_console(
program.mutate(remove_console::remove_console(
self.config.clone(),
SyntaxContext::empty().apply_mark(ctx.unresolved_mark),
));
......
use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::server_actions::{server_actions, Config};
use swc_core::{
common::FileName,
ecma::{ast::Program, visit::VisitMutWith},
};
use swc_core::{common::FileName, ecma::ast::Program};
use turbo_tasks::Vc;
use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
......@@ -42,7 +39,7 @@ struct NextServerActions {
impl CustomTransformer for NextServerActions {
#[tracing::instrument(level = tracing::Level::TRACE, name = "server_actions", skip_all)]
async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
let mut actions = server_actions(
let actions = server_actions(
&FileName::Real(ctx.file_path_str.into()),
Config {
is_react_server_layer: matches!(self.transform, ActionsTransform::Server),
......@@ -52,7 +49,7 @@ impl CustomTransformer for NextServerActions {
ctx.comments.clone(),
);
program.visit_mut_with(&mut actions);
program.mutate(actions);
Ok(())
}
}
......@@ -56,9 +56,9 @@ swc_emotion = { workspace = true }
swc_relay = { workspace = true }
turbopack-ecmascript-plugins = { workspace = true, optional = true }
react_remove_properties = "0.24.21"
remove_console = "0.25.21"
preset_env_base = "0.6.0"
react_remove_properties = "0.24.25"
remove_console = "0.25.25"
preset_env_base = "1.0.0"
[dev-dependencies]
swc_core = { workspace = true, features = ["testing_transform"]}
......
use swc_core::ecma::{
ast::{Module, Script},
visit::{Fold, Visit},
ast::Pass,
visit::{visit_pass, Visit},
};
pub fn linter<V>(visitor: V) -> impl Fold
pub fn linter<V>(visitor: V) -> impl Pass
where
V: Visit,
{
Linter { visitor }
}
struct Linter<V>
where
V: Visit,
{
visitor: V,
}
impl<V> Fold for Linter<V>
where
V: Visit,
{
#[inline(always)]
fn fold_module(&mut self, node: Module) -> Module {
self.visitor.visit_module(&node);
node
}
#[inline(always)]
fn fold_script(&mut self, node: Script) -> Script {
self.visitor.visit_script(&node);
node
}
visit_pass(visitor)
}
use swc_core::ecma::{
ast::{
Ident, IdentName, JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXElementName, JSXOpeningElement,
Pass,
},
atoms::JsWord,
visit::Fold,
visit::{fold_pass, Fold},
};
pub fn amp_attributes() -> impl Fold {
AmpAttributePatcher::default()
pub fn amp_attributes() -> impl Pass {
fold_pass(AmpAttributePatcher::default())
}
#[derive(Debug, Default)]
......
......@@ -6,15 +6,15 @@ use swc_core::{
ecma::{
ast::{
CallExpr, Callee, ExportDefaultDecl, ExportDefaultExpr, Expr, FnDecl, FnExpr,
KeyValueProp, MemberProp, ObjectLit, PropOrSpread, VarDeclarator,
KeyValueProp, MemberProp, ObjectLit, Pass, PropOrSpread, VarDeclarator,
},
utils::ExprFactory,
visit::{as_folder, Fold, VisitMut, VisitMutWith},
visit::{visit_mut_pass, VisitMut, VisitMutWith},
},
};
pub fn debug_fn_name() -> impl VisitMut + Fold {
as_folder(DebugFnName::default())
pub fn debug_fn_name() -> impl VisitMut + Pass {
visit_mut_pass(DebugFnName::default())
}
#[derive(Default)]
......
use swc_core::{
common::errors::HANDLER,
ecma::{
ast::ExportAll,
transforms::base::pass::Optional,
visit::{noop_fold_type, Fold},
},
common::{errors::HANDLER, pass::Optional},
ecma::ast::{ModuleDecl, ModuleItem, Pass, Program},
};
pub fn disallow_re_export_all_in_page(is_page_file: bool) -> impl Fold {
pub fn disallow_re_export_all_in_page(is_page_file: bool) -> impl Pass {
Optional::new(DisallowReExportAllInPage, is_page_file)
}
struct DisallowReExportAllInPage;
impl Fold for DisallowReExportAllInPage {
noop_fold_type!();
impl Pass for DisallowReExportAllInPage {
fn process(&mut self, program: &mut Program) {
let Program::Module(m) = program else {
return;
};
fn fold_export_all(&mut self, e: ExportAll) -> ExportAll {
HANDLER.with(|handler| {
handler
.struct_span_err(
e.span,
"Using `export * from '...'` in a page is disallowed. Please use `export { default } from '...'` instead.\nRead more: https://nextjs.org/docs/messages/export-all-in-page",
)
.emit()
});
e
for item in m.body.iter_mut() {
let ModuleItem::ModuleDecl(ModuleDecl::ExportAll(e)) = item else {
continue;
};
HANDLER.with(|handler| {
handler
.struct_span_err(
e.span,
"Using `export * from '...'` in a page is disallowed. Please use `export { default } from '...'` instead.\nRead more: https://nextjs.org/docs/messages/export-all-in-page",
)
.emit()
});
}
}
}
......@@ -11,10 +11,10 @@ use swc_core::{
op, ArrayLit, ArrowExpr, BinExpr, BlockStmt, BlockStmtOrExpr, Bool, CallExpr, Callee,
Expr, ExprOrSpread, ExprStmt, Id, Ident, IdentName, ImportDecl, ImportDefaultSpecifier,
ImportNamedSpecifier, ImportSpecifier, KeyValueProp, Lit, ModuleDecl, ModuleItem,
ObjectLit, Prop, PropName, PropOrSpread, Stmt, Str, Tpl, UnaryExpr, UnaryOp,
ObjectLit, Pass, Prop, PropName, PropOrSpread, Stmt, Str, Tpl, UnaryExpr, UnaryOp,
},
utils::{private_ident, quote_ident, ExprFactory},
visit::{Fold, FoldWith},
visit::{fold_pass, Fold, FoldWith},
},
quote,
};
......@@ -32,8 +32,8 @@ pub fn next_dynamic(
mode: NextDynamicMode,
filename: Arc<FileName>,
pages_or_app_dir: Option<PathBuf>,
) -> impl Fold {
NextDynamicPatcher {
) -> impl Pass {
fold_pass(NextDynamicPatcher {
is_development,
is_server_compiler,
is_react_server_layer,
......@@ -52,7 +52,7 @@ pub fn next_dynamic(
imports: vec![],
},
},
}
})
}
#[derive(Debug, Clone, Eq, PartialEq)]
......
......@@ -3,9 +3,9 @@ use serde::Deserialize;
use swc_core::{
common::{collections::AHashMap, BytePos, Spanned},
ecma::{
ast::{Id, ModuleItem},
ast::{Id, ModuleItem, Pass},
atoms::JsWord,
visit::{as_folder, noop_visit_mut_type, Fold, VisitMut, VisitWith},
visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitWith},
},
};
......@@ -20,8 +20,8 @@ pub struct Config {
pub relative_file_path_from_root: JsWord,
}
pub fn next_font_loaders(config: Config) -> impl Fold + VisitMut {
as_folder(NextFontLoaders {
pub fn next_font_loaders(config: Config) -> impl Pass + VisitMut {
visit_mut_pass(NextFontLoaders {
config,
state: State {
..Default::default()
......
......@@ -3,7 +3,10 @@ use std::collections::HashSet;
use serde::Deserialize;
use swc_core::{
common::DUMMY_SP,
ecma::{ast::*, visit::Fold},
ecma::{
ast::*,
visit::{fold_pass, Fold},
},
};
#[derive(Clone, Debug, Deserialize)]
......@@ -11,10 +14,10 @@ pub struct Config {
pub packages: Vec<String>,
}
pub fn named_import_transform(config: Config) -> impl Fold {
NamedImportTransform {
pub fn named_import_transform(config: Config) -> impl Pass {
fold_pass(NamedImportTransform {
packages: config.packages,
}
})
}
#[derive(Debug, Default)]
......@@ -22,6 +25,7 @@ struct NamedImportTransform {
packages: Vec<String>,
}
/// TODO: Implement this as a [Pass] instead of a full visitor ([Fold])
impl Fold for NamedImportTransform {
fn fold_import_decl(&mut self, decl: ImportDecl) -> ImportDecl {
// Match named imports and check if it's included in the packages
......
......@@ -10,21 +10,21 @@ use swc_core::{
},
ecma::{
ast::*,
visit::{noop_fold_type, Fold, FoldWith},
visit::{fold_pass, noop_fold_type, Fold, FoldWith},
},
};
static SSG_EXPORTS: &[&str; 3] = &["getStaticProps", "getStaticPaths", "getServerSideProps"];
/// Note: This paths requires running `resolver` **before** running this.
pub fn next_ssg(eliminated_packages: Rc<RefCell<FxHashSet<String>>>) -> impl Fold {
Repeat::new(NextSsg {
pub fn next_ssg(eliminated_packages: Rc<RefCell<FxHashSet<String>>>) -> impl Pass {
fold_pass(Repeat::new(NextSsg {
state: State {
eliminated_packages,
..Default::default()
},
in_lhs_of_var: false,
})
}))
}
/// State of the transforms. Shared by the analyzer and the transform.
......
......@@ -3,7 +3,11 @@ use std::collections::HashMap;
use serde::Deserialize;
use swc_core::{
common::DUMMY_SP,
ecma::{ast::*, utils::private_ident, visit::Fold},
ecma::{
ast::*,
utils::private_ident,
visit::{fold_pass, Fold},
},
};
#[derive(Clone, Debug, Deserialize)]
......@@ -11,10 +15,10 @@ pub struct Config {
pub wildcard: bool,
}
pub fn optimize_barrel(config: Config) -> impl Fold {
OptimizeBarrel {
pub fn optimize_barrel(config: Config) -> impl Pass {
fold_pass(OptimizeBarrel {
wildcard: config.wildcard,
}
})
}
#[derive(Debug, Default)]
......
......@@ -7,7 +7,7 @@ use swc_core::{
common::DUMMY_SP,
ecma::{
ast::*,
visit::{Fold, FoldWith},
visit::{fold_pass, Fold, FoldWith},
},
};
......@@ -16,11 +16,11 @@ pub struct Config {
pub optimize_use_state: bool,
}
pub fn optimize_server_react(config: Config) -> impl Fold {
OptimizeServerReact {
pub fn optimize_server_react(config: Config) -> impl Pass {
fold_pass(OptimizeServerReact {
optimize_use_state: config.optimize_use_state,
..Default::default()
}
})
}
#[derive(Debug, Default)]
......
......@@ -3,24 +3,24 @@ use swc_core::{
common::{errors::HANDLER, Span, DUMMY_SP},
ecma::{
ast::*,
visit::{Fold, FoldWith},
visit::{fold_pass, Fold, FoldWith},
},
};
pub fn page_config(is_development: bool, is_page_file: bool) -> impl Fold {
PageConfig {
pub fn page_config(is_development: bool, is_page_file: bool) -> impl Pass {
fold_pass(PageConfig {
is_development,
is_page_file,
..Default::default()
}
})
}
pub fn page_config_test() -> impl Fold {
PageConfig {
pub fn page_config_test() -> impl Pass {
fold_pass(PageConfig {
in_test: true,
is_page_file: true,
..Default::default()
}
})
}
#[derive(Debug, Default)]
......@@ -34,6 +34,7 @@ struct PageConfig {
const STRING_LITERAL_DROP_BUNDLE: &str = "__NEXT_DROP_CLIENT_FILE__";
const CONFIG_KEY: &str = "config";
/// TODO: Implement this as a [Pass] instead of a full visitor ([Fold])
impl Fold for PageConfig {
fn fold_module_items(&mut self, items: Vec<ModuleItem>) -> Vec<ModuleItem> {
let mut new_items = vec![];
......
......@@ -36,6 +36,7 @@ impl CollectExportedConstVisitor {
expr_ctx: ExprCtx {
unresolved_ctxt: SyntaxContext::empty().apply_mark(Mark::new()),
is_unresolved_ref_safe: false,
in_strict: false,
},
}
}
......
......@@ -15,7 +15,7 @@ use swc_core::{
atoms::{js_word, JsWord},
utils::{prepend_stmts, quote_ident, quote_str, ExprFactory},
visit::{
as_folder, noop_visit_mut_type, noop_visit_type, Fold, Visit, VisitMut, VisitMutWith,
noop_visit_mut_type, noop_visit_type, visit_mut_pass, Visit, VisitMut, VisitMutWith,
VisitWith,
},
},
......@@ -1011,7 +1011,7 @@ pub fn server_components<C: Comments>(
config: Config,
comments: C,
app_dir: Option<PathBuf>,
) -> impl Fold + VisitMut {
) -> impl Pass + VisitMut {
let is_react_server_layer: bool = match &config {
Config::WithOptions(x) => x.is_react_server_layer,
_ => false,
......@@ -1020,7 +1020,7 @@ pub fn server_components<C: Comments>(
Config::WithOptions(x) => x.dynamic_io_enabled,
_ => false,
};
as_folder(ReactServerComponents {
visit_mut_pass(ReactServerComponents {
is_react_server_layer,
dynamic_io_enabled,
comments,
......
......@@ -18,7 +18,7 @@ use swc_core::{
ast::*,
atoms::JsWord,
utils::{private_ident, quote_ident, ExprFactory},
visit::{as_folder, noop_visit_mut_type, Fold, VisitMut, VisitMutWith},
visit::{noop_visit_mut_type, visit_mut_pass, VisitMut, VisitMutWith},
},
};
......@@ -35,12 +35,8 @@ pub struct Config {
pub type ActionsMap = BTreeMap<String, String>;
#[tracing::instrument(level = tracing::Level::TRACE, skip_all)]
pub fn server_actions<C: Comments>(
file_name: &FileName,
config: Config,
comments: C,
) -> impl VisitMut + Fold {
as_folder(ServerActions {
pub fn server_actions<C: Comments>(file_name: &FileName, config: Config, comments: C) -> impl Pass {
visit_mut_pass(ServerActions {
config,
comments,
file_name: file_name.to_string(),
......
......@@ -5,7 +5,7 @@ use swc_core::{
ast::*,
atoms::{js_word, JsWord},
transforms::optimization::simplify::dce::{dce, Config as DCEConfig},
visit::{Fold, FoldWith},
visit::{fold_pass, Fold, FoldWith, VisitMutWith},
},
};
......@@ -14,11 +14,11 @@ pub struct Config {
pub ignore: Vec<JsWord>,
}
pub fn shake_exports(config: Config) -> impl Fold {
ExportShaker {
pub fn shake_exports(config: Config) -> impl Pass {
fold_pass(ExportShaker {
ignore: config.ignore,
..Default::default()
}
})
}
#[derive(Debug, Default)]
......@@ -28,9 +28,10 @@ struct ExportShaker {
}
impl Fold for ExportShaker {
fn fold_module(&mut self, module: Module) -> Module {
let module = module.fold_children_with(self);
module.fold_with(&mut dce(DCEConfig::default(), Mark::new()))
fn fold_module(&mut self, mut module: Module) -> Module {
module = module.fold_children_with(self);
module.visit_mut_with(&mut dce(DCEConfig::default(), Mark::new()));
module
}
fn fold_module_items(&mut self, items: Vec<ModuleItem>) -> Vec<ModuleItem> {
......
......@@ -14,7 +14,7 @@ use swc_core::{
},
ecma::{
ast::*,
visit::{noop_fold_type, noop_visit_type, Fold, FoldWith, Visit, VisitWith},
visit::{fold_pass, noop_fold_type, noop_visit_type, Fold, FoldWith, Visit, VisitWith},
},
};
......@@ -58,8 +58,8 @@ impl PageMode {
pub fn next_transform_strip_page_exports(
filter: ExportFilter,
ssr_removed_packages: Rc<RefCell<FxHashSet<String>>>,
) -> impl Fold {
Repeat::new(NextSsg {
) -> impl Pass {
fold_pass(Repeat::new(NextSsg {
state: State {
ssr_removed_packages,
filter,
......@@ -67,7 +67,7 @@ pub fn next_transform_strip_page_exports(
},
in_lhs_of_var: false,
remove_expression: false,
})
}))
}
/// State of the transforms. Shared by the analyzer and the transform.
......
......@@ -12,7 +12,7 @@ use next_custom_transforms::transforms::{
strip_page_exports::{next_transform_strip_page_exports, ExportFilter},
};
use swc_core::{
common::{chain, FileName, Mark},
common::{FileName, Mark},
ecma::{
parser::{EsSyntax, Syntax},
transforms::{
......@@ -40,6 +40,7 @@ fn re_export_all_in_page(input: PathBuf) {
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......@@ -65,6 +66,7 @@ fn next_dynamic_errors(input: PathBuf) {
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......@@ -80,6 +82,7 @@ fn next_ssg_errors(input: PathBuf) {
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......@@ -106,6 +109,7 @@ fn react_server_components_server_graph_errors(input: PathBuf) {
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......@@ -132,6 +136,7 @@ fn react_server_components_client_graph_errors(input: PathBuf) {
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......@@ -152,6 +157,7 @@ fn next_font_loaders_errors(input: PathBuf) {
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......@@ -164,14 +170,14 @@ fn react_server_actions_server_errors(input: PathBuf) {
test_fixture(
syntax(),
&|tr| {
chain!(
(
resolver(Mark::new(), Mark::new(), false),
server_components(
FileName::Real(PathBuf::from("/app/item.js")).into(),
Config::WithOptions(Options {
is_react_server_layer: true,
dynamic_io_enabled: false
},),
dynamic_io_enabled: false,
}),
tr.comments.as_ref().clone(),
None,
),
......@@ -180,16 +186,17 @@ fn react_server_actions_server_errors(input: PathBuf) {
server_actions::Config {
is_react_server_layer: true,
enabled: true,
hash_salt: "".into()
hash_salt: "".into(),
},
tr.comments.as_ref().clone(),
)
),
)
},
&input,
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......@@ -202,14 +209,14 @@ fn react_server_actions_client_errors(input: PathBuf) {
test_fixture(
syntax(),
&|tr| {
chain!(
(
resolver(Mark::new(), Mark::new(), false),
server_components(
FileName::Real(PathBuf::from("/app/item.js")).into(),
Config::WithOptions(Options {
is_react_server_layer: false,
dynamic_io_enabled: false
},),
dynamic_io_enabled: false,
}),
tr.comments.as_ref().clone(),
None,
),
......@@ -218,16 +225,17 @@ fn react_server_actions_client_errors(input: PathBuf) {
server_actions::Config {
is_react_server_layer: false,
enabled: true,
hash_salt: "".into()
hash_salt: "".into(),
},
tr.comments.as_ref().clone(),
)
),
)
},
&input,
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......@@ -245,6 +253,7 @@ fn next_transform_strip_page_exports_errors(input: PathBuf) {
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
......
......@@ -23,17 +23,17 @@ use next_custom_transforms::transforms::{
};
use serde::de::DeserializeOwned;
use swc_core::{
common::{chain, comments::SingleThreadedComments, FileName, Mark, SyntaxContext},
common::{comments::SingleThreadedComments, FileName, Mark, SyntaxContext},
ecma::{
ast::{Module, Script},
ast::Pass,
parser::{EsSyntax, Syntax},
transforms::{
base::resolver,
react::jsx,
testing::{test, test_fixture, FixtureTestConfig},
testing::{test_fixture, FixtureTestConfig},
},
utils::ExprCtx,
visit::{as_folder, noop_fold_type, Fold, Visit},
visit::{visit_mut_pass, visit_pass, Visit},
},
};
use swc_relay::{relay, RelayLanguageConfig};
......@@ -220,10 +220,10 @@ fn next_ssg_fixture(input: PathBuf) {
top_level_mark,
unresolved_mark,
);
chain!(
(
resolver(unresolved_mark, top_level_mark, true),
next_ssg(Default::default()),
jsx
jsx,
)
},
&input,
......@@ -329,7 +329,10 @@ fn react_server_components_typescript(input: PathBuf) {
},
&input,
&output,
Default::default(),
FixtureTestConfig {
module: Some(true),
..Default::default()
},
);
}
......@@ -352,7 +355,10 @@ fn react_server_components_server_graph_fixture(input: PathBuf) {
},
&input,
&output,
Default::default(),
FixtureTestConfig {
module: Some(true),
..Default::default()
},
);
}
......@@ -402,22 +408,25 @@ fn server_actions_server_fixture(input: PathBuf) {
test_fixture(
syntax(),
&|_tr| {
chain!(
(
resolver(Mark::new(), Mark::new(), false),
server_actions(
&FileName::Real("/app/item.js".into()),
server_actions::Config {
is_react_server_layer: true,
enabled: true,
hash_salt: "".into()
hash_salt: "".into(),
},
_tr.comments.as_ref().clone(),
)
),
)
},
&input,
&output,
Default::default(),
FixtureTestConfig {
module: Some(true),
..Default::default()
},
);
}
......@@ -427,22 +436,25 @@ fn server_actions_client_fixture(input: PathBuf) {
test_fixture(
syntax(),
&|_tr| {
chain!(
(
resolver(Mark::new(), Mark::new(), false),
server_actions(
&FileName::Real("/app/item.js".into()),
server_actions::Config {
is_react_server_layer: false,
enabled: true,
hash_salt: "".into()
hash_salt: "".into(),
},
_tr.comments.as_ref().clone(),
)
),
)
},
&input,
&output,
Default::default(),
FixtureTestConfig {
module: Some(true),
..Default::default()
},
);
}
......@@ -457,9 +469,9 @@ fn cjs_optimize_fixture(input: PathBuf) {
let unresolved_ctxt = SyntaxContext::empty().apply_mark(unresolved_mark);
chain!(
(
resolver(unresolved_mark, top_level_mark, false),
as_folder(cjs_optimizer(
visit_mut_pass(cjs_optimizer(
json(
r#"
{
......@@ -471,15 +483,18 @@ fn cjs_optimize_fixture(input: PathBuf) {
}
}
}
"#
"#,
),
unresolved_ctxt
))
unresolved_ctxt,
)),
)
},
&input,
&output,
Default::default(),
FixtureTestConfig {
module: Some(true),
..Default::default()
},
);
}
......@@ -492,15 +507,15 @@ fn named_import_transform_fixture(input: PathBuf) {
let unresolved_mark = Mark::new();
let top_level_mark = Mark::new();
chain!(
(
resolver(unresolved_mark, top_level_mark, false),
named_import_transform(json(
r#"
{
"packages": ["foo", "bar"]
}
"#
))
"#,
)),
)
},
&input,
......@@ -518,15 +533,15 @@ fn optimize_barrel_fixture(input: PathBuf) {
let unresolved_mark = Mark::new();
let top_level_mark = Mark::new();
chain!(
(
resolver(unresolved_mark, top_level_mark, false),
optimize_barrel(json(
r#"
{
"wildcard": false
}
"#
))
"#,
)),
)
},
&input,
......@@ -544,15 +559,15 @@ fn optimize_barrel_wildcard_fixture(input: PathBuf) {
let unresolved_mark = Mark::new();
let top_level_mark = Mark::new();
chain!(
(
resolver(unresolved_mark, top_level_mark, false),
optimize_barrel(json(
r#"
{
"wildcard": true
}
"#
))
"#,
)),
)
},
&input,
......@@ -570,11 +585,11 @@ fn optimize_server_react_fixture(input: PathBuf) {
let unresolved_mark = Mark::new();
let top_level_mark = Mark::new();
chain!(
(
resolver(unresolved_mark, top_level_mark, false),
optimize_server_react(optimize_server_react::Config {
optimize_use_state: true
})
optimize_use_state: true,
}),
)
},
&input,
......@@ -599,9 +614,9 @@ fn pure(input: PathBuf) {
let unresolved_mark = Mark::new();
let top_level_mark = Mark::new();
chain!(
(
resolver(unresolved_mark, top_level_mark, false),
as_folder(pure_magic(tr.comments.clone()))
visit_mut_pass(pure_magic(tr.comments.clone())),
)
},
&input,
......@@ -632,15 +647,18 @@ fn run_stip_page_exports_test(input: &Path, output: &Path, mode: ExportFilter) {
top_level_mark,
unresolved_mark,
);
chain!(
(
swc_core::ecma::transforms::base::resolver(unresolved_mark, top_level_mark, true),
next_transform_strip_page_exports(mode, Default::default()),
jsx
jsx,
)
},
input,
output,
Default::default(),
FixtureTestConfig {
module: Some(true),
..Default::default()
},
);
}
......@@ -668,9 +686,9 @@ fn test_debug_name(input: PathBuf) {
let top_level_mark = Mark::fresh(Mark::root());
let unresolved_mark = Mark::fresh(Mark::root());
chain!(
(
swc_core::ecma::transforms::base::resolver(unresolved_mark, top_level_mark, true),
debug_fn_name()
debug_fn_name(),
)
},
&input,
......@@ -689,56 +707,33 @@ fn test_edge_assert(input: PathBuf) {
let top_level_mark = Mark::fresh(Mark::root());
let unresolved_mark = Mark::fresh(Mark::root());
chain!(
(
swc_core::ecma::transforms::base::resolver(unresolved_mark, top_level_mark, true),
lint_to_fold(warn_for_edge_runtime(
t.cm.clone(),
ExprCtx {
is_unresolved_ref_safe: false,
unresolved_ctxt: SyntaxContext::empty().apply_mark(unresolved_mark),
in_strict: false,
},
true,
true
))
true,
)),
)
},
&input,
&output,
FixtureTestConfig {
allow_error: true,
module: Some(true),
..Default::default()
},
);
}
fn lint_to_fold<R>(r: R) -> impl Fold
where
R: Visit,
{
LintFolder(r)
}
struct LintFolder<R>(R)
where
R: Visit;
impl<R> Fold for LintFolder<R>
fn lint_to_fold<R>(r: R) -> impl Pass
where
R: Visit,
{
noop_fold_type!();
#[inline(always)]
fn fold_module(&mut self, program: Module) -> Module {
self.0.visit_module(&program);
program
}
#[inline(always)]
fn fold_script(&mut self, program: Script) -> Script {
self.0.visit_script(&program);
program
}
visit_pass(r)
}
......@@ -6,8 +6,8 @@ use swc_core::{
base::Compiler,
common::{comments::SingleThreadedComments, Mark},
ecma::{
ast::noop_pass,
parser::{Syntax, TsSyntax},
transforms::base::pass::noop,
},
};
use testing::{NormalizedOutput, Tester};
......@@ -104,7 +104,7 @@ fn test(input: &Path, minify: bool) {
unresolved_mark,
)
},
|_| noop(),
|_| noop_pass(),
) {
Ok(v) => {
NormalizedOutput::from(v.code)
......
......@@ -6,7 +6,7 @@ use once_cell::sync::Lazy;
use swc_core::{
base::{try_with_handler, Compiler},
common::{comments::SingleThreadedComments, FileName, FilePathMapping, SourceMap, GLOBALS},
ecma::transforms::base::pass::noop,
ecma::ast::noop_pass,
};
static COMPILER: Lazy<Arc<Compiler>> = Lazy::new(|| {
......@@ -47,7 +47,7 @@ export function getServerSideProps() {
&Default::default(),
comments,
|_| next_ssg(eliminated_packages.clone()),
|_| noop(),
|_| noop_pass(),
)
})
})
......
......@@ -13,7 +13,7 @@ use swc_core::{
errors::ColorConfig,
FileName, FilePathMapping, Mark, SourceMap, GLOBALS,
},
ecma::transforms::base::pass::noop,
ecma::ast::noop_pass,
};
use wasm_bindgen::prelude::*;
use wasm_bindgen_futures::future_to_promise;
......@@ -109,7 +109,7 @@ pub fn transform_sync(s: JsValue, opts: JsValue) -> Result<JsValue, JsValue> {
unresolved_mark,
)
},
|_| noop(),
|_| noop_pass(),
)
.context("failed to process js file")?
}
......
......@@ -95,14 +95,13 @@ impl CustomTransformer for EmotionTransformer {
async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
#[cfg(feature = "transform_emotion")]
{
let p = std::mem::replace(program, Program::Module(Module::dummy()));
let hash = {
#[allow(clippy::disallowed_types)]
let mut hasher = std::collections::hash_map::DefaultHasher::new();
p.hash(&mut hasher);
program.hash(&mut hasher);
hasher.finish()
};
*program = p.fold_with(&mut swc_emotion::emotion(
program.mutate(swc_emotion::emotion(
self.config.clone(),
Path::new(ctx.file_name_str),
hash as u32,
......
......@@ -4,13 +4,7 @@ use anyhow::Result;
use async_trait::async_trait;
use modularize_imports::{modularize_imports, Config, PackageConfig};
use serde::{Deserialize, Serialize};
use swc_core::{
common::util::take::Take,
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
};
use swc_core::ecma::ast::Program;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap};
use turbopack_ecmascript::{CustomTransformer, TransformContext};
......@@ -55,8 +49,7 @@ impl ModularizeImportsTransformer {
impl CustomTransformer for ModularizeImportsTransformer {
#[tracing::instrument(level = tracing::Level::TRACE, name = "modularize_imports", skip_all)]
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut modularize_imports(Config {
program.mutate(modularize_imports(Config {
packages: self.packages.clone(),
}));
......
......@@ -3,13 +3,7 @@ use std::{path::PathBuf, sync::Arc};
use anyhow::{Context, Result};
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use swc_core::{
common::{util::take::Take, FileName},
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
};
use swc_core::{common::FileName, ecma::ast::Program};
use swc_relay::RelayLanguageConfig;
use turbo_tasks::trace::TraceRawVcs;
use turbo_tasks_fs::FileSystemPath;
......@@ -73,8 +67,7 @@ impl CustomTransformer for RelayTransformer {
.context("Expected relative path to relay artifact")?,
);
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut swc_relay::relay(
program.mutate(swc_relay::relay(
self.config.clone(),
FileName::Real(PathBuf::from(ctx.file_name_str)),
path_to_proj,
......
......@@ -12,12 +12,11 @@ use swc_core::{
ast::{EsVersion, Program},
codegen::{
text_writer::{self, JsWriter, WriteJs},
Emitter, Node,
Emitter,
},
minifier::option::{ExtraOptions, MangleOptions, MinifyOptions},
parser::{lexer::Lexer, Parser, StringInput, Syntax},
transforms::base::fixer::paren_remover,
visit::FoldWith,
},
};
use turbo_tasks::Vc;
......@@ -67,14 +66,13 @@ pub async fn minify(path: Vc<FileSystemPath>, code: Vc<Code>) -> Result<Vc<Code>
let top_level_mark = Mark::new();
Ok(compiler.run_transform(handler, false, || {
let program = program.fold_with(&mut paren_remover(Some(&comments)));
let program = program.apply(paren_remover(Some(&comments)));
let mut program =
program.fold_with(&mut swc_core::ecma::transforms::base::resolver(
unresolved_mark,
top_level_mark,
false,
));
let mut program = program.apply(swc_core::ecma::transforms::base::resolver(
unresolved_mark,
top_level_mark,
false,
));
program = swc_core::ecma::minifier::optimize(
program,
......@@ -96,7 +94,7 @@ pub async fn minify(path: Vc<FileSystemPath>, code: Vc<Code>) -> Result<Vc<Code>
},
);
program.fold_with(&mut ecma::transforms::base::fixer::fixer(Some(
program.apply(ecma::transforms::base::fixer::fixer(Some(
&comments as &dyn Comments,
)))
}))
......@@ -145,8 +143,8 @@ fn print_program(
wr,
};
program
.emit_with(&mut emitter)
emitter
.emit_program(&program)
.context("failed to emit module")?;
}
// Invalid utf8 is valid in javascript world.
......
......@@ -17,7 +17,7 @@ use swc_core::{
helpers::{Helpers, HELPERS},
resolver,
},
visit::{FoldWith, VisitMutWith},
visit::VisitMutWith,
},
};
use tracing::Instrument;
......@@ -383,8 +383,8 @@ async fn parse_file_content(
es_version: EsVersion::latest(),
source_map: source_map.clone(),
});
parsed_program =
parsed_program.fold_with(&mut swc_core::ecma::lints::rules::lint_to_fold(rules));
parsed_program.mutate(swc_core::ecma::lints::rules::lint_to_fold(rules));
drop(span);
let transform_context = TransformContext {
......
......@@ -3,18 +3,17 @@ use std::{fmt::Debug, hash::Hash, sync::Arc};
use anyhow::Result;
use async_trait::async_trait;
use swc_core::{
atoms::JsWord,
atoms::Atom,
base::SwcComments,
common::{chain, collections::AHashMap, comments::Comments, util::take::Take, Mark, SourceMap},
common::{collections::AHashMap, comments::Comments, util::take::Take, Mark, SourceMap},
ecma::{
ast::{Module, ModuleItem, Program, Script},
preset_env::{self, Targets},
transforms::{
base::{feature::FeatureFlag, helpers::inject_helpers, Assumptions},
base::{assumptions::Assumptions, feature::FeatureFlag, helpers::inject_helpers},
optimization::inline_globals2,
react::react,
},
visit::{FoldWith, VisitMutWith},
},
quote,
};
......@@ -129,10 +128,10 @@ impl EcmascriptInputTransform {
} = ctx;
match self {
EcmascriptInputTransform::GlobalTypeofs { window_value } => {
let mut typeofs: AHashMap<JsWord, JsWord> = Default::default();
typeofs.insert("window".into(), JsWord::from(&**window_value));
let mut typeofs: AHashMap<Atom, Atom> = Default::default();
typeofs.insert(Atom::from("window"), Atom::from(&**window_value));
program.visit_mut_with(&mut inline_globals2(
program.mutate(inline_globals2(
Default::default(),
Default::default(),
Default::default(),
......@@ -179,7 +178,7 @@ impl EcmascriptInputTransform {
// Explicit type annotation to ensure that we don't duplicate transforms in the
// final binary
program.visit_mut_with(&mut react::<&dyn Comments>(
program.mutate(react::<&dyn Comments>(
source_map.clone(),
Some(&comments),
config,
......@@ -209,7 +208,7 @@ impl EcmascriptInputTransform {
EcmascriptInputTransform::CommonJs => {
// Explicit type annotation to ensure that we don't duplicate transforms in the
// final binary
program.visit_mut_with(&mut swc_core::ecma::transforms::module::common_js(
program.mutate(swc_core::ecma::transforms::module::common_js(
swc_core::ecma::transforms::module::path::Resolver::Default,
unresolved_mark,
swc_core::ecma::transforms::module::util::Config {
......@@ -249,7 +248,7 @@ impl EcmascriptInputTransform {
// Explicit type annotation to ensure that we don't duplicate transforms in the
// final binary
*program = module_program.fold_with(&mut chain!(
*program = module_program.apply((
preset_env::preset_env::<&'_ dyn Comments>(
top_level_mark,
Some(&comments),
......@@ -266,7 +265,7 @@ impl EcmascriptInputTransform {
} => {
use swc_core::ecma::transforms::typescript::typescript;
let config = Default::default();
program.visit_mut_with(&mut typescript(config, unresolved_mark, top_level_mark));
program.mutate(typescript(config, unresolved_mark, top_level_mark));
}
EcmascriptInputTransform::Decorators {
is_legacy,
......@@ -282,11 +281,7 @@ impl EcmascriptInputTransform {
..Default::default()
};
let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut chain!(
decorators(config),
inject_helpers(unresolved_mark)
));
program.mutate((decorators(config), inject_helpers(unresolved_mark)));
}
EcmascriptInputTransform::Plugin(transform) => {
transform.await?.transform(program, ctx).await?
......
......@@ -1233,6 +1233,7 @@ impl DepGraph {
e.may_have_side_effects(&ExprCtx {
unresolved_ctxt,
is_unresolved_ref_safe: false,
in_strict: false,
})
}));
......
......@@ -204,7 +204,7 @@ function createPromise() {
const turbopackQueues = Symbol("turbopack queues");
const turbopackExports = Symbol("turbopack exports");
const turbopackError = Symbol("turbopack error");
var QueueStatus;
;
function resolveQueue(queue) {
if (queue && queue.status !== 1) {
queue.status = 1;
......@@ -420,8 +420,7 @@ async function instantiateWebAssemblyFromPath(path, importsObj) {
/// <reference path="../shared-node/base-externals-utils.ts" />
/// <reference path="../shared-node/node-externals-utils.ts" />
/// <reference path="../shared-node/node-wasm-utils.ts" />
var SourceType;
(function(SourceType) {
var SourceType = /*#__PURE__*/ function(SourceType) {
/**
* The module was instantiated because it was included in an evaluated chunk's
* runtime.
......@@ -429,7 +428,8 @@ var SourceType;
/**
* The module was instantiated because a parent module imported it.
*/ SourceType[SourceType["Parent"] = 1] = "Parent";
})(SourceType || (SourceType = {}));
return SourceType;
}(SourceType || {});
function stringifySourceInfo(source) {
switch(source.type){
case 0:
......
......@@ -214,7 +214,7 @@ function createPromise() {
const turbopackQueues = Symbol("turbopack queues");
const turbopackExports = Symbol("turbopack exports");
const turbopackError = Symbol("turbopack error");
var QueueStatus;
;
function resolveQueue(queue) {
if (queue && queue.status !== 1) {
queue.status = 1;
......@@ -354,8 +354,7 @@ relativeURL.prototype = URL.prototype;
* shared runtime utils.
*/ /* eslint-disable @typescript-eslint/no-unused-vars */ /// <reference path="../base/globals.d.ts" />
/// <reference path="../../../shared/runtime-utils.ts" />
var SourceType;
(function(SourceType) {
var SourceType = /*#__PURE__*/ function(SourceType) {
/**
* The module was instantiated because it was included in an evaluated chunk's
* runtime.
......@@ -367,7 +366,8 @@ var SourceType;
* The module was instantiated because it was included in a chunk's hot module
* update.
*/ SourceType[SourceType["Update"] = 2] = "Update";
})(SourceType || (SourceType = {}));
return SourceType;
}(SourceType || {});
const moduleFactories = Object.create(null);
/**
* Module IDs that are instantiated as part of the runtime of a chunk.
......
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