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

feat(turbopack): Add simple tree shaker (#78286)

### What?

Implement a simple tree-shaking. Simple tree shaking is a tree-shaking implementation that only has two options for each export: used/unused. This information is shared among the whole application, so there's no fine-grained control for each export. 

### Why?

Because advanced tree shaking requires some more time to implement.
parent 2251d0f7
...@@ -9619,6 +9619,7 @@ version = "0.1.0" ...@@ -9619,6 +9619,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"auto-hash-map",
"bitvec", "bitvec",
"bytes-str", "bytes-str",
"codspeed-criterion-compat", "codspeed-criterion-compat",
......
...@@ -348,6 +348,9 @@ pub async fn get_client_module_options_context( ...@@ -348,6 +348,9 @@ pub async fn get_client_module_options_context(
enable_postcss_transform, enable_postcss_transform,
side_effect_free_packages: next_config.optimize_package_imports().owned().await?, side_effect_free_packages: next_config.optimize_package_imports().owned().await?,
keep_last_successful_parse: next_mode.is_development(), keep_last_successful_parse: next_mode.is_development(),
remove_unused_exports: *next_config
.turbopack_remove_unused_exports(next_mode.is_development())
.await?,
..Default::default() ..Default::default()
}; };
......
...@@ -76,7 +76,7 @@ impl EcmascriptClientReferenceModule { ...@@ -76,7 +76,7 @@ impl EcmascriptClientReferenceModule {
// Adapted from https://github.com/facebook/react/blob/c5b9375767e2c4102d7e5559d383523736f1c902/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js#L323-L354 // Adapted from https://github.com/facebook/react/blob/c5b9375767e2c4102d7e5559d383523736f1c902/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js#L323-L354
if let EcmascriptExports::EsmExports(exports) = &*self.client_module.get_exports().await? { if let EcmascriptExports::EsmExports(exports) = &*self.client_module.get_exports().await? {
is_esm = true; is_esm = true;
let exports = exports.expand_exports().await?; let exports = exports.expand_exports(None).await?;
if !exports.dynamic_exports.is_empty() { if !exports.dynamic_exports.is_empty() {
// TODO: throw? warn? // TODO: throw? warn?
......
...@@ -326,7 +326,7 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference { ...@@ -326,7 +326,7 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
let referenced_modules = referenced_modules let referenced_modules = referenced_modules
.iter() .iter()
.flat_map(|(chunking_type, modules)| match chunking_type { .flat_map(|(chunking_type, _, modules)| match chunking_type {
ChunkingType::Traced => None, ChunkingType::Traced => None,
_ => Some(modules.iter()), _ => Some(modules.iter()),
}) })
......
...@@ -797,6 +797,8 @@ pub struct ExperimentalConfig { ...@@ -797,6 +797,8 @@ pub struct ExperimentalConfig {
turbopack_tree_shaking: Option<bool>, turbopack_tree_shaking: Option<bool>,
// Whether to enable the global-not-found convention // Whether to enable the global-not-found convention
global_not_found: Option<bool>, global_not_found: Option<bool>,
/// Defaults to false in development mode, true in production mode.
turbopack_remove_unused_exports: Option<bool>,
} }
#[derive( #[derive(
...@@ -1558,6 +1560,15 @@ impl NextConfig { ...@@ -1558,6 +1560,15 @@ impl NextConfig {
.cell() .cell()
} }
#[turbo_tasks::function]
pub fn turbopack_remove_unused_exports(&self, is_development: bool) -> Vc<bool> {
Vc::cell(
self.experimental
.turbopack_remove_unused_exports
.unwrap_or(!is_development),
)
}
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn module_ids(&self, mode: Vc<NextMode>) -> Result<Vc<ModuleIds>> { pub async fn module_ids(&self, mode: Vc<NextMode>) -> Result<Vc<ModuleIds>> {
Ok(match *mode.await? { Ok(match *mode.await? {
......
...@@ -11,6 +11,7 @@ use turbopack_core::{ ...@@ -11,6 +11,7 @@ use turbopack_core::{
module::Module, module::Module,
module_graph::ModuleGraph, module_graph::ModuleGraph,
reference::{ModuleReferences, SingleChunkableModuleReference}, reference::{ModuleReferences, SingleChunkableModuleReference},
resolve::ExportUsage,
}; };
use turbopack_ecmascript::{ use turbopack_ecmascript::{
chunk::{ chunk::{
...@@ -56,6 +57,7 @@ impl Module for NextDynamicEntryModule { ...@@ -56,6 +57,7 @@ impl Module for NextDynamicEntryModule {
SingleChunkableModuleReference::new( SingleChunkableModuleReference::new(
Vc::upcast(*self.module), Vc::upcast(*self.module),
dynamic_ref_description(), dynamic_ref_description(),
ExportUsage::all(),
) )
.to_resolved() .to_resolved()
.await?, .await?,
...@@ -98,6 +100,7 @@ impl EcmascriptChunkPlaceable for NextDynamicEntryModule { ...@@ -98,6 +100,7 @@ impl EcmascriptChunkPlaceable for NextDynamicEntryModule {
SingleChunkableModuleReference::new( SingleChunkableModuleReference::new(
Vc::upcast(*self.module), Vc::upcast(*self.module),
dynamic_ref_description(), dynamic_ref_description(),
ExportUsage::all(),
) )
.to_resolved() .to_resolved()
.await?, .await?,
......
...@@ -565,6 +565,9 @@ pub async fn get_server_module_options_context( ...@@ -565,6 +565,9 @@ pub async fn get_server_module_options_context(
None None
}, },
keep_last_successful_parse: next_mode.is_development(), keep_last_successful_parse: next_mode.is_development(),
remove_unused_exports: *next_config
.turbopack_remove_unused_exports(next_mode.is_development())
.await?,
..Default::default() ..Default::default()
}; };
......
...@@ -461,6 +461,7 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() => ...@@ -461,6 +461,7 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
turbopackPersistentCaching: z.boolean().optional(), turbopackPersistentCaching: z.boolean().optional(),
turbopackSourceMaps: z.boolean().optional(), turbopackSourceMaps: z.boolean().optional(),
turbopackTreeShaking: z.boolean().optional(), turbopackTreeShaking: z.boolean().optional(),
turbopackRemoveUnusedExports: z.boolean().optional(),
optimizePackageImports: z.array(z.string()).optional(), optimizePackageImports: z.array(z.string()).optional(),
optimizeServerReact: z.boolean().optional(), optimizeServerReact: z.boolean().optional(),
clientTraceMetadata: z.array(z.string()).optional(), clientTraceMetadata: z.array(z.string()).optional(),
......
...@@ -432,6 +432,11 @@ export interface ExperimentalConfig { ...@@ -432,6 +432,11 @@ export interface ExperimentalConfig {
*/ */
turbopackTreeShaking?: boolean turbopackTreeShaking?: boolean
/**
* Enable removing unused exports for turbopack dev server and build.
*/
turbopackRemoveUnusedExports?: boolean
/** /**
* For use with `@next/mdx`. Compile MDX files using the new Rust compiler. * For use with `@next/mdx`. Compile MDX files using the new Rust compiler.
* @see https://nextjs.org/docs/app/api-reference/next-config-js/mdxRs * @see https://nextjs.org/docs/app/api-reference/next-config-js/mdxRs
......
...@@ -44,6 +44,7 @@ use crate::{ ...@@ -44,6 +44,7 @@ use crate::{
}, },
output::OutputAssets, output::OutputAssets,
reference::ModuleReference, reference::ModuleReference,
resolve::ExportUsage,
}; };
/// A module id, which can be a number or string /// A module id, which can be a number or string
...@@ -281,6 +282,11 @@ pub trait ChunkableModuleReference: ModuleReference + ValueToString { ...@@ -281,6 +282,11 @@ pub trait ChunkableModuleReference: ModuleReference + ValueToString {
hoisted: false, hoisted: false,
})) }))
} }
#[turbo_tasks::function]
fn export_usage(self: Vc<Self>) -> Vc<ExportUsage> {
ExportUsage::all()
}
} }
#[derive(Default)] #[derive(Default)]
......
...@@ -78,21 +78,21 @@ async fn compute_async_module_info_single( ...@@ -78,21 +78,21 @@ async fn compute_async_module_info_single(
&mut (), &mut (),
|_, _, _| Ok(GraphTraversalAction::Continue), |_, _, _| Ok(GraphTraversalAction::Continue),
|parent_info, module, _| { |parent_info, module, _| {
let Some((parent_module, chunking_type)) = parent_info else { let Some((parent_module, ref_data)) = parent_info else {
// An entry module // An entry module
return; return;
}; };
let module = module.module(); let module = module.module();
let parent_module = parent_module.module; let parent_module = parent_module.module;
if chunking_type.is_inherit_async() && async_modules.contains(&module) { if ref_data.chunking_type.is_inherit_async() && async_modules.contains(&module) {
async_modules.insert(parent_module); async_modules.insert(parent_module);
} }
}, },
)?; )?;
graph.traverse_cycles( graph.traverse_cycles(
|ty| ty.is_inherit_async(), |ref_data| ref_data.chunking_type.is_inherit_async(),
|cycle| { |cycle| {
if cycle if cycle
.iter() .iter()
......
...@@ -19,7 +19,7 @@ use turbo_tasks::{ ...@@ -19,7 +19,7 @@ use turbo_tasks::{
use crate::{ use crate::{
chunk::ChunkingType, chunk::ChunkingType,
module::Module, module::Module,
module_graph::{GraphTraversalAction, ModuleGraph, SingleModuleGraphModuleNode}, module_graph::{GraphTraversalAction, ModuleGraph, RefData, SingleModuleGraphModuleNode},
}; };
#[derive( #[derive(
...@@ -462,7 +462,7 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro ...@@ -462,7 +462,7 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro
}) })
.collect::<Result<Vec<_>>>()?, .collect::<Result<Vec<_>>>()?,
&mut module_chunk_groups, &mut module_chunk_groups,
|parent_info: Option<(&'_ SingleModuleGraphModuleNode, &'_ ChunkingType)>, |parent_info: Option<(&'_ SingleModuleGraphModuleNode, &'_ RefData)>,
node: &'_ SingleModuleGraphModuleNode, node: &'_ SingleModuleGraphModuleNode,
module_chunk_groups: &mut FxHashMap< module_chunk_groups: &mut FxHashMap<
ResolvedVc<Box<dyn Module>>, ResolvedVc<Box<dyn Module>>,
...@@ -473,8 +473,8 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro ...@@ -473,8 +473,8 @@ pub async fn compute_chunk_group_info(graph: &ModuleGraph) -> Result<Vc<ChunkGro
Inherit(ResolvedVc<Box<dyn Module>>), Inherit(ResolvedVc<Box<dyn Module>>),
ChunkGroup(It), ChunkGroup(It),
} }
let chunk_groups = if let Some((parent, chunking_type)) = parent_info { let chunk_groups = if let Some((parent, ref_data)) = parent_info {
match chunking_type { match &ref_data.chunking_type {
ChunkingType::Parallel { .. } => { ChunkingType::Parallel { .. } => {
ChunkGroupInheritance::Inherit(parent.module) ChunkGroupInheritance::Inherit(parent.module)
} }
......
...@@ -302,7 +302,7 @@ impl PreBatches { ...@@ -302,7 +302,7 @@ impl PreBatches {
inherit_async: false, inherit_async: false,
hoisted: false, hoisted: false,
}, },
|(_, ty)| ty, |(_, ty)| &ty.chunking_type,
); );
let module = node.module; let module = node.module;
if !ty.is_parallel() { if !ty.is_parallel() {
...@@ -367,7 +367,7 @@ pub async fn compute_module_batches( ...@@ -367,7 +367,7 @@ pub async fn compute_module_batches(
// Already a boundary module, can skip check // Already a boundary module, can skip check
return Ok(()); return Ok(());
}; };
if ty.is_parallel() { if ty.chunking_type.is_parallel() {
let parent_chunk_groups = chunk_group_info let parent_chunk_groups = chunk_group_info
.module_chunk_groups .module_chunk_groups
.get(&parent.module) .get(&parent.module)
...@@ -398,7 +398,7 @@ pub async fn compute_module_batches( ...@@ -398,7 +398,7 @@ pub async fn compute_module_batches(
// cycles that include boundary modules // cycles that include boundary modules
module_graph module_graph
.traverse_cycles( .traverse_cycles(
|ty| ty.is_parallel(), |ref_data| ref_data.chunking_type.is_parallel(),
|cycle| { |cycle| {
if cycle if cycle
.iter() .iter()
......
...@@ -12,7 +12,7 @@ use crate::{ ...@@ -12,7 +12,7 @@ use crate::{
module::{Module, Modules}, module::{Module, Modules},
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
raw_module::RawModule, raw_module::RawModule,
resolve::{ModuleResolveResult, RequestKey}, resolve::{ExportUsage, ModuleResolveResult, RequestKey},
}; };
pub mod source_map; pub mod source_map;
...@@ -89,13 +89,22 @@ impl SingleModuleReference { ...@@ -89,13 +89,22 @@ impl SingleModuleReference {
pub struct SingleChunkableModuleReference { pub struct SingleChunkableModuleReference {
asset: ResolvedVc<Box<dyn Module>>, asset: ResolvedVc<Box<dyn Module>>,
description: RcStr, description: RcStr,
export: ResolvedVc<ExportUsage>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl SingleChunkableModuleReference { impl SingleChunkableModuleReference {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new(asset: ResolvedVc<Box<dyn Module>>, description: RcStr) -> Vc<Self> { pub fn new(
Self::cell(SingleChunkableModuleReference { asset, description }) asset: ResolvedVc<Box<dyn Module>>,
description: RcStr,
export: ResolvedVc<ExportUsage>,
) -> Vc<Self> {
Self::cell(SingleChunkableModuleReference {
asset,
description,
export,
})
} }
} }
...@@ -108,6 +117,11 @@ impl ChunkableModuleReference for SingleChunkableModuleReference { ...@@ -108,6 +117,11 @@ impl ChunkableModuleReference for SingleChunkableModuleReference {
hoisted: false, hoisted: false,
})) }))
} }
#[turbo_tasks::function]
fn export_usage(&self) -> Vc<ExportUsage> {
*self.export
}
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -273,7 +287,7 @@ pub async fn primary_referenced_modules(module: Vc<Box<dyn Module>>) -> Result<V ...@@ -273,7 +287,7 @@ pub async fn primary_referenced_modules(module: Vc<Box<dyn Module>>) -> Result<V
type ModulesVec = Vec<ResolvedVc<Box<dyn Module>>>; type ModulesVec = Vec<ResolvedVc<Box<dyn Module>>>;
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct ModulesWithChunkingType(Vec<(ChunkingType, ModulesVec)>); pub struct ModulesWithRefData(Vec<(ChunkingType, ExportUsage, ModulesVec)>);
/// Aggregates all primary [Module]s referenced by an [Module] via [ChunkableModuleReference]s. /// Aggregates all primary [Module]s referenced by an [Module] via [ChunkableModuleReference]s.
/// This does not include transitively references [Module]s, only includes /// This does not include transitively references [Module]s, only includes
...@@ -284,7 +298,7 @@ pub struct ModulesWithChunkingType(Vec<(ChunkingType, ModulesVec)>); ...@@ -284,7 +298,7 @@ pub struct ModulesWithChunkingType(Vec<(ChunkingType, ModulesVec)>);
pub async fn primary_chunkable_referenced_modules( pub async fn primary_chunkable_referenced_modules(
module: Vc<Box<dyn Module>>, module: Vc<Box<dyn Module>>,
include_traced: bool, include_traced: bool,
) -> Result<Vc<ModulesWithChunkingType>> { ) -> Result<Vc<ModulesWithRefData>> {
let modules = module let modules = module
.references() .references()
.await? .await?
...@@ -305,7 +319,9 @@ pub async fn primary_chunkable_referenced_modules( ...@@ -305,7 +319,9 @@ pub async fn primary_chunkable_referenced_modules(
.primary_modules() .primary_modules()
.owned() .owned()
.await?; .await?;
return Ok(Some((chunking_type.clone(), resolved))); let export = (*reference.export_usage().await?).clone();
return Ok(Some((chunking_type.clone(), export, resolved)));
} }
Ok(None) Ok(None)
}) })
......
...@@ -103,6 +103,35 @@ impl ModuleResolveResultItem { ...@@ -103,6 +103,35 @@ impl ModuleResolveResultItem {
} }
} }
#[turbo_tasks::value]
#[derive(Debug, Clone, Default, Hash)]
pub enum ExportUsage {
Named(RcStr),
/// This means the whole content of the module is used.
#[default]
All,
/// Only side effects are used.
Evaluation,
}
#[turbo_tasks::value_impl]
impl ExportUsage {
#[turbo_tasks::function]
pub fn all() -> Vc<Self> {
Self::All.cell()
}
#[turbo_tasks::function]
pub fn evaluation() -> Vc<Self> {
Self::Evaluation.cell()
}
#[turbo_tasks::function]
pub fn named(name: RcStr) -> Vc<Self> {
Self::Named(name).cell()
}
}
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
#[derive(Clone)] #[derive(Clone)]
pub struct ModuleResolveResult { pub struct ModuleResolveResult {
...@@ -1773,6 +1802,7 @@ async fn resolve_internal_inline( ...@@ -1773,6 +1802,7 @@ async fn resolve_internal_inline(
}; };
async move { async move {
let options_value: &ResolveOptions = &*options.await?; let options_value: &ResolveOptions = &*options.await?;
let request_value = request.await?; let request_value = request.await?;
// Apply import mappings if provided // Apply import mappings if provided
......
...@@ -15,6 +15,7 @@ workspace = true ...@@ -15,6 +15,7 @@ workspace = true
[dependencies] [dependencies]
anyhow = { workspace = true } anyhow = { workspace = true }
async-trait = { workspace = true } async-trait = { workspace = true }
auto-hash-map = { workspace = true }
bytes-str = { workspace = true } bytes-str = { workspace = true }
data-encoding = { workspace = true } data-encoding = { workspace = true }
either = { workspace = true } either = { workspace = true }
......
...@@ -22,6 +22,7 @@ mod path_visitor; ...@@ -22,6 +22,7 @@ mod path_visitor;
pub mod references; pub mod references;
pub mod runtime_functions; pub mod runtime_functions;
pub mod side_effect_optimization; pub mod side_effect_optimization;
pub mod simple_tree_shake;
pub(crate) mod special_cases; pub(crate) mod special_cases;
pub(crate) mod static_code; pub(crate) mod static_code;
mod swc_comments; mod swc_comments;
...@@ -106,6 +107,7 @@ use crate::{ ...@@ -106,6 +107,7 @@ use crate::{
analyse_ecmascript_module, async_module::OptionAsyncModule, esm::base::EsmAssetReferences, analyse_ecmascript_module, async_module::OptionAsyncModule, esm::base::EsmAssetReferences,
}, },
side_effect_optimization::reference::EcmascriptModulePartReference, side_effect_optimization::reference::EcmascriptModulePartReference,
simple_tree_shake::{ModuleExportUsageInfo, get_module_export_usages},
swc_comments::ImmutableComments, swc_comments::ImmutableComments,
transform::remove_shebang, transform::remove_shebang,
}; };
...@@ -143,9 +145,9 @@ pub enum SpecifiedModuleType { ...@@ -143,9 +145,9 @@ pub enum SpecifiedModuleType {
Default, Default,
Serialize, Serialize,
Deserialize, Deserialize,
TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
TaskInput,
)] )]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum TreeShakingMode { pub enum TreeShakingMode {
...@@ -183,6 +185,8 @@ pub struct EcmascriptOptions { ...@@ -183,6 +185,8 @@ pub struct EcmascriptOptions {
/// parsing fails. This is useful to keep the module graph structure intact when syntax errors /// parsing fails. This is useful to keep the module graph structure intact when syntax errors
/// are temporarily introduced. /// are temporarily introduced.
pub keep_last_successful_parse: bool, pub keep_last_successful_parse: bool,
pub remove_unused_exports: bool,
} }
#[turbo_tasks::value] #[turbo_tasks::value]
...@@ -449,7 +453,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset { ...@@ -449,7 +453,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn module_content_options( async fn module_content_options(
self: Vc<Self>, self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>, module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>, chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
async_module_info: Option<ResolvedVc<AsyncModuleInfo>>, async_module_info: Option<ResolvedVc<AsyncModuleInfo>>,
...@@ -461,9 +465,19 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset { ...@@ -461,9 +465,19 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset {
let module_type_result = *self.determine_module_type().await?; let module_type_result = *self.determine_module_type().await?;
let generate_source_map = *chunking_context let generate_source_map = *chunking_context
.reference_module_source_maps(Vc::upcast(self)) .reference_module_source_maps(Vc::upcast(*self))
.await?; .await?;
let export_usage_info = if self.options().await?.remove_unused_exports {
Some(
get_module_export_usages(*module_graph, Vc::upcast(*self))
.to_resolved()
.await?,
)
} else {
None
};
Ok(EcmascriptModuleContentOptions { Ok(EcmascriptModuleContentOptions {
parsed, parsed,
ident: self.ident().to_resolved().await?, ident: self.ident().to_resolved().await?,
...@@ -479,6 +493,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset { ...@@ -479,6 +493,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleAsset {
original_source_map: analyze_ref.source_map, original_source_map: analyze_ref.source_map,
exports: analyze_ref.exports, exports: analyze_ref.exports,
async_module_info, async_module_info,
export_usage_info,
} }
.cell()) .cell())
} }
...@@ -832,6 +847,7 @@ pub struct EcmascriptModuleContentOptions { ...@@ -832,6 +847,7 @@ pub struct EcmascriptModuleContentOptions {
original_source_map: Option<ResolvedVc<Box<dyn GenerateSourceMap>>>, original_source_map: Option<ResolvedVc<Box<dyn GenerateSourceMap>>>,
exports: ResolvedVc<EcmascriptExports>, exports: ResolvedVc<EcmascriptExports>,
async_module_info: Option<ResolvedVc<AsyncModuleInfo>>, async_module_info: Option<ResolvedVc<AsyncModuleInfo>>,
export_usage_info: Option<ResolvedVc<ModuleExportUsageInfo>>,
} }
impl EcmascriptModuleContentOptions { impl EcmascriptModuleContentOptions {
...@@ -847,6 +863,7 @@ impl EcmascriptModuleContentOptions { ...@@ -847,6 +863,7 @@ impl EcmascriptModuleContentOptions {
async_module, async_module,
exports, exports,
async_module_info, async_module_info,
export_usage_info,
.. ..
} = self; } = self;
...@@ -868,7 +885,7 @@ impl EcmascriptModuleContentOptions { ...@@ -868,7 +885,7 @@ impl EcmascriptModuleContentOptions {
if let EcmascriptExports::EsmExports(exports) = *exports.await? { if let EcmascriptExports::EsmExports(exports) = *exports.await? {
Some( Some(
exports exports
.code_generation(**module_graph, **chunking_context, Some(**parsed)) .code_generation(**chunking_context, Some(**parsed), *export_usage_info)
.await?, .await?,
) )
} else { } else {
......
...@@ -22,7 +22,8 @@ use turbopack_core::{ ...@@ -22,7 +22,8 @@ use turbopack_core::{
reference::ModuleReference, reference::ModuleReference,
reference_type::{EcmaScriptModulesReferenceSubType, ImportWithType}, reference_type::{EcmaScriptModulesReferenceSubType, ImportWithType},
resolve::{ resolve::{
ExternalType, ModulePart, ModuleResolveResult, ModuleResolveResultItem, RequestKey, ExportUsage, ExternalType, ModulePart, ModuleResolveResult, ModuleResolveResultItem,
RequestKey,
origin::{ResolveOrigin, ResolveOriginExt}, origin::{ResolveOrigin, ResolveOriginExt},
parse::Request, parse::Request,
}, },
...@@ -288,6 +289,15 @@ impl ChunkableModuleReference for EsmAssetReference { ...@@ -288,6 +289,15 @@ impl ChunkableModuleReference for EsmAssetReference {
}, },
)) ))
} }
#[turbo_tasks::function]
fn export_usage(&self) -> Vc<ExportUsage> {
match &self.export_name {
Some(ModulePart::Export(export_name)) => ExportUsage::named(export_name.clone()),
Some(ModulePart::Evaluation) => ExportUsage::evaluation(),
_ => ExportUsage::all(),
}
}
} }
impl EsmAssetReference { impl EsmAssetReference {
......
...@@ -22,7 +22,6 @@ use turbopack_core::{ ...@@ -22,7 +22,6 @@ use turbopack_core::{
ident::AssetIdent, ident::AssetIdent,
issue::{IssueExt, IssueSeverity, StyledString, analyze::AnalyzeIssue}, issue::{IssueExt, IssueSeverity, StyledString, analyze::AnalyzeIssue},
module::Module, module::Module,
module_graph::ModuleGraph,
reference::ModuleReference, reference::ModuleReference,
resolve::ModulePart, resolve::ModulePart,
}; };
...@@ -35,6 +34,7 @@ use crate::{ ...@@ -35,6 +34,7 @@ use crate::{
magic_identifier, magic_identifier,
parse::ParseResult, parse::ParseResult,
runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM}, runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM},
simple_tree_shake::ModuleExportUsageInfo,
tree_shake::asset::EcmascriptModulePartAsset, tree_shake::asset::EcmascriptModulePartAsset,
}; };
...@@ -490,9 +490,20 @@ pub struct ExpandedExports { ...@@ -490,9 +490,20 @@ pub struct ExpandedExports {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl EsmExports { impl EsmExports {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn expand_exports(&self) -> Result<Vc<ExpandedExports>> { pub async fn expand_exports(
&self,
export_usage_info: Option<ResolvedVc<ModuleExportUsageInfo>>,
) -> Result<Vc<ExpandedExports>> {
let mut exports: BTreeMap<RcStr, EsmExport> = self.exports.clone(); let mut exports: BTreeMap<RcStr, EsmExport> = self.exports.clone();
let mut dynamic_exports = vec![]; let mut dynamic_exports = vec![];
let usage_info = match export_usage_info {
Some(usage_info) => Some(usage_info.await?),
None => None,
};
if let Some(usage_info) = &usage_info {
exports.retain(|export, _| usage_info.is_export_used(export));
}
for &esm_ref in self.star_exports.iter() { for &esm_ref in self.star_exports.iter() {
// TODO(PACK-2176): we probably need to handle re-exporting from external // TODO(PACK-2176): we probably need to handle re-exporting from external
...@@ -506,6 +517,12 @@ impl EsmExports { ...@@ -506,6 +517,12 @@ impl EsmExports {
let export_info = expand_star_exports(**asset).await?; let export_info = expand_star_exports(**asset).await?;
for export in &export_info.star_exports { for export in &export_info.star_exports {
if let Some(usage_info) = &usage_info
&& !usage_info.is_export_used(export)
{
continue;
}
if !exports.contains_key(export) { if !exports.contains_key(export) {
exports.insert( exports.insert(
export.clone(), export.clone(),
...@@ -534,11 +551,11 @@ impl EsmExports { ...@@ -534,11 +551,11 @@ impl EsmExports {
impl EsmExports { impl EsmExports {
pub async fn code_generation( pub async fn code_generation(
self: Vc<Self>, self: Vc<Self>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>, chunking_context: Vc<Box<dyn ChunkingContext>>,
parsed: Option<Vc<ParseResult>>, parsed: Option<Vc<ParseResult>>,
export_usage_info: Option<ResolvedVc<ModuleExportUsageInfo>>,
) -> Result<CodeGeneration> { ) -> Result<CodeGeneration> {
let expanded = self.expand_exports().await?; let expanded = self.expand_exports(export_usage_info.map(|v| *v)).await?;
let parsed = if let Some(parsed) = parsed { let parsed = if let Some(parsed) = parsed {
Some(parsed.await?) Some(parsed.await?)
} else { } else {
......
...@@ -2585,10 +2585,9 @@ async fn handle_free_var_reference( ...@@ -2585,10 +2585,9 @@ async fn handle_free_var_reference(
), ),
Default::default(), Default::default(),
match state.tree_shaking_mode { match state.tree_shaking_mode {
Some(TreeShakingMode::ModuleFragments) Some(
| Some(TreeShakingMode::ReexportsOnly) => { TreeShakingMode::ModuleFragments | TreeShakingMode::ReexportsOnly,
export.clone().map(ModulePart::export) ) => export.clone().map(ModulePart::export),
}
None => None, None => None,
}, },
state.import_externals, state.import_externals,
......
...@@ -26,6 +26,7 @@ use crate::{ ...@@ -26,6 +26,7 @@ use crate::{
esm::{EsmExport, EsmExports, base::EsmAssetReferences}, esm::{EsmExport, EsmExports, base::EsmAssetReferences},
}, },
side_effect_optimization::reference::EcmascriptModulePartReference, side_effect_optimization::reference::EcmascriptModulePartReference,
simple_tree_shake::get_module_export_usages,
}; };
/// A module derived from an original ecmascript module that only contains all /// A module derived from an original ecmascript module that only contains all
...@@ -35,13 +36,23 @@ use crate::{ ...@@ -35,13 +36,23 @@ use crate::{
pub struct EcmascriptModuleFacadeModule { pub struct EcmascriptModuleFacadeModule {
pub module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, pub module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
pub ty: ModulePart, pub ty: ModulePart,
pub remove_unused_exports: bool,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl EcmascriptModuleFacadeModule { impl EcmascriptModuleFacadeModule {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new(module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, ty: ModulePart) -> Vc<Self> { pub fn new(
EcmascriptModuleFacadeModule { module, ty }.cell() module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
ty: ModulePart,
remove_unused_exports: bool,
) -> Vc<Self> {
EcmascriptModuleFacadeModule {
module,
ty,
remove_unused_exports,
}
.cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -84,7 +95,11 @@ impl EcmascriptModuleFacadeModule { ...@@ -84,7 +95,11 @@ impl EcmascriptModuleFacadeModule {
( (
result.esm_evaluation_references, result.esm_evaluation_references,
vec![ vec![
EcmascriptModulePartReference::new_part(*self.module, ModulePart::locals()) EcmascriptModulePartReference::new_part(
*self.module,
ModulePart::locals(),
self.remove_unused_exports,
)
.to_resolved() .to_resolved()
.await?, .await?,
], ],
...@@ -103,7 +118,11 @@ impl EcmascriptModuleFacadeModule { ...@@ -103,7 +118,11 @@ impl EcmascriptModuleFacadeModule {
( (
result.esm_reexport_references, result.esm_reexport_references,
vec![ vec![
EcmascriptModulePartReference::new_part(*self.module, ModulePart::locals()) EcmascriptModulePartReference::new_part(
*self.module,
ModulePart::locals(),
self.remove_unused_exports,
)
.to_resolved() .to_resolved()
.await?, .await?,
], ],
...@@ -112,10 +131,18 @@ impl EcmascriptModuleFacadeModule { ...@@ -112,10 +131,18 @@ impl EcmascriptModuleFacadeModule {
ModulePart::Facade => ( ModulePart::Facade => (
EsmAssetReferences::empty().to_resolved().await?, EsmAssetReferences::empty().to_resolved().await?,
vec![ vec![
EcmascriptModulePartReference::new_part(*self.module, ModulePart::evaluation()) EcmascriptModulePartReference::new_part(
*self.module,
ModulePart::evaluation(),
self.remove_unused_exports,
)
.to_resolved() .to_resolved()
.await?, .await?,
EcmascriptModulePartReference::new_part(*self.module, ModulePart::exports()) EcmascriptModulePartReference::new_part(
*self.module,
ModulePart::exports(),
self.remove_unused_exports,
)
.to_resolved() .to_resolved()
.await?, .await?,
], ],
...@@ -123,7 +150,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -123,7 +150,7 @@ impl EcmascriptModuleFacadeModule {
ModulePart::RenamedNamespace { .. } => ( ModulePart::RenamedNamespace { .. } => (
EsmAssetReferences::empty().to_resolved().await?, EsmAssetReferences::empty().to_resolved().await?,
vec![ vec![
EcmascriptModulePartReference::new(*self.module) EcmascriptModulePartReference::new(*self.module, self.remove_unused_exports)
.to_resolved() .to_resolved()
.await?, .await?,
], ],
...@@ -131,7 +158,7 @@ impl EcmascriptModuleFacadeModule { ...@@ -131,7 +158,7 @@ impl EcmascriptModuleFacadeModule {
ModulePart::RenamedExport { .. } => ( ModulePart::RenamedExport { .. } => (
EsmAssetReferences::empty().to_resolved().await?, EsmAssetReferences::empty().to_resolved().await?,
vec![ vec![
EcmascriptModulePartReference::new(*self.module) EcmascriptModulePartReference::new(*self.module, self.remove_unused_exports)
.to_resolved() .to_resolved()
.await?, .await?,
], ],
...@@ -203,13 +230,23 @@ impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule { ...@@ -203,13 +230,23 @@ impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn module_content_options( async fn module_content_options(
self: Vc<Self>, self: ResolvedVc<Self>,
module_graph: ResolvedVc<ModuleGraph>, module_graph: ResolvedVc<ModuleGraph>,
chunking_context: ResolvedVc<Box<dyn ChunkingContext>>, chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
async_module_info: Option<ResolvedVc<AsyncModuleInfo>>, async_module_info: Option<ResolvedVc<AsyncModuleInfo>>,
) -> Result<Vc<EcmascriptModuleContentOptions>> { ) -> Result<Vc<EcmascriptModuleContentOptions>> {
let (esm_references, part_references) = self.await?.specific_references().await?; let (esm_references, part_references) = self.await?.specific_references().await?;
let export_usage_info = if self.await?.remove_unused_exports {
Some(
get_module_export_usages(*module_graph, Vc::upcast(*self))
.to_resolved()
.await?,
)
} else {
None
};
Ok(EcmascriptModuleContentOptions { Ok(EcmascriptModuleContentOptions {
parsed: ParseResult::empty().to_resolved().await?, parsed: ParseResult::empty().to_resolved().await?,
ident: self.ident().to_resolved().await?, ident: self.ident().to_resolved().await?,
...@@ -225,6 +262,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule { ...@@ -225,6 +262,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule {
original_source_map: None, original_source_map: None,
exports: self.get_exports().to_resolved().await?, exports: self.get_exports().to_resolved().await?,
async_module_info, async_module_info,
export_usage_info,
} }
.cell()) .cell())
} }
...@@ -257,6 +295,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -257,6 +295,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
EcmascriptModulePartReference::new_part( EcmascriptModulePartReference::new_part(
*self.module, *self.module,
ModulePart::locals(), ModulePart::locals(),
self.remove_unused_exports,
) )
.to_resolved() .to_resolved()
.await?, .await?,
...@@ -304,6 +343,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -304,6 +343,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
EcmascriptModulePartReference::new_part( EcmascriptModulePartReference::new_part(
*self.module, *self.module,
ModulePart::exports(), ModulePart::exports(),
self.remove_unused_exports,
) )
.to_resolved() .to_resolved()
.await?, .await?,
...@@ -314,7 +354,11 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -314,7 +354,11 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
); );
} }
star_exports.push(ResolvedVc::upcast( star_exports.push(ResolvedVc::upcast(
EcmascriptModulePartReference::new_part(*self.module, ModulePart::exports()) EcmascriptModulePartReference::new_part(
*self.module,
ModulePart::exports(),
self.remove_unused_exports,
)
.to_resolved() .to_resolved()
.await?, .await?,
)); ));
...@@ -327,7 +371,10 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -327,7 +371,10 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
export.clone(), export.clone(),
EsmExport::ImportedBinding( EsmExport::ImportedBinding(
ResolvedVc::upcast( ResolvedVc::upcast(
EcmascriptModulePartReference::new(*self.module) EcmascriptModulePartReference::new(
*self.module,
self.remove_unused_exports,
)
.to_resolved() .to_resolved()
.await?, .await?,
), ),
...@@ -340,7 +387,10 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -340,7 +387,10 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
exports.insert( exports.insert(
export.clone(), export.clone(),
EsmExport::ImportedNamespace(ResolvedVc::upcast( EsmExport::ImportedNamespace(ResolvedVc::upcast(
EcmascriptModulePartReference::new(*self.module) EcmascriptModulePartReference::new(
*self.module,
self.remove_unused_exports,
)
.to_resolved() .to_resolved()
.await?, .await?,
)), )),
......
...@@ -22,6 +22,7 @@ use crate::{ ...@@ -22,6 +22,7 @@ use crate::{
async_module::OptionAsyncModule, async_module::OptionAsyncModule,
esm::{EsmExport, EsmExports}, esm::{EsmExport, EsmExports},
}, },
simple_tree_shake::get_module_export_usages,
}; };
/// A module derived from an original ecmascript module that only contains the /// A module derived from an original ecmascript module that only contains the
...@@ -108,6 +109,16 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule { ...@@ -108,6 +109,16 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule {
.reference_module_source_maps(Vc::upcast(self)) .reference_module_source_maps(Vc::upcast(self))
.await?; .await?;
let export_usage_info = if original_module.options().await?.remove_unused_exports {
Some(
get_module_export_usages(*module_graph, Vc::upcast(self))
.to_resolved()
.await?,
)
} else {
None
};
Ok(EcmascriptModuleContentOptions { Ok(EcmascriptModuleContentOptions {
parsed, parsed,
ident: self.ident().to_resolved().await?, ident: self.ident().to_resolved().await?,
...@@ -123,6 +134,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule { ...@@ -123,6 +134,7 @@ impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule {
original_source_map: analyze_result.source_map, original_source_map: analyze_result.source_map,
exports, exports,
async_module_info, async_module_info,
export_usage_info,
} }
.cell()) .cell())
} }
......
...@@ -9,7 +9,7 @@ use turbopack_core::{ ...@@ -9,7 +9,7 @@ use turbopack_core::{
}, },
module::Module, module::Module,
reference::ModuleReference, reference::ModuleReference,
resolve::{ModulePart, ModuleResolveResult}, resolve::{ExportUsage, ModulePart, ModuleResolveResult},
}; };
use super::{ use super::{
...@@ -27,6 +27,7 @@ use crate::{ ...@@ -27,6 +27,7 @@ use crate::{
pub struct EcmascriptModulePartReference { pub struct EcmascriptModulePartReference {
pub module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, pub module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
pub part: Option<ModulePart>, pub part: Option<ModulePart>,
pub remove_unused_exports: bool,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -35,17 +36,27 @@ impl EcmascriptModulePartReference { ...@@ -35,17 +36,27 @@ impl EcmascriptModulePartReference {
pub fn new_part( pub fn new_part(
module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
part: ModulePart, part: ModulePart,
remove_unused_exports: bool,
) -> Vc<Self> { ) -> Vc<Self> {
EcmascriptModulePartReference { EcmascriptModulePartReference {
module, module,
part: Some(part), part: Some(part),
remove_unused_exports,
} }
.cell() .cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new(module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>) -> Vc<Self> { pub fn new(
EcmascriptModulePartReference { module, part: None }.cell() module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
remove_unused_exports: bool,
) -> Vc<Self> {
EcmascriptModulePartReference {
module,
part: None,
remove_unused_exports,
}
.cell()
} }
} }
...@@ -79,9 +90,13 @@ impl ModuleReference for EcmascriptModulePartReference { ...@@ -79,9 +90,13 @@ impl ModuleReference for EcmascriptModulePartReference {
| ModulePart::Evaluation | ModulePart::Evaluation
| ModulePart::Facade | ModulePart::Facade
| ModulePart::RenamedExport { .. } | ModulePart::RenamedExport { .. }
| ModulePart::RenamedNamespace { .. } => Vc::upcast( | ModulePart::RenamedNamespace { .. } => {
EcmascriptModuleFacadeModule::new(*self.module, part.clone()), Vc::upcast(EcmascriptModuleFacadeModule::new(
), *self.module,
part.clone(),
self.remove_unused_exports,
))
}
ModulePart::Export(..) | ModulePart::Internal(..) => { ModulePart::Export(..) | ModulePart::Internal(..) => {
bail!( bail!(
"Unexpected ModulePart \"{}\" for EcmascriptModulePartReference", "Unexpected ModulePart \"{}\" for EcmascriptModulePartReference",
...@@ -94,6 +109,7 @@ impl ModuleReference for EcmascriptModulePartReference { ...@@ -94,6 +109,7 @@ impl ModuleReference for EcmascriptModulePartReference {
} else { } else {
ResolvedVc::upcast(self.module) ResolvedVc::upcast(self.module)
}; };
Ok(*ModuleResolveResult::module(module)) Ok(*ModuleResolveResult::module(module))
} }
} }
...@@ -107,6 +123,15 @@ impl ChunkableModuleReference for EcmascriptModulePartReference { ...@@ -107,6 +123,15 @@ impl ChunkableModuleReference for EcmascriptModulePartReference {
hoisted: true, hoisted: true,
})) }))
} }
#[turbo_tasks::function]
fn export_usage(&self) -> Vc<ExportUsage> {
match &self.part {
Some(ModulePart::Export(export)) => ExportUsage::named(export.clone()),
Some(ModulePart::Evaluation) => ExportUsage::evaluation(),
_ => ExportUsage::all(),
}
}
} }
impl EcmascriptModulePartReference { impl EcmascriptModulePartReference {
......
//! Intermediate tree shaking that uses global information but not good as the full tree shaking.
use anyhow::{Context, Result};
use auto_hash_map::AutoSet;
use rustc_hash::FxHashMap;
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{module_graph::ModuleGraph, resolve::ExportUsage};
use crate::chunk::EcmascriptChunkPlaceable;
#[turbo_tasks::function]
pub async fn get_module_export_usages(
graph: ResolvedVc<ModuleGraph>,
module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
) -> Result<Vc<ModuleExportUsageInfo>> {
let export_usage_info = compute_export_usage_info(graph)
.resolve_strongly_consistent()
.await?;
let export_usage_info = export_usage_info.await?;
let Some(exports) = export_usage_info.used_exports.get(&module) else {
// We exclude template files from tree shaking because they are entrypoints to the module
// graph.
return Ok(ModuleExportUsageInfo::All.cell());
};
Ok(exports.clone().cell())
}
#[turbo_tasks::function(operation)]
async fn compute_export_usage_info(graph: ResolvedVc<ModuleGraph>) -> Result<Vc<ExportUsageInfo>> {
let mut used_exports = FxHashMap::<_, ModuleExportUsageInfo>::default();
graph
.await?
.traverse_all_edges_unordered(|(_, ref_data), target| {
if let Some(target_module) =
ResolvedVc::try_downcast::<Box<dyn EcmascriptChunkPlaceable>>(target.module)
{
let e = used_exports.entry(target_module).or_default();
e.add(&ref_data.export);
}
Ok(())
})
.await
.context("failed to traverse module graph")?;
Ok(ExportUsageInfo { used_exports }.cell())
}
#[turbo_tasks::value]
#[derive(Default)]
pub struct ExportUsageInfo {
used_exports: FxHashMap<ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>, ModuleExportUsageInfo>,
}
#[turbo_tasks::value]
#[derive(Default, Clone)]
pub enum ModuleExportUsageInfo {
All,
#[default]
Evaluation,
Exports(AutoSet<RcStr>),
}
impl ModuleExportUsageInfo {
fn add(&mut self, usage: &ExportUsage) {
match (&mut *self, usage) {
(Self::All, _) => {}
(_, ExportUsage::All) => {
*self = Self::All;
}
(Self::Evaluation, ExportUsage::Named(name)) => {
// Promote evaluation to something more specific
*self = Self::Exports(AutoSet::from_iter([name.clone()]));
}
(Self::Exports(l), ExportUsage::Named(r)) => {
// Merge exports
l.insert(r.clone());
}
(_, ExportUsage::Evaluation) => {
// Ignore evaluation
}
}
}
pub fn is_export_used(&self, export: &RcStr) -> bool {
match self {
Self::All => true,
Self::Evaluation => false,
Self::Exports(exports) => exports.contains(export),
}
}
}
...@@ -10,7 +10,7 @@ use turbopack_core::{ ...@@ -10,7 +10,7 @@ use turbopack_core::{
module::Module, module::Module,
module_graph::ModuleGraph, module_graph::ModuleGraph,
reference::{ModuleReference, ModuleReferences, SingleChunkableModuleReference}, reference::{ModuleReference, ModuleReferences, SingleChunkableModuleReference},
resolve::{ModulePart, origin::ResolveOrigin}, resolve::{ExportUsage, ModulePart, origin::ResolveOrigin},
}; };
use super::{ use super::{
...@@ -27,6 +27,7 @@ use crate::{ ...@@ -27,6 +27,7 @@ use crate::{
FollowExportsResult, analyse_ecmascript_module, esm::FoundExportType, follow_reexports, FollowExportsResult, analyse_ecmascript_module, esm::FoundExportType, follow_reexports,
}, },
side_effect_optimization::facade::module::EcmascriptModuleFacadeModule, side_effect_optimization::facade::module::EcmascriptModuleFacadeModule,
simple_tree_shake::get_module_export_usages,
tree_shake::{Key, side_effect_module::SideEffectsModule}, tree_shake::{Key, side_effect_module::SideEffectsModule},
}; };
...@@ -96,6 +97,16 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset { ...@@ -96,6 +97,16 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset {
.reference_module_source_maps(Vc::upcast(self)) .reference_module_source_maps(Vc::upcast(self))
.await?; .await?;
let export_usage_info = if module.full_module.options().await?.remove_unused_exports {
Some(
get_module_export_usages(*module_graph, Vc::upcast(*module.full_module))
.to_resolved()
.await?,
)
} else {
None
};
Ok(EcmascriptModuleContentOptions { Ok(EcmascriptModuleContentOptions {
parsed, parsed,
ident: self.ident().to_resolved().await?, ident: self.ident().to_resolved().await?,
...@@ -111,6 +122,7 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset { ...@@ -111,6 +122,7 @@ impl EcmascriptAnalyzable for EcmascriptModulePartAsset {
original_source_map: analyze_ref.source_map, original_source_map: analyze_ref.source_map,
exports: analyze_ref.exports, exports: analyze_ref.exports,
async_module_info, async_module_info,
export_usage_info,
} }
.cell()) .cell())
} }
...@@ -203,6 +215,7 @@ impl EcmascriptModulePartAsset { ...@@ -203,6 +215,7 @@ impl EcmascriptModulePartAsset {
EcmascriptModuleFacadeModule::new( EcmascriptModuleFacadeModule::new(
**final_module, **final_module,
ModulePart::renamed_export(new_export.clone(), export.clone()), ModulePart::renamed_export(new_export.clone(), export.clone()),
module.options().await?.remove_unused_exports,
) )
.to_resolved() .to_resolved()
.await?, .await?,
...@@ -213,6 +226,7 @@ impl EcmascriptModulePartAsset { ...@@ -213,6 +226,7 @@ impl EcmascriptModulePartAsset {
EcmascriptModuleFacadeModule::new( EcmascriptModuleFacadeModule::new(
**final_module, **final_module,
ModulePart::renamed_namespace(export.clone()), ModulePart::renamed_namespace(export.clone()),
module.options().await?.remove_unused_exports,
) )
.to_resolved() .to_resolved()
.await?, .await?,
...@@ -322,12 +336,19 @@ impl Module for EcmascriptModulePartAsset { ...@@ -322,12 +336,19 @@ impl Module for EcmascriptModulePartAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(&self) -> Result<Vc<ModuleReferences>> { async fn references(&self) -> Result<Vc<ModuleReferences>> {
let part_dep = |part: ModulePart| -> Vc<Box<dyn ModuleReference>> { let part_dep = |part: ModulePart| -> Vc<Box<dyn ModuleReference>> {
let export = match &part {
ModulePart::Export(export) => ExportUsage::named(export.clone()),
ModulePart::Evaluation => ExportUsage::evaluation(),
_ => ExportUsage::all(),
};
Vc::upcast(SingleChunkableModuleReference::new( Vc::upcast(SingleChunkableModuleReference::new(
Vc::upcast(EcmascriptModulePartAsset::new_with_resolved_part( Vc::upcast(EcmascriptModulePartAsset::new_with_resolved_part(
*self.full_module, *self.full_module,
part, part,
)), )),
rcstr!("part reference"), rcstr!("part reference"),
export,
)) ))
}; };
......
...@@ -9,7 +9,7 @@ use turbopack_core::{ ...@@ -9,7 +9,7 @@ use turbopack_core::{
module::Module, module::Module,
module_graph::ModuleGraph, module_graph::ModuleGraph,
reference::{ModuleReferences, SingleChunkableModuleReference}, reference::{ModuleReferences, SingleChunkableModuleReference},
resolve::ModulePart, resolve::{ExportUsage, ModulePart},
}; };
use crate::{ use crate::{
...@@ -85,6 +85,7 @@ impl Module for SideEffectsModule { ...@@ -85,6 +85,7 @@ impl Module for SideEffectsModule {
SingleChunkableModuleReference::new( SingleChunkableModuleReference::new(
*ResolvedVc::upcast(*side_effect), *ResolvedVc::upcast(*side_effect),
rcstr!("side effect"), rcstr!("side effect"),
ExportUsage::evaluation(),
) )
.to_resolved() .to_resolved()
.await?, .await?,
...@@ -98,6 +99,7 @@ impl Module for SideEffectsModule { ...@@ -98,6 +99,7 @@ impl Module for SideEffectsModule {
SingleChunkableModuleReference::new( SingleChunkableModuleReference::new(
*ResolvedVc::upcast(self.resolved_as), *ResolvedVc::upcast(self.resolved_as),
rcstr!("resolved as"), rcstr!("resolved as"),
ExportUsage::all(),
) )
.to_resolved() .to_resolved()
.await?, .await?,
......
...@@ -46,13 +46,12 @@ pub fn apply_esm_specific_options( ...@@ -46,13 +46,12 @@ pub fn apply_esm_specific_options(
options: Vc<ResolveOptions>, options: Vc<ResolveOptions>,
reference_type: ReferenceType, reference_type: ReferenceType,
) -> Vc<ResolveOptions> { ) -> Vc<ResolveOptions> {
apply_esm_specific_options_internal( let clear_extensions = matches!(
options,
matches!(
reference_type, reference_type,
ReferenceType::EcmaScriptModules(EcmaScriptModulesReferenceSubType::ImportWithType(_)) ReferenceType::EcmaScriptModules(EcmaScriptModulesReferenceSubType::ImportWithType(_))
), );
)
apply_esm_specific_options_internal(options, clear_extensions)
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -241,6 +241,8 @@ async fn run_inner_operation( ...@@ -241,6 +241,8 @@ async fn run_inner_operation(
#[serde(rename_all = "camelCase", deny_unknown_fields)] #[serde(rename_all = "camelCase", deny_unknown_fields)]
struct TestOptions { struct TestOptions {
tree_shaking_mode: Option<TreeShakingMode>, tree_shaking_mode: Option<TreeShakingMode>,
#[serde(default)]
remove_unused_exports: bool,
} }
#[turbo_tasks::value] #[turbo_tasks::value]
...@@ -376,10 +378,12 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V ...@@ -376,10 +378,12 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V
ContextCondition::InDirectory("node_modules".into()), ContextCondition::InDirectory("node_modules".into()),
ModuleOptionsContext { ModuleOptionsContext {
tree_shaking_mode: options.tree_shaking_mode, tree_shaking_mode: options.tree_shaking_mode,
remove_unused_exports: options.remove_unused_exports,
..Default::default() ..Default::default()
} }
.resolved_cell(), .resolved_cell(),
)], )],
remove_unused_exports: options.remove_unused_exports,
..Default::default() ..Default::default()
} }
.into(), .into(),
......
...@@ -96,6 +96,8 @@ struct SnapshotOptions { ...@@ -96,6 +96,8 @@ struct SnapshotOptions {
environment: SnapshotEnvironment, environment: SnapshotEnvironment,
#[serde(default)] #[serde(default)]
tree_shaking_mode: Option<TreeShakingMode>, tree_shaking_mode: Option<TreeShakingMode>,
#[serde(default)]
remove_unused_exports: bool,
} }
#[derive(Debug, Deserialize, Default)] #[derive(Debug, Deserialize, Default)]
...@@ -122,6 +124,7 @@ impl Default for SnapshotOptions { ...@@ -122,6 +124,7 @@ impl Default for SnapshotOptions {
runtime_type: default_runtime_type(), runtime_type: default_runtime_type(),
environment: Default::default(), environment: Default::default(),
tree_shaking_mode: Default::default(), tree_shaking_mode: Default::default(),
remove_unused_exports: false,
} }
} }
} }
...@@ -305,6 +308,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> { ...@@ -305,6 +308,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
rules: vec![( rules: vec![(
ContextCondition::InDirectory("node_modules".into()), ContextCondition::InDirectory("node_modules".into()),
ModuleOptionsContext { ModuleOptionsContext {
remove_unused_exports: options.remove_unused_exports,
css: CssOptionsContext { css: CssOptionsContext {
..Default::default() ..Default::default()
}, },
...@@ -314,6 +318,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> { ...@@ -314,6 +318,7 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
)], )],
module_rules: vec![module_rules], module_rules: vec![module_rules],
tree_shaking_mode: options.tree_shaking_mode, tree_shaking_mode: options.tree_shaking_mode,
remove_unused_exports: options.remove_unused_exports,
..Default::default() ..Default::default()
} }
.into(), .into(),
......
let cat = "cat";
let dog = "dog";
export function getChimera() {
return cat + dog;
}
export function getCat() {
return cat;
}
export function getDog() {
return dog;
}
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/4c35f_tests_snapshot_intermediate-tree-shake_tree-shake-test-1_input_80df1e23._.js", {
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/intermediate-tree-shake/tree-shake-test-1/input/index.js [test] (ecmascript)": ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s({});
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$intermediate$2d$tree$2d$shake$2f$tree$2d$shake$2d$test$2d$1$2f$input$2f$node_modules$2f$lib$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/intermediate-tree-shake/tree-shake-test-1/input/node_modules/lib/index.js [test] (ecmascript)");
;
console.log(`I like ${(0, __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$intermediate$2d$tree$2d$shake$2f$tree$2d$shake$2d$test$2d$1$2f$input$2f$node_modules$2f$lib$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__["getCat"])()}`);
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/intermediate-tree-shake/tree-shake-test-1/input/node_modules/lib/index.js [test] (ecmascript)": ((__turbopack_context__) => {
"use strict";
__turbopack_context__.s({
"getCat": (()=>getCat)
});
let cat = "cat";
let dog = "dog";
function getChimera() {
return cat + dog;
}
function getCat() {
return cat;
}
function getDog() {
return dog;
}
}),
}]);
//# sourceMappingURL=4c35f_tests_snapshot_intermediate-tree-shake_tree-shake-test-1_input_80df1e23._.js.map
\ No newline at end of file
{
"version": 3,
"sources": [],
"sections": [
{"offset": {"line": 5, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/intermediate-tree-shake/tree-shake-test-1/input/index.js"],"sourcesContent":["import { getCat } from 'lib'\n\nconsole.log(`I like ${getCat()}`)\n"],"names":[],"mappings":";AAAA;;AAEA,QAAQ,GAAG,CAAC,CAAC,OAAO,EAAE,CAAA,GAAA,gQAAA,CAAA,SAAM,AAAD,KAAK"}},
{"offset": {"line": 13, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/intermediate-tree-shake/tree-shake-test-1/input/node_modules/lib/index.js"],"sourcesContent":["\nlet cat = \"cat\";\nlet dog = \"dog\";\n\nexport function getChimera() {\n return cat + dog;\n}\n\nexport function getCat() {\n return cat;\n}\n\nexport function getDog() {\n return dog;\n}\n\n"],"names":[],"mappings":";;;AACA,IAAI,MAAM;AACV,IAAI,MAAM;AAEH,SAAS;IACd,OAAO,MAAM;AACf;AAEO,SAAS;IACd,OAAO;AACT;AAEO,SAAS;IACd,OAAO;AACT","ignoreList":[0]}}]
}
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/4c35f_tests_snapshot_intermediate-tree-shake_tree-shake-test-1_input_index_1ae89033.js",
{},
{"otherChunks":["output/4c35f_tests_snapshot_intermediate-tree-shake_tree-shake-test-1_input_80df1e23._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/intermediate-tree-shake/tree-shake-test-1/input/index.js [test] (ecmascript)"]}
]);
// Dummy runtime
\ No newline at end of file
...@@ -15,7 +15,7 @@ use turbopack_core::{ ...@@ -15,7 +15,7 @@ use turbopack_core::{
output::OutputAssets, output::OutputAssets,
reference::{ModuleReferences, SingleChunkableModuleReference}, reference::{ModuleReferences, SingleChunkableModuleReference},
reference_type::ReferenceType, reference_type::ReferenceType,
resolve::{origin::ResolveOrigin, parse::Request}, resolve::{ExportUsage, origin::ResolveOrigin, parse::Request},
source::Source, source::Source,
}; };
use turbopack_ecmascript::{ use turbopack_ecmascript::{
...@@ -108,7 +108,11 @@ impl WebAssemblyModuleAsset { ...@@ -108,7 +108,11 @@ impl WebAssemblyModuleAsset {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> { async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> {
Ok(Vc::cell(vec![ResolvedVc::upcast( Ok(Vc::cell(vec![ResolvedVc::upcast(
SingleChunkableModuleReference::new(Vc::upcast(self.loader()), rcstr!("wasm loader")) SingleChunkableModuleReference::new(
Vc::upcast(self.loader()),
rcstr!("wasm loader"),
ExportUsage::all(),
)
.to_resolved() .to_resolved()
.await?, .await?,
)])) )]))
......
...@@ -9,7 +9,7 @@ use turbopack_core::{ ...@@ -9,7 +9,7 @@ use turbopack_core::{
chunk::{ChunkableModule, ChunkingType, module_id_strategies::GlobalModuleIdStrategy}, chunk::{ChunkableModule, ChunkingType, module_id_strategies::GlobalModuleIdStrategy},
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
module_graph::ModuleGraph, module_graph::{ModuleGraph, RefData},
}; };
use turbopack_ecmascript::async_chunk::module::AsyncLoaderModule; use turbopack_ecmascript::async_chunk::module::AsyncLoaderModule;
...@@ -32,7 +32,14 @@ pub async fn get_global_module_id_strategy( ...@@ -32,7 +32,14 @@ pub async fn get_global_module_id_strategy(
let mut async_idents = vec![]; let mut async_idents = vec![];
module_graph module_graph
.traverse_all_edges_unordered(|parent, current| { .traverse_all_edges_unordered(|parent, current| {
if let (_, &ChunkingType::Async) = parent { if let (
_,
&RefData {
chunking_type: ChunkingType::Async,
..
},
) = parent
{
let module = let module =
ResolvedVc::try_sidecast::<Box<dyn ChunkableModule>>(current.module) ResolvedVc::try_sidecast::<Box<dyn ChunkableModule>>(current.module)
.context("expected chunkable module for async reference")?; .context("expected chunkable module for async reference")?;
......
...@@ -154,8 +154,8 @@ async fn apply_module_type( ...@@ -154,8 +154,8 @@ async fn apply_module_type(
} }
} }
let options = options.await?; let options_value = options.await?;
match options.tree_shaking_mode { match options_value.tree_shaking_mode {
Some(TreeShakingMode::ModuleFragments) => { Some(TreeShakingMode::ModuleFragments) => {
Vc::upcast(EcmascriptModulePartAsset::select_part( Vc::upcast(EcmascriptModulePartAsset::select_part(
*module, *module,
...@@ -170,6 +170,7 @@ async fn apply_module_type( ...@@ -170,6 +170,7 @@ async fn apply_module_type(
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
Vc::upcast(*module), Vc::upcast(*module),
part, part,
options.await?.remove_unused_exports,
)) ))
} else { } else {
Vc::upcast(*module) Vc::upcast(*module)
...@@ -187,18 +188,21 @@ async fn apply_module_type( ...@@ -187,18 +188,21 @@ async fn apply_module_type(
EcmascriptModuleFacadeModule::new( EcmascriptModuleFacadeModule::new(
Vc::upcast(*module), Vc::upcast(*module),
ModulePart::exports(), ModulePart::exports(),
options.await?.remove_unused_exports,
) )
.resolve() .resolve()
.await?, .await?,
), ),
part, part,
side_effect_free_packages, side_effect_free_packages,
options.await?.remove_unused_exports,
) )
} else { } else {
apply_reexport_tree_shaking( apply_reexport_tree_shaking(
Vc::upcast(*module), Vc::upcast(*module),
part, part,
side_effect_free_packages, side_effect_free_packages,
options.await?.remove_unused_exports,
) )
} }
} }
...@@ -212,6 +216,7 @@ async fn apply_module_type( ...@@ -212,6 +216,7 @@ async fn apply_module_type(
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
Vc::upcast(*module), Vc::upcast(*module),
ModulePart::facade(), ModulePart::facade(),
options.await?.remove_unused_exports,
)) ))
} else { } else {
Vc::upcast(*module) Vc::upcast(*module)
...@@ -275,6 +280,7 @@ async fn apply_reexport_tree_shaking( ...@@ -275,6 +280,7 @@ async fn apply_reexport_tree_shaking(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>, module: Vc<Box<dyn EcmascriptChunkPlaceable>>,
part: ModulePart, part: ModulePart,
side_effect_free_packages: Vc<Glob>, side_effect_free_packages: Vc<Glob>,
remove_unused_exports: bool,
) -> Result<Vc<Box<dyn Module>>> { ) -> Result<Vc<Box<dyn Module>>> {
if let ModulePart::Export(export) = &part { if let ModulePart::Export(export) = &part {
let FollowExportsResult { let FollowExportsResult {
...@@ -289,12 +295,14 @@ async fn apply_reexport_tree_shaking( ...@@ -289,12 +295,14 @@ async fn apply_reexport_tree_shaking(
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
**final_module, **final_module,
ModulePart::renamed_export(new_export.clone(), export.clone()), ModulePart::renamed_export(new_export.clone(), export.clone()),
remove_unused_exports,
)) ))
} }
} else { } else {
Vc::upcast(EcmascriptModuleFacadeModule::new( Vc::upcast(EcmascriptModuleFacadeModule::new(
**final_module, **final_module,
ModulePart::renamed_namespace(export.clone()), ModulePart::renamed_namespace(export.clone()),
remove_unused_exports,
)) ))
}; };
return Ok(module); return Ok(module);
......
...@@ -144,6 +144,7 @@ impl ModuleOptions { ...@@ -144,6 +144,7 @@ impl ModuleOptions {
execution_context, execution_context,
tree_shaking_mode, tree_shaking_mode,
keep_last_successful_parse, keep_last_successful_parse,
remove_unused_exports,
.. ..
} = *module_options_context.await?; } = *module_options_context.await?;
...@@ -174,6 +175,7 @@ impl ModuleOptions { ...@@ -174,6 +175,7 @@ impl ModuleOptions {
refresh, refresh,
extract_source_map: matches!(ecmascript_source_maps, SourceMapsType::Full), extract_source_map: matches!(ecmascript_source_maps, SourceMapsType::Full),
keep_last_successful_parse, keep_last_successful_parse,
remove_unused_exports,
..Default::default() ..Default::default()
}; };
let ecmascript_options_vc = ecmascript_options.resolved_cell(); let ecmascript_options_vc = ecmascript_options.resolved_cell();
......
...@@ -169,6 +169,11 @@ pub struct ModuleOptionsContext { ...@@ -169,6 +169,11 @@ pub struct ModuleOptionsContext {
/// A list of rules to use a different module option context for certain /// A list of rules to use a different module option context for certain
/// context paths. The first matching is used. /// context paths. The first matching is used.
pub rules: Vec<(ContextCondition, ResolvedVc<ModuleOptionsContext>)>, pub rules: Vec<(ContextCondition, ResolvedVc<ModuleOptionsContext>)>,
/// `matches!(tree_shaking_mode, Some(TreeShakingMode::Intermediate))` is not enough because we
/// use different tree shaking modes for user code and foreign code while intermediate tree
/// shaking is a global option.
pub remove_unused_exports: bool,
pub placeholder_for_future_extensions: (), pub placeholder_for_future_extensions: (),
} }
......
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