Unverified Commit e90189b9 authored by Sam Poder's avatar Sam Poder Committed by GitHub

[turbopack] Rename `turbopackTreeShaking` to `turbopackModuleFragments` (#95978)

This has been causing a lot of confusion when contributors have been
debugging tree shaking, eg.
https://github.com/vercel/next.js/issues/95698 and the linked issues.
Turbopack's standard tree-shaking features are controlled through the
`turbopackRemoveUnusedExports` and `turbopackRemoveUnusedImports`
options which default to true.
parent c0a7b91b
......@@ -48,8 +48,8 @@ use turbopack_core::{
use turbopack_ecmascript::{
EcmascriptParsable,
chunk::{EcmascriptChunkItem, EcmascriptChunkItemExt, EcmascriptChunkPlaceable},
module_fragments::part::module::EcmascriptModulePartAsset,
parse::ParseResult,
tree_shake::part::module::EcmascriptModulePartAsset,
};
use crate::project::Project;
......
......@@ -283,11 +283,11 @@ pub async fn get_client_module_options_context(
let enable_webpack_loaders =
*webpack_loader_options(project_path.clone(), next_config, loader_conditions).await?;
let tree_shaking_mode_for_user_code = *next_config
.tree_shaking_mode_for_user_code(next_mode.is_development())
let module_fragments_enabled_for_user_code = *next_config
.module_fragments_enabled_for_user_code(next_mode.is_development())
.await?;
let tree_shaking_mode_for_foreign_code = *next_config
.tree_shaking_mode_for_foreign_code(next_mode.is_development())
let module_fragments_enabled_for_foreign_code = *next_config
.module_fragments_enabled_for_foreign_code(next_mode.is_development())
.await?;
let target_browsers = env.runtime_versions();
......@@ -387,7 +387,8 @@ pub async fn get_client_module_options_context(
static_url_tag: Some(rcstr!("client")),
environment: Some(env),
execution_context: Some(execution_context),
tree_shaking_mode: tree_shaking_mode_for_user_code,
follow_reexports: true,
module_fragments_enabled: module_fragments_enabled_for_user_code,
enable_postcss_transform,
side_effect_free_packages: Some(
side_effect_free_packages_glob(next_config.optimize_package_imports())
......@@ -413,7 +414,8 @@ pub async fn get_client_module_options_context(
enable_webpack_loaders: foreign_enable_webpack_loaders,
enable_postcss_transform: enable_foreign_postcss_transform,
module_rules: foreign_next_client_rules,
tree_shaking_mode: tree_shaking_mode_for_foreign_code,
follow_reexports: true,
module_fragments_enabled: module_fragments_enabled_for_foreign_code,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
..module_options_context.clone()
};
......
......@@ -29,11 +29,8 @@ use turbopack_core::{
module_graph::{chunk_group_info::EntryHeuristics, style_groups::StyleGroupsAlgorithm},
resolve::ResolveAliasMap,
};
use turbopack_ecmascript::{
OptionTreeShaking, TreeShakingMode,
transform::{
OptionReactCompilerCompilationMode, ReactCompilerCompilationMode, ReactCompilerTarget,
},
use turbopack_ecmascript::transform::{
OptionReactCompilerCompilationMode, ReactCompilerCompilationMode, ReactCompilerTarget,
};
use turbopack_ecmascript_plugins::transform::{
emotion::EmotionTransformConfig, relay::RelayConfig,
......@@ -1369,7 +1366,7 @@ pub struct ExperimentalConfig {
turbopack_plugin_runtime_strategy: Option<TurbopackPluginRuntimeStrategy>,
turbopack_source_maps: Option<bool>,
turbopack_input_source_maps: Option<bool>,
turbopack_tree_shaking: Option<bool>,
turbopack_module_fragments: Option<bool>,
turbopack_scope_hoisting: Option<bool>,
turbopack_generate_component_chunks: Option<bool>,
turbopack_shared_runtime: Option<bool>,
......@@ -2409,26 +2406,19 @@ impl NextConfig {
}
#[turbo_tasks::function]
pub fn tree_shaking_mode_for_foreign_code(
&self,
_is_development: bool,
) -> Vc<OptionTreeShaking> {
OptionTreeShaking(match self.experimental.turbopack_tree_shaking {
Some(false) => Some(TreeShakingMode::ReexportsOnly),
Some(true) => Some(TreeShakingMode::ModuleFragments),
None => Some(TreeShakingMode::ReexportsOnly),
})
.cell()
pub fn module_fragments_enabled_for_foreign_code(&self, _is_development: bool) -> Vc<bool> {
Vc::cell(matches!(
self.experimental.turbopack_module_fragments,
Some(true)
))
}
#[turbo_tasks::function]
pub fn tree_shaking_mode_for_user_code(&self, _is_development: bool) -> Vc<OptionTreeShaking> {
OptionTreeShaking(match self.experimental.turbopack_tree_shaking {
Some(false) => Some(TreeShakingMode::ReexportsOnly),
Some(true) => Some(TreeShakingMode::ModuleFragments),
None => Some(TreeShakingMode::ReexportsOnly),
})
.cell()
pub fn module_fragments_enabled_for_user_code(&self, _is_development: bool) -> Vc<bool> {
Vc::cell(matches!(
self.experimental.turbopack_module_fragments,
Some(true)
))
}
#[turbo_tasks::function]
......
......@@ -486,11 +486,11 @@ pub async fn get_server_module_options_context(
let enable_webpack_loaders =
*webpack_loader_options(project_path.clone(), next_config, loader_conditions).await?;
let tree_shaking_mode_for_user_code = *next_config
.tree_shaking_mode_for_user_code(next_mode.is_development())
let module_fragments_enabled_for_user_code = *next_config
.module_fragments_enabled_for_user_code(next_mode.is_development())
.await?;
let tree_shaking_mode_for_foreign_code = *next_config
.tree_shaking_mode_for_foreign_code(next_mode.is_development())
let module_fragments_enabled_for_foreign_code = *next_config
.module_fragments_enabled_for_foreign_code(next_mode.is_development())
.await?;
let tsconfig_path = next_config
......@@ -589,7 +589,8 @@ pub async fn get_server_module_options_context(
lightningcss_features: *next_config.lightningcss_feature_flags().await?,
..Default::default()
},
tree_shaking_mode: tree_shaking_mode_for_user_code,
follow_reexports: true,
module_fragments_enabled: module_fragments_enabled_for_user_code,
side_effect_free_packages: Some(
side_effect_free_packages_glob(next_config.optimize_package_imports())
.to_resolved()
......@@ -652,7 +653,8 @@ pub async fn get_server_module_options_context(
enable_webpack_loaders: foreign_enable_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
enable_postcss_transform: enable_foreign_postcss_transform,
tree_shaking_mode: tree_shaking_mode_for_foreign_code,
follow_reexports: true,
module_fragments_enabled: module_fragments_enabled_for_foreign_code,
..module_options_context.clone()
};
......@@ -717,7 +719,8 @@ pub async fn get_server_module_options_context(
enable_webpack_loaders: foreign_enable_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
enable_postcss_transform: enable_foreign_postcss_transform,
tree_shaking_mode: tree_shaking_mode_for_foreign_code,
follow_reexports: true,
module_fragments_enabled: module_fragments_enabled_for_foreign_code,
..module_options_context.clone()
};
let internal_module_options_context = ModuleOptionsContext {
......@@ -800,7 +803,8 @@ pub async fn get_server_module_options_context(
enable_webpack_loaders: foreign_enable_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
enable_postcss_transform: enable_foreign_postcss_transform,
tree_shaking_mode: tree_shaking_mode_for_foreign_code,
follow_reexports: true,
module_fragments_enabled: module_fragments_enabled_for_foreign_code,
..module_options_context.clone()
};
let internal_module_options_context = ModuleOptionsContext {
......@@ -877,7 +881,8 @@ pub async fn get_server_module_options_context(
enable_webpack_loaders: foreign_enable_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
enable_postcss_transform: enable_foreign_postcss_transform,
tree_shaking_mode: tree_shaking_mode_for_foreign_code,
follow_reexports: true,
module_fragments_enabled: module_fragments_enabled_for_foreign_code,
..module_options_context.clone()
};
let internal_module_options_context = ModuleOptionsContext {
......@@ -965,7 +970,8 @@ pub async fn get_server_module_options_context(
enable_webpack_loaders: foreign_enable_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
enable_postcss_transform: enable_foreign_postcss_transform,
tree_shaking_mode: tree_shaking_mode_for_foreign_code,
follow_reexports: true,
module_fragments_enabled: module_fragments_enabled_for_foreign_code,
..module_options_context.clone()
};
let internal_module_options_context = ModuleOptionsContext {
......
......@@ -376,7 +376,7 @@ Additionally, the following experimental options are available under `experiment
| `turbopackMinify` | Enable minification. | `false` | `true` |
| `turbopackSourceMaps` | Enable source maps. | `true` | `productionBrowserSourceMaps` |
| `turbopackInputSourceMaps` | Enable extraction of source maps from input files. | `true` | `true` |
| `turbopackTreeShaking` | Use advanced module-fragments tree shaking instead of the default reexports-only mode. | `false` | `false` |
| `turbopackModuleFragments` | Currently in active development. This splits modules into fragments and chunks only import the used fragments of the modules. | `false` | `false` |
| `turbopackRemoveUnusedImports` | Enable removing unused imports. Requires `turbopackRemoveUnusedExports`. | `false` | `true` |
| `turbopackRemoveUnusedExports` | Enable removing unused exports. | `false` | `true` |
| `turbopackInferModuleSideEffects` | Enable local analysis to infer side-effect-free modules for better tree shaking. | `true` | `true` |
......
......@@ -4,7 +4,7 @@ const config = {
serverActions: true,
typedRoutes: false,
turbopackMinify: true,
turbopackTreeShaking: false,
turbopackModuleFragments: false,
turbopackSourceMaps: true
},
......
......@@ -3,7 +3,7 @@ export default {
serverActions: true,
typedRoutes: false,
turbopackMinify: true,
turbopackTreeShaking: false,
turbopackModuleFragments: false,
turbopackSourceMaps: true
},
......
......@@ -3,7 +3,7 @@ module.exports = {
serverActions: true,
typedRoutes: false,
turbopackMinify: true,
turbopackTreeShaking: false,
turbopackModuleFragments: false,
turbopackSourceMaps: true
},
......
......@@ -4,7 +4,7 @@ const config = {
experimental: {
typedRoutes: true,
turbopackMinify: true,
turbopackTreeShaking: false,
turbopackModuleFragments: false,
turbopackSourceMaps: true
},
......
......@@ -6,7 +6,7 @@ const config: NextConfig = {
typedRoutes: true,
turbopackMinify: true,
turbopackTreeShaking: false,
turbopackModuleFragments: false,
turbopackSourceMaps: true
},
......
......@@ -3,7 +3,7 @@ const nextConfig = {
experimental: {
typedRoutes: true,
turbopackMinify: true,
turbopackTreeShaking: false,
turbopackModuleFragments: false,
turbopackSourceMaps: true
},
......
......@@ -28,7 +28,7 @@ import { isNextConfigFile } from './lib/utils'
// Properties that need to be moved to experimental.turbopack*
const RENAMED_EXPERIMENTAL_PROPERTIES = {
minify: 'turbopackMinify',
treeShaking: 'turbopackTreeShaking',
treeShaking: 'turbopackModuleFragments',
sourceMaps: 'turbopackSourceMaps',
}
......
......@@ -381,7 +381,7 @@ export const experimentalSchema = {
turbopackFileSystemCacheForBuild: z.boolean().optional(),
turbopackSourceMaps: z.boolean().optional(),
turbopackInputSourceMaps: z.boolean().optional(),
turbopackTreeShaking: z.boolean().optional(),
turbopackModuleFragments: z.boolean().optional(),
turbopackRemoveUnusedImports: z.boolean().optional(),
turbopackRemoveUnusedExports: z.boolean().optional(),
turbopackScopeHoisting: z.boolean().optional(),
......
......@@ -877,9 +877,10 @@ export interface ExperimentalConfig {
turbopackInputSourceMaps?: boolean
/**
* Enable tree shaking for the turbopack dev server and build.
* Currently in active development. This splits modules into fragments and
* chunks only import the used fragments of the modules.
*/
turbopackTreeShaking?: boolean
turbopackModuleFragments?: boolean
/**
* Enable removing unused imports for turbopack dev server and build.
......
......@@ -23,7 +23,6 @@ use turbopack_core::{
ident::Layer,
resolve::options::ImportMap,
};
use turbopack_ecmascript::TreeShakingMode;
use turbopack_node::{
execution_context::ExecutionContext, transforms::postcss::PostCssTransformOptions,
};
......@@ -100,7 +99,8 @@ async fn get_client_module_options_context(
let module_options_context = ModuleOptionsContext {
environment: Some(env),
execution_context: Some(execution_context),
tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly),
follow_reexports: true,
module_fragments_enabled: false,
keep_last_successful_parse: is_dev,
..Default::default()
};
......
......@@ -16,7 +16,7 @@ use turbopack_core::{
};
use turbopack_ecmascript::{
AnalyzeMode, EcmascriptInputTransforms, EcmascriptModuleAsset, EcmascriptOptions,
TreeShakingMode, references::analyze_ecmascript_module,
references::analyze_ecmascript_module,
};
use turbopack_test_utils::noop_asset_context::NoopAssetContext;
......@@ -89,11 +89,8 @@ async fn setup(
ResolvedVc::upcast(module_asset_context),
EcmascriptInputTransforms::empty().to_resolved().await?,
EcmascriptOptions {
tree_shaking_mode: if analyze_mode == AnalyzeMode::Tracing {
None
} else {
Some(TreeShakingMode::ReexportsOnly)
},
follow_reexports: analyze_mode != AnalyzeMode::Tracing,
module_fragments_enabled: false,
analyze_mode,
..Default::default()
}
......
......@@ -32,11 +32,11 @@ use crate::{
is_unresolved, is_unresolved_id,
},
magic_identifier::{MAGIC_IDENTIFIER_DEFAULT_EXPORT, MAGIC_IDENTIFIER_DEFAULT_EXPORT_ATOM},
module_fragments::{PartId, find_turbopack_part_id_in_asserts},
references::{
esm::{EsmAssetReference, EsmExport, Liveness},
util::{SpecifiedChunkingType, parse_chunking_type_annotation},
},
tree_shake::{PartId, find_turbopack_part_id_in_asserts},
};
#[turbo_tasks::value]
......
......@@ -20,6 +20,7 @@ pub mod magic_identifier;
pub mod manifest;
mod merged_module;
pub mod minify;
pub mod module_fragments;
pub mod parse;
mod path_visitor;
pub mod references;
......@@ -33,7 +34,6 @@ mod swc_comments;
pub mod text;
pub mod text_source_transform;
pub mod transform;
pub mod tree_shake;
pub mod typescript;
pub mod utils;
pub mod webpack;
......@@ -143,29 +143,6 @@ pub enum SpecifiedModuleType {
EcmaScript,
}
#[turbo_tasks::task_input]
#[derive(
PartialOrd,
Ord,
PartialEq,
Eq,
Hash,
Debug,
Clone,
Copy,
Default,
Deserialize,
TraceRawVcs,
Encode,
Decode,
)]
#[serde(rename_all = "kebab-case")]
pub enum TreeShakingMode {
ModuleFragments,
#[default]
ReexportsOnly,
}
#[turbo_tasks::task_input]
#[derive(
PartialOrd,
......@@ -209,9 +186,6 @@ impl AnalyzeMode {
}
}
#[turbo_tasks::value(transparent)]
pub struct OptionTreeShaking(pub Option<TreeShakingMode>);
/// The constant to replace `typeof window` with.
#[turbo_tasks::task_input]
#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, TraceRawVcs, Encode, Decode)]
......@@ -223,8 +197,10 @@ pub enum TypeofWindow {
#[turbo_tasks::value(shared)]
#[derive(Debug, Default, Copy, Clone)]
pub struct EcmascriptOptions {
/// variant of tree shaking to use
pub tree_shaking_mode: Option<TreeShakingMode>,
/// Whether re-exports are followed for tree shaking.
pub follow_reexports: bool,
/// Whether module fragments tree shaking is enabled.
pub module_fragments_enabled: bool,
/// module is forced to a specific type (happens e. g. for .cjs and .mjs)
pub specified_module_type: SpecifiedModuleType,
/// Determines how to treat `new URL(...)` rewrites.
......
......@@ -35,7 +35,7 @@ use super::{
};
use crate::{
magic_identifier::{self, MAGIC_IDENTIFIER_DEFAULT_EXPORT_ATOM},
tree_shake::optimizations::GraphOptimizer,
module_fragments::optimizations::GraphOptimizer,
};
/// The id of an item
......
......@@ -4,7 +4,7 @@ use petgraph::{Direction, Graph, visit::EdgeRef};
use rustc_hash::{FxHashMap, FxHashSet};
use turbo_tasks::FxIndexSet;
use crate::tree_shake::graph::{Dependency, ItemId};
use crate::module_fragments::graph::{Dependency, ItemId};
pub(super) struct GraphOptimizer<'a> {
pub graph_ix: &'a FxIndexSet<ItemId>,
......
......@@ -18,16 +18,16 @@ use crate::{
EcmascriptChunkItemContent, EcmascriptChunkPlaceable, EcmascriptExports,
ecmascript_chunk_item,
},
module_fragments::{
Key, SplitResult, get_part_id, part_of_module, side_effects::module::SideEffectsModule,
split_module,
},
parse::ParseResult,
references::{
FollowExportsResult, analyze_ecmascript_module, esm::FoundExportType,
exports::compute_ecmascript_module_exports, follow_reexports,
},
rename::module::EcmascriptModuleRenameModule,
tree_shake::{
Key, SplitResult, get_part_id, part_of_module, side_effects::module::SideEffectsModule,
split_module,
},
};
/// A reference to part of an ES module.
......
......@@ -37,12 +37,13 @@ use turbopack_core::{
use turbopack_resolve::ecmascript::esm_resolve;
use crate::{
EcmascriptModuleAsset, ScopeHoistingContext, TreeShakingMode,
EcmascriptModuleAsset, ScopeHoistingContext,
analyzer::imports::ImportAnnotations,
chunk::{EcmascriptChunkPlaceable, EcmascriptExports},
code_gen::{CodeGeneration, CodeGenerationHoistedStmt},
export::Liveness,
magic_identifier,
module_fragments::{TURBOPACK_PART_IMPORT_SOURCE, part::module::EcmascriptModulePartAsset},
references::{
esm::{
EsmExport,
......@@ -51,7 +52,6 @@ use crate::{
util::{SpecifiedChunkingType, throw_module_not_found_expr},
},
runtime_functions::{TURBOPACK_EXTERNAL_IMPORT, TURBOPACK_EXTERNAL_REQUIRE, TURBOPACK_IMPORT},
tree_shake::{TURBOPACK_PART_IMPORT_SOURCE, part::module::EcmascriptModulePartAsset},
utils::module_id_to_lit,
};
......@@ -384,7 +384,7 @@ pub struct EsmAssetReference {
pub export_name: Option<ModulePart>,
pub import_usage: ImportUsage,
pub import_externals: bool,
pub tree_shaking_mode: Option<TreeShakingMode>,
pub module_fragments_enabled: bool,
pub is_pure_import: bool,
/// Rarely-present, slightly-large fields (import-annotation overrides and a resolve override),
/// boxed off the common path so the typical reference stays small. `None` whenever every field
......@@ -455,7 +455,7 @@ impl EsmAssetReference {
export_name: Option<ModulePart>,
import_usage: ImportUsage,
import_externals: bool,
tree_shaking_mode: Option<TreeShakingMode>,
module_fragments_enabled: bool,
resolve_override: Option<ResolvedVc<Box<dyn Module>>>,
is_pure_import: bool,
) -> Result<Self> {
......@@ -478,7 +478,7 @@ impl EsmAssetReference {
export_name,
import_usage,
import_externals,
tree_shaking_mode,
module_fragments_enabled,
is_pure_import,
extras: EsmReferenceExtras::new(annotations.as_ref(), resolve_override),
})
......@@ -494,7 +494,7 @@ impl EsmAssetReference {
export_name: Option<ModulePart>,
import_usage: ImportUsage,
import_externals: bool,
tree_shaking_mode: Option<TreeShakingMode>,
module_fragments_enabled: bool,
resolve_override: Option<ResolvedVc<Box<dyn Module>>>,
) -> Result<Self> {
Self::new_inner(
......@@ -506,7 +506,7 @@ impl EsmAssetReference {
export_name,
import_usage,
import_externals,
tree_shaking_mode,
module_fragments_enabled,
resolve_override,
/* is_pure_import */ false,
)
......@@ -523,7 +523,7 @@ impl EsmAssetReference {
export_name: Option<ModulePart>,
import_usage: ImportUsage,
import_externals: bool,
tree_shaking_mode: Option<TreeShakingMode>,
module_fragments_enabled: bool,
resolve_override: Option<ResolvedVc<Box<dyn Module>>>,
) -> Result<Self> {
Self::new_inner(
......@@ -535,7 +535,7 @@ impl EsmAssetReference {
export_name,
import_usage,
import_externals,
tree_shaking_mode,
module_fragments_enabled,
resolve_override,
/* is_pure_import */ true,
)
......@@ -560,7 +560,7 @@ impl EsmAssetReference {
// logic earlier.
import_usage: self.import_usage.clone(),
import_externals: self.import_externals,
tree_shaking_mode: self.tree_shaking_mode,
module_fragments_enabled: self.module_fragments_enabled,
is_pure_import: self.is_pure_import,
extras: self.extras.clone(),
}
......@@ -616,7 +616,7 @@ impl ModuleReference for EsmAssetReference {
let request = Request::parse(self.request.clone().into());
if let Some(TreeShakingMode::ModuleFragments) = self.tree_shaking_mode {
if self.module_fragments_enabled {
if let Some(ModulePart::Evaluation) = &self.export_name
&& *self.module.side_effects().await? == ModuleSideEffects::SideEffectFree
{
......
......@@ -32,9 +32,9 @@ use crate::{
chunk::{EcmascriptChunkPlaceable, EcmascriptExports},
code_gen::{CodeGeneration, CodeGenerationHoistedStmt},
magic_identifier::MAGIC_IDENTIFIER_DEFAULT_EXPORT_ATOM,
module_fragments::part::module::EcmascriptModulePartAsset,
references::esm::base::ReferencedAsset,
runtime_functions::{TURBOPACK_DYNAMIC, TURBOPACK_ESM},
tree_shake::part::module::EcmascriptModulePartAsset,
utils::module_id_to_lit,
};
......
......@@ -14,9 +14,9 @@ use turbopack_core::{
use crate::{
EcmascriptModuleAsset, EcmascriptParsable, ModuleTypeResult, SpecifiedModuleType,
TreeShakingMode,
analyzer::imports::{ImportAnnotations, ImportedSymbol},
chunk::EcmascriptExports,
module_fragments::{part_of_module, split_module},
parse::ParseResult,
references::{
TURBOPACK_HELPER_WTF8,
......@@ -24,7 +24,6 @@ use crate::{
type_issue::SpecifiedModuleTypeIssue,
},
runtime_functions::{TURBOPACK_EXPORT_NAMESPACE, TURBOPACK_EXPORT_VALUE},
tree_shake::{part_of_module, split_module},
};
#[turbo_tasks::value]
......@@ -110,10 +109,7 @@ pub async fn compute_ecmascript_module_exports(
}
ImportedSymbol::Symbol(name) => Some(ModulePart::export((&**name).into())),
ImportedSymbol::PartEvaluation(part_id) | ImportedSymbol::Part(part_id) => {
if !matches!(
options.tree_shaking_mode,
Some(TreeShakingMode::ModuleFragments)
) {
if !options.module_fragments_enabled {
bail!(
"Internal imports only exist in reexports only mode when \
importing {:?} from {}",
......@@ -126,11 +122,9 @@ pub async fn compute_ecmascript_module_exports(
}
Some(ModulePart::internal(*part_id))
}
ImportedSymbol::Exports => matches!(
options.tree_shaking_mode,
Some(TreeShakingMode::ModuleFragments)
)
.then(ModulePart::exports),
ImportedSymbol::Exports => {
options.module_fragments_enabled.then(ModulePart::exports)
}
},
eval_context
.imports
......@@ -139,7 +133,7 @@ pub async fn compute_ecmascript_module_exports(
.cloned()
.unwrap_or_default(),
import_externals,
options.tree_shaking_mode,
options.module_fragments_enabled,
resolve_override,
)
.await?
......
......@@ -98,7 +98,7 @@ use worker::{WorkerAssetReference, WorkerGlobalPlaceholder, WorkerGlobalsReplace
pub use crate::references::esm::export::{FollowExportsResult, follow_reexports};
use crate::{
AnalyzeMode, EcmascriptModuleAsset, EcmascriptModuleAssetType, EcmascriptParsable,
ModuleTypeResult, TreeShakingMode, TypeofWindow,
ModuleTypeResult, TypeofWindow,
analyzer::{
Bump, BumpVec, ConstantNumber, ConstantString, ConstantValue as JsConstantValue, JsValue,
JsValueUrlKind, Modified, ObjectPart, RequireContextValue, ThreadLocal,
......@@ -113,6 +113,7 @@ use crate::{
},
code_gen::{CodeGen, CodeGens, IntoCodeGenReference},
errors,
module_fragments::{part_of_module, split_module},
parse::ParseResult,
references::{
amd::{
......@@ -148,7 +149,6 @@ use crate::{
TURBOPACK_RUNTIME_FUNCTION_SHORTCUTS,
},
source_map::parse_source_map_comment,
tree_shake::{part_of_module, split_module},
utils::{AstPathRange, js_value_to_pattern, module_value_to_well_known_object},
};
......@@ -458,7 +458,7 @@ struct AnalysisState<'a> {
// There can be many references to __webpack_exports_info__, but only the first should hoist
// the object allocation.
first_webpack_exports_info: bool,
tree_shaking_mode: Option<TreeShakingMode>,
module_fragments_enabled: bool,
import_externals: bool,
ignore_dynamic_requests: bool,
url_rewrite_behavior: Option<UrlRewriteBehavior>,
......@@ -856,7 +856,7 @@ async fn analyze_ecmascript_module_internal(
var_cache: Default::default(),
first_import_meta: true,
first_webpack_exports_info: true,
tree_shaking_mode: options.tree_shaking_mode,
module_fragments_enabled: options.module_fragments_enabled,
import_externals: options.import_externals,
ignore_dynamic_requests: options.ignore_dynamic_requests,
url_rewrite_behavior: options.url_rewrite_behavior,
......@@ -1310,10 +1310,7 @@ async fn analyze_ecmascript_module_internal(
ast_path.to_vec().into(),
)
} else {
if matches!(
options.tree_shaking_mode,
Some(TreeShakingMode::ReexportsOnly)
) {
if options.follow_reexports && !options.module_fragments_enabled {
// TODO move this logic into Effect creation itself and don't create new
// references after the fact here.
let original_reference = r.await?;
......@@ -1397,10 +1394,7 @@ async fn analyze_ecmascript_module_internal(
analysis
.build(
import_references,
matches!(
options.tree_shaking_mode,
Some(TreeShakingMode::ReexportsOnly)
),
options.follow_reexports && !options.module_fragments_enabled,
)
.await
}
......@@ -3374,7 +3368,7 @@ async fn handle_free_var_reference(
// level function could set ImportUsage properly here
ImportUsage::TopLevel,
state.import_externals,
state.tree_shaking_mode,
state.module_fragments_enabled,
None,
)
.await?
......
......@@ -102,7 +102,6 @@ async fn node_file_trace_operation(
analyze_mode: AnalyzeMode::Tracing,
// Disable tree shaking. Even side-effect-free imports need to be traced, as they will
// execute at runtime.
tree_shaking_mode: None,
..Default::default()
}
.cell(),
......
......@@ -49,7 +49,7 @@ use turbopack_core::{
},
};
use turbopack_css::chunk::CssChunkType;
use turbopack_ecmascript::{TreeShakingMode, chunk::EcmascriptChunkType};
use turbopack_ecmascript::chunk::EcmascriptChunkType;
use turbopack_ecmascript_runtime::RuntimeType;
use turbopack_node::{
child_process_backend,
......@@ -264,8 +264,10 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result<JsRe
)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
struct TestOptions {
#[serde(default = "default_tree_shaking_mode")]
tree_shaking_mode: Option<TreeShakingMode>,
#[serde(default = "default_true")]
follow_reexports: bool,
#[serde(default)]
module_fragments_enabled: bool,
#[serde(default = "default_true")]
remove_unused_imports: bool,
#[serde(default = "default_true")]
......@@ -278,10 +280,6 @@ struct TestOptions {
production_chunking: bool,
}
fn default_tree_shaking_mode() -> Option<TreeShakingMode> {
Some(TreeShakingMode::ReexportsOnly)
}
fn default_true() -> bool {
true
}
......@@ -289,7 +287,8 @@ fn default_true() -> bool {
impl Default for TestOptions {
fn default() -> Self {
Self {
tree_shaking_mode: default_tree_shaking_mode(),
follow_reexports: default_true(),
module_fragments_enabled: false,
remove_unused_exports: default_true(),
remove_unused_imports: default_true(),
scope_hoisting: default_true(),
......@@ -448,11 +447,13 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V
..Default::default()
},
environment: Some(env),
tree_shaking_mode: options.tree_shaking_mode,
follow_reexports: options.follow_reexports,
module_fragments_enabled: options.module_fragments_enabled,
rules: vec![(
ContextCondition::InNodeModules,
ModuleOptionsContext {
tree_shaking_mode: options.tree_shaking_mode,
follow_reexports: options.follow_reexports,
module_fragments_enabled: options.module_fragments_enabled,
..Default::default()
}
.resolved_cell(),
......
......@@ -56,7 +56,7 @@ use turbopack_core::{
reference_type::{EntryReferenceSubType, ReferenceType, ReferenceTypeCondition},
};
use turbopack_ecmascript::{
AnalyzeMode, CustomTransformer, EcmascriptInputTransform, TransformPlugin, TreeShakingMode,
AnalyzeMode, CustomTransformer, EcmascriptInputTransform, TransformPlugin,
chunk::EcmascriptChunkType, transform::ReactCompilerCompilationMode,
};
use turbopack_ecmascript_plugins::transform::{
......@@ -87,7 +87,9 @@ struct SnapshotOptions {
#[serde(default)]
environment: SnapshotEnvironment,
#[serde(default)]
tree_shaking_mode: Option<TreeShakingMode>,
follow_reexports: bool,
#[serde(default)]
module_fragments_enabled: bool,
#[serde(default)]
remove_unused_imports: bool,
#[serde(default)]
......@@ -135,7 +137,8 @@ impl Default for SnapshotOptions {
runtime: Default::default(),
runtime_type: default_runtime_type(),
environment: Default::default(),
tree_shaking_mode: None,
follow_reexports: false,
module_fragments_enabled: false,
remove_unused_imports: false,
remove_unused_exports: false,
cjs_tree_shaking: false,
......@@ -425,14 +428,16 @@ async fn run_test_operation(resource: RcStr) -> Result<Vc<FileSystemPath>> {
ContextCondition::InNodeModules,
ModuleOptionsContext {
environment: Some(env),
tree_shaking_mode: options.tree_shaking_mode,
follow_reexports: options.follow_reexports,
module_fragments_enabled: options.module_fragments_enabled,
analyze_mode: AnalyzeMode::CodeGenerationAndTracing,
..Default::default()
}
.resolved_cell(),
)],
module_rules: vec![module_rules],
tree_shaking_mode: options.tree_shaking_mode,
follow_reexports: options.follow_reexports,
module_fragments_enabled: options.module_fragments_enabled,
analyze_mode: AnalyzeMode::CodeGenerationAndTracing,
..Default::default()
}
......
{
"treeShakingMode": "reexports-only",
"followReexports": true,
"removeUnusedExports": true
}
{
"treeShakingMode": "reexports-only",
"followReexports": true,
"removeUnusedExports": true
}
{
"treeShakingMode": "reexports-only",
"followReexports": true,
"removeUnusedExports": true
}
......@@ -2,5 +2,5 @@
"scopeHoisting": false,
"removeUnusedImports": true,
"removeUnusedExports": true,
"treeShakingMode": "reexports-only"
"followReexports": true
}
{
"treeShakingMode": "reexports-only",
"followReexports": true,
"scopeHoisting": true
}
{
"treeShakingMode": "reexports-only",
"followReexports": true,
"scopeHoisting": true
}
{
"treeShakingMode": "module-fragments"
"moduleFragmentsEnabled": true
}
......@@ -417,7 +417,8 @@ async fn node_file_trace_operation(
analyze_mode: AnalyzeMode::Tracing,
// Disable tree shaking. Even side-effect-free imports need to be traced, as they will
// execute at runtime.
tree_shaking_mode: None,
follow_reexports: false,
module_fragments_enabled: false,
..Default::default()
}
.cell(),
......
......@@ -246,7 +246,8 @@ async fn node_file_trace_operation(package_root: RcStr, input: RcStr) -> Result<
analyze_mode: AnalyzeMode::Tracing,
// Disable tree shaking. Even side-effect-free imports need to be traced, as they will
// execute at runtime.
tree_shaking_mode: None,
follow_reexports: false,
module_fragments_enabled: false,
..Default::default()
}
.cell(),
......
......@@ -12,7 +12,7 @@ use turbopack_core::{
ident::Layer,
resolve::options::{ImportMap, ImportMapping},
};
use turbopack_ecmascript::{TreeShakingMode, references::esm::UrlRewriteBehavior};
use turbopack_ecmascript::references::esm::UrlRewriteBehavior;
use turbopack_node::execution_context::ExecutionContext;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
......@@ -103,7 +103,8 @@ pub async fn node_evaluate_asset_context(
.cell()
.await?,
ModuleOptionsContext {
tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly),
follow_reexports: true,
module_fragments_enabled: false,
ecmascript: EcmascriptOptionsContext {
esm_url_rewrite_behavior: Some(UrlRewriteBehavior::Full),
enable_typescript_transform: Some(
......
......@@ -48,8 +48,9 @@ use turbopack_core::{
use turbopack_css::{CssModule, EcmascriptCssModule};
use turbopack_ecmascript::{
AnalyzeMode, EcmascriptInputTransforms, EcmascriptModuleAsset, EcmascriptModuleAssetType,
EcmascriptOptions, TreeShakingMode,
EcmascriptOptions,
chunk::EcmascriptChunkPlaceable,
module_fragments::part::module::EcmascriptModulePartAsset,
references::{
FollowExportsResult,
external_module::{CachedExternalModule, CachedExternalTracingMode, CachedExternalType},
......@@ -59,7 +60,6 @@ use turbopack_ecmascript::{
side_effect_optimization::{
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
},
tree_shake::part::module::EcmascriptModulePartAsset,
};
use turbopack_node::transforms::webpack::{WebpackLoaderItem, WebpackLoaderItems, WebpackLoaders};
use turbopack_resolve::{
......@@ -85,10 +85,9 @@ async fn apply_module_type(
reference_type: ReferenceType,
inner_assets: Option<ResolvedVc<InnerAssets>>,
) -> Result<Vc<ProcessResult>> {
let tree_shaking_mode = module_asset_context
.module_options_context()
.await?
.tree_shaking_mode;
let module_options = module_asset_context.module_options_context().await?;
let follow_reexports = module_options.follow_reexports;
let module_fragments_enabled = module_options.module_fragments_enabled;
let part = match &reference_type {
ReferenceType::EcmaScriptModules(EcmaScriptModulesReferenceSubType::ImportPart(part)) => {
Some(part)
......@@ -192,7 +191,7 @@ async fn apply_module_type(
// This can skip the module earlier and could skip more modules than only doing it
// at the end. Also we avoid parsing/analyzing the module in this
// case, because we would need to parse/analyze it for reexports.
if tree_shaking_mode.is_some() && is_evaluation {
if (follow_reexports || module_fragments_enabled) && is_evaluation {
// If we are tree shaking, skip the evaluation part if the module is marked as
// side effect free.
if *module.side_effects().await? == ModuleSideEffects::SideEffectFree {
......@@ -200,47 +199,43 @@ async fn apply_module_type(
}
}
match tree_shaking_mode {
Some(TreeShakingMode::ModuleFragments) => {
Vc::upcast(EcmascriptModulePartAsset::select_part(
*module,
part.cloned().unwrap_or(ModulePart::facade()),
))
}
Some(TreeShakingMode::ReexportsOnly) => {
if *module.get_exports().split_locals_and_reexports().await? {
if let Some(part) = part {
match part {
ModulePart::Evaluation => {
Vc::upcast(EcmascriptModuleLocalsModule::new(*module))
}
ModulePart::Export(_) => {
apply_reexport_tree_shaking(
Vc::upcast(
*EcmascriptModuleFacadeModule::new(Vc::upcast(
*module,
))
if module_fragments_enabled {
Vc::upcast(EcmascriptModulePartAsset::select_part(
*module,
part.cloned().unwrap_or(ModulePart::facade()),
))
} else if follow_reexports {
if *module.get_exports().split_locals_and_reexports().await? {
if let Some(part) = part {
match part {
ModulePart::Evaluation => {
Vc::upcast(EcmascriptModuleLocalsModule::new(*module))
}
ModulePart::Export(_) => {
apply_reexport_tree_shaking(
Vc::upcast(
*EcmascriptModuleFacadeModule::new(Vc::upcast(*module))
.to_resolved()
.await?,
),
part.clone(),
)
.await?
}
_ => bail!(
"Invalid module part \"{}\" for reexports only tree \
shaking mode",
part
),
),
part.clone(),
)
.await?
}
} else {
Vc::upcast(EcmascriptModuleFacadeModule::new(Vc::upcast(*module)))
_ => bail!(
"Invalid module part \"{}\" for reexports only tree shaking \
mode",
part
),
}
} else {
Vc::upcast(*module)
Vc::upcast(EcmascriptModuleFacadeModule::new(Vc::upcast(*module)))
}
} else {
Vc::upcast(*module)
}
None => Vc::upcast(*module),
} else {
Vc::upcast(*module)
}
.to_resolved()
.await?
......@@ -298,7 +293,7 @@ async fn apply_module_type(
}
};
if tree_shaking_mode.is_some() && is_evaluation {
if (follow_reexports || module_fragments_enabled) && is_evaluation {
// If we are tree shaking, skip the evaluation part if the module is marked as
// side effect free.
if *module.side_effects().await? == ModuleSideEffects::SideEffectFree {
......@@ -962,7 +957,6 @@ pub async fn externals_tracing_module_context(
analyze_mode: AnalyzeMode::Tracing,
// Disable tree shaking. Even side-effect-free imports need to be traced, as they will
// execute at runtime.
tree_shaking_mode: None,
..Default::default()
}
.cell(),
......
......@@ -266,7 +266,8 @@ impl ModuleOptions {
environment,
ref module_rules,
execution_context,
tree_shaking_mode,
follow_reexports,
module_fragments_enabled,
keep_last_successful_parse,
analyze_mode,
..
......@@ -326,7 +327,8 @@ impl ModuleOptions {
}
let ecmascript_options = EcmascriptOptions {
tree_shaking_mode,
follow_reexports,
module_fragments_enabled,
url_rewrite_behavior: esm_url_rewrite_behavior,
import_externals,
ignore_dynamic_requests,
......
......@@ -14,7 +14,7 @@ use turbopack_core::{
environment::Environment, resolve::options::ImportMapping,
};
use turbopack_ecmascript::{
AnalyzeMode, TreeShakingMode, TypeofWindow,
AnalyzeMode, TypeofWindow,
references::esm::UrlRewriteBehavior,
transform::{PresetEnvConfig, ReactCompilerCompilationMode, ReactCompilerTarget},
};
......@@ -217,7 +217,8 @@ pub struct ModuleOptionsContext {
pub environment: Option<ResolvedVc<Environment>>,
pub execution_context: Option<ResolvedVc<ExecutionContext>>,
pub side_effect_free_packages: Option<ResolvedVc<Glob>>,
pub tree_shaking_mode: Option<TreeShakingMode>,
pub follow_reexports: bool,
pub module_fragments_enabled: bool,
pub static_url_tag: Option<RcStr>,
......
......@@ -4,7 +4,6 @@ use turbopack_core::{
compile_time_info::CompileTimeInfo, context::AssetContext, environment::Environment,
ident::Layer,
};
use turbopack_ecmascript::TreeShakingMode;
use crate::{
ModuleAssetContext,
......@@ -26,7 +25,8 @@ pub async fn get_runtime_asset_context(
..Default::default()
},
environment: Some(environment),
tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly),
follow_reexports: true,
module_fragments_enabled: false,
..Default::default()
}
.cell();
......
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