chore: remove old treeshaking (#6549)

* chore: remove old treeshaking

* chore: remove builtin option

crates/node_binding/binding.d.ts

@@ -1134,7 +1134,6 @@ export interface RawOptions {
   node?: RawNodeOption
   profile: boolean
   bail: boolean
-  builtins: RawBuiltins
 }
 
 export interface RawOutputOptions {
@@ -1282,7 +1281,7 @@ export interface RawResolveTsconfigOptions {
 }
 
 export interface RawRspackFuture {
-  newTreeshaking: boolean
+
 }
 
 export interface RawRuleSetCondition {

crates/rspack_binding_options/src/options/mod.rs

@@ -1,7 +1,7 @@
 use napi_derive::napi;
 use rspack_core::{
   CacheOptions, CompilerOptions, Context, Experiments, IncrementalRebuild,
-  IncrementalRebuildMakeState, ModuleOptions, OutputOptions, Target, TreeShaking,
+  IncrementalRebuildMakeState, ModuleOptions, OutputOptions, Target,
 };
 
 mod raw_builtins;
@@ -58,7 +58,6 @@ pub struct RawOptions {
   pub node: Option<RawNodeOption>,
   pub profile: bool,
   pub bail: bool,
-  pub builtins: RawBuiltins,
 }
 
 impl TryFrom<RawOptions> for CompilerOptions {
@@ -90,11 +89,6 @@ impl TryFrom<RawOptions> for CompilerOptions {
     let snapshot = value.snapshot.into();
     let node = value.node.map(|n| n.into());
 
-    let mut builtins = value.builtins.apply()?;
-    if experiments.rspack_future.new_treeshaking {
-      builtins.tree_shaking = TreeShaking::False;
-    }
-
     Ok(CompilerOptions {
       context,
       mode,
@@ -112,7 +106,7 @@ impl TryFrom<RawOptions> for CompilerOptions {
       dev_server: Default::default(),
       profile: value.profile,
       bail: value.bail,
-      builtins,
+      builtins: Default::default(),
     })
   }
 }

crates/rspack_binding_options/src/options/raw_builtins/raw_to_be_deprecated.rs

@@ -148,7 +148,6 @@ impl RawBuiltins {
     Ok(Builtins {
       define: Default::default(),
       provide: Default::default(),
-      tree_shaking: self.tree_shaking.into(),
     })
   }
 }

crates/rspack_binding_options/src/options/raw_experiments.rs

@@ -1,11 +1,10 @@
 use napi_derive::napi;
 use rspack_core::RspackFuture;
 
+#[allow(clippy::empty_structs_with_brackets)]
 #[derive(Debug, Default)]
 #[napi(object)]
-pub struct RawRspackFuture {
-  pub new_treeshaking: bool,
-}
+pub struct RawRspackFuture {}
 
 #[derive(Debug, Default)]
 #[napi(object)]
@@ -15,9 +14,7 @@ pub struct RawExperiments {
 }
 
 impl From<RawRspackFuture> for RspackFuture {
-  fn from(value: RawRspackFuture) -> Self {
-    Self {
-      new_treeshaking: value.new_treeshaking,
-    }
+  fn from(_value: RawRspackFuture) -> Self {
+    Self {}
   }
 }

crates/rspack_core/src/build_chunk_graph/code_splitter.rs

@@ -1382,11 +1382,11 @@ Or do you want to use the entrypoints '{name}' and '{runtime}' independently on
       let modules = map
         .get_mut(&block_id)
         .expect("should have modules in block_modules_runtime_map");
-      let active_state = if self.compilation.options.is_new_tree_shaking() {
-        get_active_state_of_connections(&connections, runtime, &self.compilation.get_module_graph())
-      } else {
-        ConnectionState::Bool(true)
-      };
+      let active_state = get_active_state_of_connections(
+        &connections,
+        runtime,
+        &self.compilation.get_module_graph(),
+      );
       modules.push((module_identifier, active_state, connections));
     }
   }

crates/rspack_core/src/compiler/compilation.rs

@@ -10,7 +10,7 @@ use dashmap::{DashMap, DashSet};
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
 use rayon::prelude::*;
-use rspack_error::{error, Diagnostic, Result, Severity, TWithDiagnosticArray};
+use rspack_error::{error, Diagnostic, Result, Severity};
 use rspack_futures::FuturesResults;
 use rspack_hash::{RspackHash, RspackHashDigest};
 use rspack_hook::define_hook;
@@ -25,12 +25,13 @@ use super::{
   make::{make_module_graph, update_module_graph, MakeArtifact, MakeParam},
   module_executor::ModuleExecutor,
 };
+use crate::ExecuteModuleId;
 use crate::{
   build_chunk_graph::build_chunk_graph,
   cache::{use_code_splitting_cache, Cache, CodeSplittingCache},
   get_chunk_from_ukey, get_mut_chunk_from_ukey, is_source_equal, prepare_get_exports_type,
   to_identifier,
-  tree_shaking::{optimizer, visitor::SymbolRef, BailoutFlag, OptimizeDependencyResult},
+  tree_shaking::visitor::SymbolRef,
   BoxDependency, BoxModule, CacheCount, CacheOptions, Chunk, ChunkByUkey, ChunkContentHash,
   ChunkGraph, ChunkGroupByUkey, ChunkGroupUkey, ChunkKind, ChunkUkey, CodeGenerationResults,
   CompilationLogger, CompilationLogging, CompilerOptions, DependencyId, DependencyType, Entry,
@@ -39,7 +40,6 @@ use crate::{
   ResolverFactory, RuntimeGlobals, RuntimeModule, RuntimeSpec, SharedPluginDriver, SourceType,
   Stats,
 };
-use crate::{tree_shaking::visitor::OptimizeAnalyzeResult, ExecuteModuleId};
 
 pub type BuildDependency = (
   DependencyId,
@@ -159,8 +159,6 @@ pub struct Compilation {
   pub(crate) named_chunk_groups: HashMap<String, ChunkGroupUkey>,
   /// Collecting all used export symbol
   pub used_symbol_ref: HashSet<SymbolRef>,
-  /// Collecting all module that need to skip in tree-shaking ast modification phase
-  pub bailout_module_identifiers: IdentifierMap<BailoutFlag>,
 
   pub code_generation_results: CodeGenerationResults,
   pub code_generated_modules: IdentifierSet,
@@ -170,7 +168,6 @@ pub struct Compilation {
   // lazy compilation visit module
   pub lazy_visit_modules: std::collections::HashSet<String>,
   pub used_chunk_ids: HashSet<String>,
-  pub include_module_ids: IdentifierSet,
 
   pub file_dependencies: IndexSet<PathBuf, BuildHasherDefault<FxHasher>>,
   pub context_dependencies: IndexSet<PathBuf, BuildHasherDefault<FxHasher>>,
@@ -247,7 +244,6 @@ impl Compilation {
       named_chunks: Default::default(),
       named_chunk_groups: Default::default(),
       used_symbol_ref: HashSet::default(),
-      bailout_module_identifiers: IdentifierMap::default(),
 
       code_generation_results: Default::default(),
       code_generated_modules: Default::default(),
@@ -263,7 +259,6 @@ impl Compilation {
       build_dependencies: Default::default(),
       side_effects_free_modules: IdentifierSet::default(),
       module_item_map: IdentifierMap::default(),
-      include_module_ids: IdentifierSet::default(),
 
       import_var_map: DashMap::new(),
 
@@ -696,12 +691,10 @@ impl Compilation {
     )
     .await?;
 
-    if self.options.is_new_tree_shaking() {
-      let logger = self.get_logger("rspack.Compilation");
-      let start = logger.time("finish module");
-      self.finish(self.plugin_driver.clone()).await?;
-      logger.time_end(start);
-    }
+    let logger = self.get_logger("rspack.Compilation");
+    let start = logger.time("finish module");
+    self.finish(self.plugin_driver.clone()).await?;
+    logger.time_end(start);
 
     let module_graph = self.get_module_graph();
     Ok(f(module_identifiers
@@ -725,8 +718,7 @@ impl Compilation {
     ) -> Result<()> {
       // If the runtime optimization is not opt out, a module codegen should be executed for each runtime.
       // Else, share same codegen result for all runtimes.
-      let used_exports_optimization = compilation.options.is_new_tree_shaking()
-        && compilation.options.optimization.used_exports.is_true();
+      let used_exports_optimization = compilation.options.optimization.used_exports.is_true();
       let results = compilation.code_generation_modules(
         codegen_cache_counter,
         used_exports_optimization,
@@ -950,16 +942,6 @@ impl Compilation {
     Ok(())
   }
 
-  pub async fn optimize_dependency(
-    &mut self,
-  ) -> Result<TWithDiagnosticArray<OptimizeDependencyResult>> {
-    let logger = self.get_logger("rspack.Compilation");
-    let start = logger.time("optimize dependencies");
-    let result = optimizer::CodeSizeOptimizer::new(self).run().await;
-    logger.time_end(start);
-    result
-  }
-
   pub fn entry_modules(&self) -> IdentifierSet {
     self.make_artifact.entry_module_identifiers.clone()
   }
@@ -1633,15 +1615,6 @@ impl Compilation {
   pub fn has_module_import_export_change(&self) -> bool {
     self.make_artifact.has_module_graph_change
   }
-
-  // TODO remove it after remove old treeshaking
-  pub fn optimize_analyze_result_map(&self) -> &IdentifierMap<OptimizeAnalyzeResult> {
-    &self.make_artifact.optimize_analyze_result_map
-  }
-  // TODO remove it after remove old treeshaking
-  pub fn optimize_analyze_result_map_mut(&mut self) -> &mut IdentifierMap<OptimizeAnalyzeResult> {
-    &mut self.make_artifact.optimize_analyze_result_map
-  }
 }
 
 pub type CompilationAssets = HashMap<String, CompilationAsset>;

crates/rspack_core/src/compiler/make/mod.rs

@@ -4,16 +4,13 @@ pub mod repair;
 
 use std::path::PathBuf;
 
-use rayon::prelude::*;
 use rspack_error::{Diagnostic, Result};
-use rspack_identifier::{IdentifierMap, IdentifierSet};
+use rspack_identifier::IdentifierSet;
 use rustc_hash::FxHashSet as HashSet;
 
 use self::{cutout::Cutout, file_counter::FileCounter, repair::repair};
 use crate::{
-  tree_shaking::{visitor::OptimizeAnalyzeResult, BailoutFlag},
-  BuildDependency, Compilation, DependencyId, DependencyType, ModuleGraph, ModuleGraphPartial,
-  ModuleIdentifier,
+  BuildDependency, Compilation, DependencyId, ModuleGraph, ModuleGraphPartial, ModuleIdentifier,
 };
 
 #[derive(Debug, Default)]
@@ -27,7 +24,6 @@ pub struct MakeArtifact {
   pub module_graph_partial: ModuleGraphPartial,
   entry_dependencies: HashSet<DependencyId>,
   pub entry_module_identifiers: IdentifierSet,
-  pub optimize_analyze_result_map: IdentifierMap<OptimizeAnalyzeResult>,
   pub file_dependencies: FileCounter,
   pub context_dependencies: FileCounter,
   pub missing_dependencies: FileCounter,
@@ -124,11 +120,6 @@ pub fn make_module_graph(
 
   artifact = update_module_graph_with_artifact(compilation, artifact, params)?;
 
-  if compilation.options.builtins.tree_shaking.enable() {
-    let module_graph = artifact.get_module_graph();
-    compilation.bailout_module_identifiers = calc_bailout_module_identifiers(&module_graph);
-  }
-
   compilation.push_batch_diagnostic(std::mem::take(&mut artifact.diagnostics));
   Ok(artifact)
 }
@@ -142,11 +133,6 @@ pub async fn update_module_graph(
 
   artifact = update_module_graph_with_artifact(compilation, artifact, params)?;
 
-  if compilation.options.builtins.tree_shaking.enable() {
-    let module_graph = artifact.get_module_graph();
-    compilation.bailout_module_identifiers = calc_bailout_module_identifiers(&module_graph);
-  }
-
   compilation.push_batch_diagnostic(std::mem::take(&mut artifact.diagnostics));
   compilation.swap_make_artifact(&mut artifact);
   Ok(())
@@ -163,43 +149,3 @@ pub fn update_module_graph_with_artifact(
   cutout.fix_artifact(&mut artifact);
   Ok(artifact)
 }
-
-// TODO remove after remove old_treeshaking
-fn calc_bailout_module_identifiers(module_graph: &ModuleGraph) -> IdentifierMap<BailoutFlag> {
-  // Avoid to introduce too much overhead,
-  // until we find a better way to align with webpack hmr behavior
-
-  // add context module and context element module to bailout_module_identifiers
-  module_graph
-    .dependencies()
-    .values()
-    .par_bridge()
-    .filter_map(|dep| {
-      if dep.as_context_dependency().is_some()
-        && let Some(module) = module_graph.get_module_by_dependency_id(dep.id())
-      {
-        let mut values = vec![(module.identifier(), BailoutFlag::CONTEXT_MODULE)];
-        if let Some(dependencies) = module_graph.get_module_all_dependencies(&module.identifier()) {
-          for dependency in dependencies {
-            if let Some(dependency_module) =
-              module_graph.module_identifier_by_dependency_id(dependency)
-            {
-              values.push((*dependency_module, BailoutFlag::CONTEXT_MODULE));
-            }
-          }
-        }
-
-        Some(values)
-      } else if matches!(
-        dep.dependency_type(),
-        DependencyType::ContainerExposed | DependencyType::ProvideModuleForShared
-      ) && let Some(module) = module_graph.get_module_by_dependency_id(dep.id())
-      {
-        Some(vec![(module.identifier(), BailoutFlag::CONTAINER_EXPOSED)])
-      } else {
-        None
-      }
-    })
-    .flatten()
-    .collect()
-}

crates/rspack_core/src/compiler/make/repair/add.rs

@@ -27,7 +27,6 @@ impl Task<MakeTaskContext> for AddTask {
     }
 
     let module_identifier = self.module.identifier();
-    let is_new_treeshaking = context.compiler_options.is_new_tree_shaking();
     let module_graph =
       &mut MakeTaskContext::get_module_graph_mut(&mut context.module_graph_partial);
 
@@ -43,7 +42,6 @@ impl Task<MakeTaskContext> for AddTask {
         self.original_module_identifier,
         self.dependencies,
         *issuer,
-        is_new_treeshaking,
       )?;
 
       // reused module
@@ -59,7 +57,6 @@ impl Task<MakeTaskContext> for AddTask {
         self.original_module_identifier,
         self.dependencies,
         module_identifier,
-        is_new_treeshaking,
       )?;
 
       // reused module
@@ -73,7 +70,6 @@ impl Task<MakeTaskContext> for AddTask {
       self.original_module_identifier,
       self.dependencies,
       module_identifier,
-      is_new_treeshaking,
     )?;
 
     if self.is_entry {
@@ -102,16 +98,9 @@ fn set_resolved_module(
   original_module_identifier: Option<ModuleIdentifier>,
   dependencies: Vec<DependencyId>,
   module_identifier: ModuleIdentifier,
-  // TODO: removed when new treeshaking is stable
-  is_new_treeshaking: bool,
 ) -> Result<()> {
   for dependency in dependencies {
-    module_graph.set_resolved_module(
-      original_module_identifier,
-      dependency,
-      module_identifier,
-      is_new_treeshaking,
-    )?;
+    module_graph.set_resolved_module(original_module_identifier, dependency, module_identifier)?;
   }
   Ok(())
 }

crates/rspack_core/src/compiler/make/repair/build.rs

@@ -116,11 +116,6 @@ impl Task<MakeTaskContext> for BuildResultTask {
 
     let module_graph =
       &mut MakeTaskContext::get_module_graph_mut(&mut context.module_graph_partial);
-    if context.compiler_options.builtins.tree_shaking.enable() {
-      context
-        .optimize_analyze_result_map
-        .insert(module.identifier(), build_result.analyze_result);
-    }
 
     if !diagnostics.is_empty() {
       context.make_failed_module.insert(module.identifier());