Skip to content

Commit

Permalink
Bump swc to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
@devongovett
devongovett committed Nov 12, 2024
1 parent 71acf87 commit cfd26ec
Show file tree
Hide file tree
Showing 8 changed files with 340 additions and 335 deletions.
457 changes: 235 additions & 222 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ napi = ["dep:napi", "dep:napi-derive", "dep:crossbeam-channel"]

[dependencies]
indexmap = "1.9.2"
swc_core = { version = "0.106", features = [
swc_core = { version = "5.0.4", features = [
"common",
"common_ahash",
"common_sourcemap",
Expand Down
2 changes: 1 addition & 1 deletion packages/transformers/js/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
crate-type = ["rlib"]

[dependencies]
swc_core = { version = "0.106", features = [
swc_core = { version = "5.0.4", features = [
"common",
"common_ahash",
"common_sourcemap",
Expand Down
4 changes: 2 additions & 2 deletions packages/transformers/js/core/src/global_replacer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ impl VisitMut for GlobalReplacer<'_> {
0..0,
self
.globals
.values()
.map(|(_, stmt)| ast::ModuleItem::Stmt(stmt.clone())),
.drain(..)
.map(|(_, (_, stmt))| ast::ModuleItem::Stmt(stmt)),
);
}
}
Expand Down
18 changes: 9 additions & 9 deletions packages/transformers/js/core/src/hoist.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1354,12 +1354,12 @@ impl<'a> Hoist<'a> {
#[cfg(test)]
mod tests {
use swc_core::{
common::{chain, comments::SingleThreadedComments, sync::Lrc, FileName, Globals, SourceMap},
common::{comments::SingleThreadedComments, sync::Lrc, FileName, Globals, SourceMap},
ecma::{
codegen::text_writer::JsWriter,
parser::{lexer::Lexer, Parser, StringInput},
transforms::base::{fixer::fixer, hygiene::hygiene, resolver},
visit::VisitWith,
visit::{VisitMutWith, VisitWith},
},
};

Expand All @@ -1382,11 +1382,15 @@ mod tests {

let mut parser = Parser::new_from(lexer);
match parser.parse_program() {
Ok(program) => swc_core::common::GLOBALS.set(&Globals::new(), || {
Ok(mut program) => swc_core::common::GLOBALS.set(&Globals::new(), || {
swc_core::ecma::transforms::base::helpers::HELPERS.set(
&swc_core::ecma::transforms::base::helpers::Helpers::new(false),
|| {
let is_module = program.is_module();
let unresolved_mark = Mark::fresh(Mark::root());
let global_mark = Mark::fresh(Mark::root());
program.mutate(&mut resolver(unresolved_mark, global_mark, false));

let module = match program {
Program::Module(module) => module,
Program::Script(script) => Module {
Expand All @@ -1396,10 +1400,6 @@ mod tests {
},
};

let unresolved_mark = Mark::fresh(Mark::root());
let global_mark = Mark::fresh(Mark::root());
let module = module.fold_with(&mut resolver(unresolved_mark, global_mark, false));

let mut collect = Collect::new(
source_map.clone(),
unresolved_mark,
Expand All @@ -1410,13 +1410,13 @@ mod tests {
);
module.visit_with(&mut collect);

let (module, res) = {
let (mut module, res) = {
let mut hoist = Hoist::new("abc", unresolved_mark, &collect);
let module = module.fold_with(&mut hoist);
(module, hoist.get_result())
};

let module = module.fold_with(&mut chain!(hygiene(), fixer(Some(&comments))));
module.visit_mut_with(&mut (hygiene(), fixer(Some(&comments))));

let code = emit(source_map, comments, &module);
(collect, code, res)
Expand Down
184 changes: 88 additions & 96 deletions packages/transformers/js/core/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use path_slash::PathExt;
use serde::{Deserialize, Serialize};
use swc_core::{
common::{
chain, comments::SingleThreadedComments, errors::Handler, pass::Optional,
comments::SingleThreadedComments, errors::Handler, pass::Optional,
source_map::SourceMapGenConfig, sync::Lrc, FileName, Globals, Mark, SourceMap,
},
ecma::{
Expand All @@ -45,17 +45,18 @@ use swc_core::{
preset_env::{preset_env, Mode::Entry, Targets, Version, Versions},
transforms::{
base::{
assumptions::Assumptions,
fixer::{fixer, paren_remover},
helpers,
hygiene::hygiene,
resolver, Assumptions,
resolver,
},
compat::reserved_words::reserved_words,
optimization::simplify::{dead_branch_remover, expr_simplifier},
proposal::decorators,
react, typescript,
},
visit::{as_folder, FoldWith, VisitWith},
visit::{FoldWith, VisitMutWith, VisitWith},
},
};
use typeof_replacer::*;
Expand Down Expand Up @@ -231,7 +232,7 @@ pub fn transform(

let global_mark = Mark::fresh(Mark::root());
let unresolved_mark = Mark::fresh(Mark::root());
let module = module.fold_with(&mut chain!(
module.mutate(&mut (
resolver(unresolved_mark, global_mark, config.is_type_script),
// Decorators can use type information, so must run before the TypeScript pass.
Optional::new(
Expand All @@ -242,7 +243,7 @@ pub fn transform(
// use_define_for_class_fields is ignored here, uses preset-env assumptions instead
..Default::default()
}),
config.decorators
config.decorators,
),
Optional::new(
typescript::tsx(
Expand All @@ -256,11 +257,11 @@ pub fn transform(
unresolved_mark,
global_mark,
),
config.is_type_script && config.is_jsx
config.is_type_script && config.is_jsx,
),
Optional::new(
typescript::strip(unresolved_mark, global_mark),
config.is_type_script && !config.is_jsx
config.is_type_script && !config.is_jsx,
),
));

Expand All @@ -276,7 +277,8 @@ pub fn transform(
},
};

let mut module = module.fold_with(&mut Optional::new(
let mut program = Program::Module(module);
program.mutate(&mut Optional::new(
react::react(
source_map.clone(),
Some(&comments),
Expand All @@ -286,6 +288,7 @@ pub fn transform(
),
config.is_jsx,
));
let mut module = program.expect_module();

let mut preset_env_config = swc_core::ecma::preset_env::Config {
dynamic_import: true,
Expand Down Expand Up @@ -326,111 +329,104 @@ pub fn transform(
result.is_constant_module = constant_module.is_constant_module;
}

let module = {
let mut passes = chain!(
Optional::new(
as_folder(TypeofReplacer::new(unresolved_mark)),
config.source_type != SourceType::Script,
),
// Inline process.env and process.browser,
Optional::new(
as_folder(EnvReplacer {
replace_env: config.replace_env,
env: &config.env,
is_browser: config.is_browser,
used_env: &mut result.used_env,
source_map: source_map.clone(),
diagnostics: &mut diagnostics,
unresolved_mark
}),
config.source_type != SourceType::Script
),
paren_remover(Some(&comments)),
// Simplify expressions and remove dead branches so that we
// don't include dependencies inside conditionals that are always false.
expr_simplifier(unresolved_mark, Default::default()),
dead_branch_remover(unresolved_mark),
// Inline Node fs.readFileSync calls
Optional::new(
inline_fs(
config.filename.as_str(),
source_map.clone(),
unresolved_mark,
global_mark,
&config.project_root,
&mut fs_deps,
is_module
),
should_inline_fs
),
);
module.visit_mut_with(&mut (
Optional::new(
TypeofReplacer::new(unresolved_mark),
config.source_type != SourceType::Script,
),
// Inline process.env and process.browser,
Optional::new(
EnvReplacer {
replace_env: config.replace_env,
env: &config.env,
is_browser: config.is_browser,
used_env: &mut result.used_env,
source_map: source_map.clone(),
diagnostics: &mut diagnostics,
unresolved_mark,
},
config.source_type != SourceType::Script,
),
paren_remover(Some(&comments)),
// Simplify expressions and remove dead branches so that we
// don't include dependencies inside conditionals that are always false.
expr_simplifier(unresolved_mark, Default::default()),
dead_branch_remover(unresolved_mark),
));

module.fold_with(&mut passes)
};
let mut module = module.fold_with(&mut Optional::new(
inline_fs(
config.filename.as_str(),
source_map.clone(),
unresolved_mark,
global_mark,
&config.project_root,
&mut fs_deps,
is_module,
),
should_inline_fs,
));

let module = module.fold_with(
module.visit_mut_with(
// Replace __dirname and __filename with placeholders in Node env
&mut Optional::new(
as_folder(NodeReplacer {
NodeReplacer {
source_map: source_map.clone(),
items: &mut global_deps,
global_mark,
globals: HashMap::new(),
filename: Path::new(&config.filename),
unresolved_mark,
has_node_replacements: &mut result.has_node_replacements,
}),
},
config.node_replacer,
),
);

let module = {
let mut passes = chain!(
// Insert dependencies for node globals
Optional::new(
as_folder(GlobalReplacer {
source_map: source_map.clone(),
items: &mut global_deps,
global_mark,
globals: IndexMap::new(),
project_root: Path::new(&config.project_root),
filename: Path::new(&config.filename),
unresolved_mark,
scope_hoist: config.scope_hoist
}),
config.insert_node_globals
),
// Transpile new syntax to older syntax if needed
Optional::new(
preset_env(
unresolved_mark,
Some(&comments),
preset_env_config,
assumptions,
&mut Default::default(),
),
should_run_preset_env,
),
// Inject SWC helpers if needed.
helpers::inject_helpers(global_mark),
);
module.visit_mut_with(
// Insert dependencies for node globals
&mut Optional::new(
GlobalReplacer {
source_map: source_map.clone(),
items: &mut global_deps,
global_mark,
globals: IndexMap::new(),
project_root: Path::new(&config.project_root),
filename: Path::new(&config.filename),
unresolved_mark,
scope_hoist: config.scope_hoist,
},
config.insert_node_globals,
),
);

module.fold_with(&mut passes)
};
let mut program = Program::Module(module);
program.mutate(&mut (
// Transpile new syntax to older syntax if needed
Optional::new(
preset_env(
unresolved_mark,
Some(&comments),
preset_env_config,
assumptions,
&mut Default::default(),
),
should_run_preset_env,
),
// Inject SWC helpers if needed.
helpers::inject_helpers(global_mark),
));
let mut module = program.expect_module();

// Flush Id=(JsWord, SyntaxContexts) into unique names and reresolve to
// set global_mark for all nodes, even generated ones.
// - This will also remove any other other marks (like ignore_mark)
// This only needs to be done if preset_env ran because all other transforms
// insert declarations with global_mark (even though they are generated).
let module = if config.scope_hoist && should_run_preset_env {
module.fold_with(&mut chain!(
hygiene(),
resolver(unresolved_mark, global_mark, false)
))
} else {
if config.scope_hoist && should_run_preset_env {
module
};
.visit_mut_with(&mut (hygiene(), resolver(unresolved_mark, global_mark, false)))
}

let ignore_mark = Mark::fresh(Mark::root());
let module = module.fold_with(
Expand Down Expand Up @@ -468,7 +464,7 @@ pub fn transform(
diagnostics.extend(bailouts.iter().map(|bailout| bailout.to_diagnostic()));
}

let module = if config.scope_hoist {
let mut module = if config.scope_hoist {
let res = hoist(module, config.module_id.as_str(), unresolved_mark, &collect);
match res {
Ok((module, hoist_result, hoist_diagnostics)) => {
Expand All @@ -492,11 +488,7 @@ pub fn transform(
module
};

let module = module.fold_with(&mut chain!(
reserved_words(),
hygiene(),
fixer(Some(&comments)),
));
module.visit_mut_with(&mut (reserved_words(), hygiene(), fixer(Some(&comments))));

result.dependencies.extend(global_deps);
result.dependencies.extend(fs_deps);
Expand Down
4 changes: 2 additions & 2 deletions packages/transformers/js/core/src/node_replacer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ impl<'a> VisitMut for NodeReplacer<'a> {
0..0,
self
.globals
.values()
.map(|(_, stmt)| ast::ModuleItem::Stmt(stmt.clone())),
.drain()
.map(|(_, (_, stmt))| ast::ModuleItem::Stmt(stmt)),
);
}
}
Expand Down
Loading

0 comments on commit cfd26ec

Please sign in to comment.