Merge branch 'canary' into verify-cache-busting-param

Author: ijjk

turbopack/crates/turbopack-ecmascript/src/code_gen.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use swc_core::ecma::{
     ast::{
-        BlockStmt, CallExpr, Expr, Lit, MemberExpr, ModuleDecl, ModuleItem, Pass, Pat, Prop,
+        BlockStmt, CallExpr, Expr, Lit, MemberExpr, ModuleDecl, ModuleItem, Pat, Program, Prop,
         SimpleAssignTarget, Stmt, Str, SwitchCase,
     },
     visit::AstParentKind,
@@ -38,7 +38,6 @@ use crate::references::{
 #[derive(Default)]
 pub struct CodeGeneration {
     /// ast nodes matching the span will be visitor by the visitor
-    pub root_visitors: Vec<Box<dyn PassFactory>>,
     pub visitors: Vec<(Vec<AstParentKind>, Box<dyn AstModifier>)>,
     pub hoisted_stmts: Vec<CodeGenerationHoistedStmt>,
     pub early_hoisted_stmts: Vec<CodeGenerationHoistedStmt>,
@@ -52,34 +51,18 @@ impl CodeGeneration {
     }
 
     pub fn new(
-        root_visitors: Vec<Box<dyn PassFactory>>,
         visitors: Vec<(Vec<AstParentKind>, Box<dyn AstModifier>)>,
         hoisted_stmts: Vec<CodeGenerationHoistedStmt>,
         early_hoisted_stmts: Vec<CodeGenerationHoistedStmt>,
     ) -> Self {
         CodeGeneration {
-            root_visitors,
             visitors,
             hoisted_stmts,
             early_hoisted_stmts,
         }
     }
 
-    pub fn root_visitors(root_visitors: Vec<Box<dyn PassFactory>>) -> Self {
-        CodeGeneration {
-            root_visitors,
-            ..Default::default()
-        }
-    }
-
     pub fn visitors(visitors: Vec<(Vec<AstParentKind>, Box<dyn AstModifier>)>) -> Self {
-        #[cfg(debug_assertions)]
-        for (path, _) in visitors.iter() {
-            if path.is_empty() {
-                unreachable!("if the path is empty, the visitor should be a root visitor");
-            }
-        }
-
         CodeGeneration {
             visitors,
             ..Default::default()
@@ -113,10 +96,6 @@ impl CodeGenerationHoistedStmt {
     }
 }
 
-pub trait PassFactory: Send + Sync {
-    fn create<'a>(&'a self) -> Box<dyn Pass + Send + Sync + 'a>;
-}
-
 macro_rules! method {
     ($name:ident, $T:ty) => {
         fn $name(&self, _node: &mut $T) {}
@@ -137,6 +116,7 @@ pub trait AstModifier: Send + Sync {
     method!(visit_mut_str, Str);
     method!(visit_mut_block_stmt, BlockStmt);
     method!(visit_mut_switch_case, SwitchCase);
+    method!(visit_mut_program, Program);
 }
 
 pub trait ModifiableAst {
@@ -166,6 +146,7 @@ impl_modify!(visit_mut_lit, Lit);
 impl_modify!(visit_mut_str, Str);
 impl_modify!(visit_mut_block_stmt, BlockStmt);
 impl_modify!(visit_mut_switch_case, SwitchCase);
+impl_modify!(visit_mut_program, Program);
 
 #[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
 pub enum CodeGen {

turbopack/crates/turbopack-ecmascript/src/lib.rs

@@ -94,7 +94,7 @@ pub use turbopack_resolve::ecmascript as resolve;
 use self::chunk::{EcmascriptChunkItemContent, EcmascriptChunkType, EcmascriptExports};
 use crate::{
     chunk::{EcmascriptChunkPlaceable, placeable::is_marked_as_side_effect_free},
-    code_gen::CodeGens,
+    code_gen::{CodeGens, ModifiableAst},
     parse::generate_js_source_map,
     references::{
         analyse_ecmascript_module, async_module::OptionAsyncModule, esm::base::EsmAssetReferences,
@@ -1172,13 +1172,10 @@ fn process_content_with_code_gens(
         for CodeGenerationHoistedStmt { key, stmt } in code_gen.early_hoisted_stmts.drain(..) {
             early_hoisted_stmts.insert(key.clone(), stmt);
         }
-        for visitor in &code_gen.root_visitors {
-            root_visitors.push(visitor.create());
-        }
 
         for (path, visitor) in &code_gen.visitors {
             if path.is_empty() {
-                unreachable!("if the path is empty, the visitor should be a root visitor");
+                root_visitors.push(&**visitor);
             } else {
                 visitors.push((path, &**visitor));
             }
@@ -1193,7 +1190,7 @@ fn process_content_with_code_gens(
             );
         }
         for pass in root_visitors {
-            program.mutate(pass);
+            program.modify(pass);
         }
         program.visit_mut_with(
             &mut swc_core::ecma::transforms::base::hygiene::hygiene_with_config(

turbopack/crates/turbopack-ecmascript/src/references/esm/export.rs

@@ -678,7 +678,6 @@ impl EsmExports {
         };
 
         Ok(CodeGeneration::new(
-            vec![],
             vec![],
             [dynamic_stmt
                 .map(|stmt| CodeGenerationHoistedStmt::new("__turbopack_dynamic__".into(), stmt))]