fix: Fix tree shaking even more (vercel/turborepo#8864)

### Description Fix server action and rename the injected variable. The previous code fails if the name of the top-level variable is `v`. This was not a problem for almost all modules, but some packages like [`@firebase/webchannel-wrapper`](https://unpkg.com/@firebase/[email protected]/dist/index.esm.js) is published after mangling, so it can be a problem ### Testing Instructions See #66689
vercel · Jul 30, 2024 · 72f4094 · 72f4094
1 parent ee57264
commit 72f4094
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 51 deletions.
diff --git a/crates/turbopack-ecmascript/src/references/esm/export.rs b/crates/turbopack-ecmascript/src/references/esm/export.rs
@@ -442,8 +442,9 @@ impl CodeGenerateable for EsmExports {
                 EsmExport::LocalBinding(name, mutable) => {
                     if *mutable {
                         Some(quote!(
-                            "([() => $local, (v) => $local = v])" as Expr,
-                            local = Ident::new((name as &str).into(), DUMMY_SP)
+                            "([() => $local, ($new) => $local = $new])" as Expr,
+                            local = Ident::new((name as &str).into(), DUMMY_SP),
+                            new = Ident::new(format!("{name}_new_value").into(), DUMMY_SP),
                         ))
                     } else {
                         Some(quote!(
@@ -470,8 +471,9 @@ impl CodeGenerateable for EsmExports {
                         });
                         if *mutable {
                             quote!(
-                                "([() => $expr, (v) => $expr = v])" as Expr,
+                                "([() => $expr, ($new) => $expr = $new])" as Expr,
                                 expr: Expr = expr,
+                                new = Ident::new(format!("{name}_new_value").into(), DUMMY_SP),
                             )
                         } else {
                             quote!(

diff --git a/crates/turbopack-ecmascript/src/tree_shake/asset.rs b/crates/turbopack-ecmascript/src/tree_shake/asset.rs
@@ -175,7 +175,7 @@ impl Module for EcmascriptModulePartAsset {
 impl Asset for EcmascriptModulePartAsset {
     #[turbo_tasks::function]
     fn content(&self) -> Vc<AssetContent> {
-        todo!()
+        self.full_module.content()
     }
 }
 

diff --git a/.../79fb1_turbopack-tests_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_f28c6f.js b/.../79fb1_turbopack-tests_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_f28c6f.js
diff --git a/...put/crates_turbopack-tests_tests_snapshot_basic-tree-shake_export-named_input_35ea42._.js b/...put/crates_turbopack-tests_tests_snapshot_basic-tree-shake_export-named_input_35ea42._.js
diff --git a/.../79fb1_turbopack-tests_tests_snapshot_basic-tree-shake_export-namespace_input_c0eca6._.js b/.../79fb1_turbopack-tests_tests_snapshot_basic-tree-shake_export-namespace_input_c0eca6._.js
diff --git a/.../79fb1_turbopack-tests_tests_snapshot_basic-tree-shake_import-named-all_input_71b07f._.js b/.../79fb1_turbopack-tests_tests_snapshot_basic-tree-shake_import-named-all_input_71b07f._.js
diff --git a/...put/crates_turbopack-tests_tests_snapshot_basic-tree-shake_import-named_input_ed0d99._.js b/...put/crates_turbopack-tests_tests_snapshot_basic-tree-shake_import-named_input_ed0d99._.js
diff --git a/.../79fb1_turbopack-tests_tests_snapshot_basic-tree-shake_import-namespace_input_351ad1._.js b/.../79fb1_turbopack-tests_tests_snapshot_basic-tree-shake_import-namespace_input_351ad1._.js
diff --git a/...9fb1_turbopack-tests_tests_snapshot_basic-tree-shake_import-side-effect_input_cdc49f._.js b/...9fb1_turbopack-tests_tests_snapshot_basic-tree-shake_import-side-effect_input_cdc49f._.js