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

fix(turbopack): Do not run `inject_helpers` pass multiple times (#80755)

### What?

Remove `inject_helpers` passes from `apply_transforms`

### Why?

We run `inject_helpers` from `fn parse` anyway, so we don't need to run
it from `apply_transforms`.
parent da46d666
...@@ -10,11 +10,7 @@ use swc_core::{ ...@@ -10,11 +10,7 @@ use swc_core::{
ecma::{ ecma::{
ast::{Module, ModuleItem, Program, Script}, ast::{Module, ModuleItem, Program, Script},
preset_env::{self, Targets}, preset_env::{self, Targets},
transforms::{ transforms::{base::assumptions::Assumptions, optimization::inline_globals, react::react},
base::{assumptions::Assumptions, helpers::inject_helpers},
optimization::inline_globals,
react::react,
},
}, },
quote, quote,
}; };
...@@ -238,15 +234,13 @@ impl EcmascriptInputTransform { ...@@ -238,15 +234,13 @@ impl EcmascriptInputTransform {
// Explicit type annotation to ensure that we don't duplicate transforms in the // Explicit type annotation to ensure that we don't duplicate transforms in the
// final binary // final binary
*program = module_program.apply(( *program =
preset_env::transform_from_env::<&'_ dyn Comments>( module_program.apply(preset_env::transform_from_env::<&'_ dyn Comments>(
top_level_mark, top_level_mark,
Some(&comments), Some(&comments),
config, config,
Assumptions::default(), Assumptions::default(),
), ));
inject_helpers(unresolved_mark),
));
} }
EcmascriptInputTransform::TypeScript { EcmascriptInputTransform::TypeScript {
// TODO(WEB-1213) // TODO(WEB-1213)
...@@ -270,7 +264,7 @@ impl EcmascriptInputTransform { ...@@ -270,7 +264,7 @@ impl EcmascriptInputTransform {
..Default::default() ..Default::default()
}; };
program.mutate((decorators(config), inject_helpers(unresolved_mark))); program.mutate(decorators(config));
} }
EcmascriptInputTransform::Plugin(transform) => { EcmascriptInputTransform::Plugin(transform) => {
transform.await?.transform(program, ctx).await? transform.await?.transform(program, ctx).await?
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$node_modules$2f40$swc$2f$helpers$2f$_$2f$_class_call_check$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/node_modules/@swc/helpers/_/_class_call_check.js [test] (ecmascript)"); var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$node_modules$2f40$swc$2f$helpers$2f$_$2f$_class_call_check$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/node_modules/@swc/helpers/_/_class_call_check.js [test] (ecmascript)");
; ;
;
var Foo = function Foo() { var Foo = function Foo() {
"use strict"; "use strict";
(0, __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$node_modules$2f40$swc$2f$helpers$2f$_$2f$_class_call_check$2e$js__$5b$test$5d$__$28$ecmascript$29$__["_"])(this, Foo); (0, __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$node_modules$2f40$swc$2f$helpers$2f$_$2f$_class_call_check$2e$js__$5b$test$5d$__$28$ecmascript$29$__["_"])(this, Foo);
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
"version": 3, "version": 3,
"sources": [], "sources": [],
"sections": [ "sections": [
{"offset": {"line": 5, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js"],"sourcesContent":["class Foo {}\n\nconsole.log(Foo, [].includes('foo'))\n"],"names":[],"mappings":";;;AAAA,IAAA,AAAM,MAAN,SAAM;;2OAAA;;AAEN,QAAQ,GAAG,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC"}}, {"offset": {"line": 5, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js"],"sourcesContent":["class Foo {}\n\nconsole.log(Foo, [].includes('foo'))\n"],"names":[],"mappings":";;AAAA,IAAA,AAAM,MAAN,SAAM;;2OAAA;;AAEN,QAAQ,GAAG,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC"}},
{"offset": {"line": 18, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/node_modules/@swc/helpers/_/_class_call_check.js"],"sourcesContent":["\"purposefully empty stub\";\n\"@swc/helpers/_/_class_call_check.js\";\n"],"names":[],"mappings":"AAAA;AACA","ignoreList":[0]}}] {"offset": {"line": 17, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/node_modules/@swc/helpers/_/_class_call_check.js"],"sourcesContent":["\"purposefully empty stub\";\n\"@swc/helpers/_/_class_call_check.js\";\n"],"names":[],"mappings":"AAAA;AACA","ignoreList":[0]}}]
} }
\ No newline at end of file
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